]> git.saurik.com Git - wxWidgets.git/commitdiff
Update version to 2.9.4 in version.bkl too and rebake everything.
authorVadim Zeitlin <vadim@wxwidgets.org>
Sun, 18 Dec 2011 14:35:50 +0000 (14:35 +0000)
committerVadim Zeitlin <vadim@wxwidgets.org>
Sun, 18 Dec 2011 14:35:50 +0000 (14:35 +0000)
Change the version for Unix shared libraries too.

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

199 files changed:
Makefile.in
build/bakefiles/version.bkl
build/msw/makefile.bcc
build/msw/makefile.gcc
build/msw/makefile.vc
build/msw/makefile.wat
build/msw/wx_adv.dsp
build/msw/wx_aui.dsp
build/msw/wx_base.dsp
build/msw/wx_core.dsp
build/msw/wx_gl.dsp
build/msw/wx_html.dsp
build/msw/wx_media.dsp
build/msw/wx_net.dsp
build/msw/wx_propgrid.dsp
build/msw/wx_qa.dsp
build/msw/wx_ribbon.dsp
build/msw/wx_richtext.dsp
build/msw/wx_stc.dsp
build/msw/wx_vc7_adv.vcproj
build/msw/wx_vc7_aui.vcproj
build/msw/wx_vc7_base.vcproj
build/msw/wx_vc7_core.vcproj
build/msw/wx_vc7_gl.vcproj
build/msw/wx_vc7_html.vcproj
build/msw/wx_vc7_media.vcproj
build/msw/wx_vc7_net.vcproj
build/msw/wx_vc7_propgrid.vcproj
build/msw/wx_vc7_qa.vcproj
build/msw/wx_vc7_ribbon.vcproj
build/msw/wx_vc7_richtext.vcproj
build/msw/wx_vc7_stc.vcproj
build/msw/wx_vc7_webview.vcproj
build/msw/wx_vc7_xml.vcproj
build/msw/wx_vc7_xrc.vcproj
build/msw/wx_vc8_adv.vcproj
build/msw/wx_vc8_aui.vcproj
build/msw/wx_vc8_base.vcproj
build/msw/wx_vc8_core.vcproj
build/msw/wx_vc8_gl.vcproj
build/msw/wx_vc8_html.vcproj
build/msw/wx_vc8_media.vcproj
build/msw/wx_vc8_net.vcproj
build/msw/wx_vc8_propgrid.vcproj
build/msw/wx_vc8_qa.vcproj
build/msw/wx_vc8_ribbon.vcproj
build/msw/wx_vc8_richtext.vcproj
build/msw/wx_vc8_stc.vcproj
build/msw/wx_vc8_webview.vcproj
build/msw/wx_vc8_xml.vcproj
build/msw/wx_vc8_xrc.vcproj
build/msw/wx_vc9_adv.vcproj
build/msw/wx_vc9_aui.vcproj
build/msw/wx_vc9_base.vcproj
build/msw/wx_vc9_core.vcproj
build/msw/wx_vc9_gl.vcproj
build/msw/wx_vc9_html.vcproj
build/msw/wx_vc9_media.vcproj
build/msw/wx_vc9_net.vcproj
build/msw/wx_vc9_propgrid.vcproj
build/msw/wx_vc9_qa.vcproj
build/msw/wx_vc9_ribbon.vcproj
build/msw/wx_vc9_richtext.vcproj
build/msw/wx_vc9_stc.vcproj
build/msw/wx_vc9_webview.vcproj
build/msw/wx_vc9_xml.vcproj
build/msw/wx_vc9_xrc.vcproj
build/msw/wx_webview.dsp
build/msw/wx_xml.dsp
build/msw/wx_xrc.dsp
demos/bombs/Makefile.in
demos/forty/Makefile.in
demos/fractal/Makefile.in
demos/life/Makefile.in
demos/poem/Makefile.in
samples/access/Makefile.in
samples/animate/Makefile.in
samples/artprov/Makefile.in
samples/aui/Makefile.in
samples/calendar/Makefile.in
samples/caret/Makefile.in
samples/clipboard/Makefile.in
samples/collpane/Makefile.in
samples/combo/Makefile.in
samples/config/Makefile.in
samples/controls/Makefile.in
samples/dataview/Makefile.in
samples/debugrpt/Makefile.in
samples/dialogs/Makefile.in
samples/dialup/Makefile.in
samples/display/Makefile.in
samples/dll/Makefile.in
samples/dnd/Makefile.in
samples/docview/Makefile.in
samples/dragimag/Makefile.in
samples/drawing/Makefile.in
samples/erase/Makefile.in
samples/event/Makefile.in
samples/except/Makefile.in
samples/exec/Makefile.in
samples/font/Makefile.in
samples/fswatcher/Makefile.in
samples/grid/Makefile.in
samples/help/Makefile.in
samples/htlbox/Makefile.in
samples/html/about/Makefile.in
samples/html/help/Makefile.in
samples/html/helpview/Makefile.in
samples/html/htmlctrl/Makefile.in
samples/html/printing/Makefile.in
samples/html/test/Makefile.in
samples/html/virtual/Makefile.in
samples/html/widget/Makefile.in
samples/html/zip/Makefile.in
samples/image/Makefile.in
samples/internat/Makefile.in
samples/ipc/Makefile.in
samples/joytest/Makefile.in
samples/keyboard/Makefile.in
samples/layout/Makefile.in
samples/listctrl/Makefile.in
samples/mdi/Makefile.in
samples/mediaplayer/Makefile.in
samples/memcheck/Makefile.in
samples/menu/Makefile.in
samples/minimal/Makefile.in
samples/nativdlg/Makefile.in
samples/notebook/Makefile.in
samples/oleauto/Makefile.in
samples/opengl/cube/Makefile.in
samples/opengl/isosurf/Makefile.in
samples/opengl/penguin/Makefile.in
samples/ownerdrw/Makefile.in
samples/popup/Makefile.in
samples/power/Makefile.in
samples/printing/Makefile.in
samples/propgrid/Makefile.in
samples/regtest/Makefile.in
samples/render/Makefile.in
samples/render/makefile.bcc
samples/render/makefile.gcc
samples/render/makefile.vc
samples/render/makefile.wat
samples/render/render_renddll.dsp
samples/render/render_vc7_renddll.vcproj
samples/render/render_vc8_renddll.vcproj
samples/render/render_vc9_renddll.vcproj
samples/ribbon/Makefile.in
samples/richtext/Makefile.in
samples/sashtest/Makefile.in
samples/scroll/Makefile.in
samples/shaped/Makefile.in
samples/sockets/Makefile.in
samples/sound/Makefile.in
samples/splash/Makefile.in
samples/splitter/Makefile.in
samples/statbar/Makefile.in
samples/stc/Makefile.in
samples/svg/Makefile.in
samples/taborder/Makefile.in
samples/taskbar/Makefile.in
samples/text/Makefile.in
samples/thread/Makefile.in
samples/toolbar/Makefile.in
samples/treectrl/Makefile.in
samples/treelist/Makefile.in
samples/treelist/makefile.bcc
samples/treelist/makefile.gcc
samples/treelist/makefile.vc
samples/treelist/makefile.wat
samples/typetest/Makefile.in
samples/uiaction/Makefile.in
samples/validate/Makefile.in
samples/vscroll/Makefile.in
samples/webview/Makefile.in
samples/webview/makefile.bcc
samples/webview/makefile.gcc
samples/webview/makefile.vc
samples/webview/makefile.wat
samples/widgets/Makefile.in
samples/wizard/Makefile.in
samples/wrapsizer/Makefile.in
samples/xrc/Makefile.in
samples/xrc/makefile.bcc
samples/xrc/makefile.gcc
samples/xrc/makefile.vc
samples/xrc/makefile.wat
samples/xti/Makefile.in
tests/Makefile.in
tests/makefile.bcc
tests/makefile.gcc
tests/makefile.vc
tests/makefile.wat
tests/test_test_gui.dsp
tests/test_vc7_test_gui.vcproj
tests/test_vc8_test_gui.vcproj
tests/test_vc9_test_gui.vcproj
utils/helpview/src/Makefile.in
utils/screenshotgen/src/Makefile.in

index c4ecd271be67ad6f2d887ffed752e2ef72d0c3df..e26323cdec473aca99836f7d11fd65e8719577ca 100644 (file)
@@ -76,8 +76,8 @@ wx_top_builddir = @wx_top_builddir@
 DESTDIR = 
 WX_RELEASE = 2.9
 WX_RELEASE_NODOT = 29
-WX_VERSION = $(WX_RELEASE).3
-WX_VERSION_NODOT = $(WX_RELEASE_NODOT)3
+WX_VERSION = $(WX_RELEASE).4
+WX_VERSION_NODOT = $(WX_RELEASE_NODOT)4
 LIBDIRNAME = $(wx_top_builddir)/lib
 WXREGEX_CFLAGS = -DNDEBUG -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(____SHARED) \
        $(CPPFLAGS) $(CFLAGS)
@@ -13244,7 +13244,7 @@ COND_WITH_PLUGIN_SDL_1___sound_sdl___depname = \
 @COND_USE_XRC_1@__clean_wxrc___depname = clean-wxrc
 @COND_USE_XRC_1@__install_wxrc___depname = install-wxrc
 @COND_TOOLKIT_MSW@RCDEFS_H = msw/rcdefs.h
-@COND_TOOLKIT_COCOA@__cocoa_res___depname = lib/libwx_$(TOOLCHAIN_NAME).3.r
+@COND_TOOLKIT_COCOA@__cocoa_res___depname = lib/libwx_$(TOOLCHAIN_NAME).4.r
 @COND_TOOLKIT_COCOA@__cocoa_res_install___depname = cocoa-res-install
 @COND_SHARED_0@____SHARED = 
 @COND_SHARED_1@____SHARED = $(PIC_FLAG)
@@ -14013,17 +14013,17 @@ COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1___htmldll_library_link_LIBR_0 \
 @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_65 = --define wxNO_EXCEPTIONS
 @COND_USE_RTTI_0@__RTTI_DEFINE_p_65 = --define wxNO_RTTI
 @COND_USE_THREADS_0@__THREAD_DEFINE_p_65 = --define wxNO_THREADS
-@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@dll___targetsuf2 = .$(SO_SUFFIX).3
-@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@dll___targetsuf2 = .3.$(SO_SUFFIX)
+@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@dll___targetsuf2 = .$(SO_SUFFIX).4
+@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@dll___targetsuf2 = .4.$(SO_SUFFIX)
 @COND_USE_SOVERSION_0@dll___targetsuf2 = .$(SO_SUFFIX)
 @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@dll___targetsuf3 \
 @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@     = \
-@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@     .$(SO_SUFFIX).3.0.0
+@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@     .$(SO_SUFFIX).4.0.0
 @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@dll___targetsuf3 \
-@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@       = .3.0.0.$(SO_SUFFIX)
-@COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@dll___targetsuf3 = -3.$(SO_SUFFIX)
+@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@       = .4.0.0.$(SO_SUFFIX)
+@COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@dll___targetsuf3 = -4.$(SO_SUFFIX)
 @COND_USE_SOVERSION_0@dll___targetsuf3 = .$(SO_SUFFIX)
-@COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1@dll___targetsuf3 = .$(SO_SUFFIX).3
+@COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1@dll___targetsuf3 = .$(SO_SUFFIX).4
 @COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \
 @COND_TOOLKIT_MSW@     $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
 @COND_wxUSE_LIBTIFF_builtin@__INC_TIFF_BUILD_p_66 \
@@ -14221,7 +14221,7 @@ clean: $(__clean_wxrc___depname)
        rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
        rm -f $(DLLPREFIX_MODULE)sound_sdl$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(PLUGVERDELIM)$(PLUGIN_VERSION0)$(WXCOMPILER).$(SO_SUFFIX_MODULE)
        -(cd samples && $(MAKE) clean)
-       rm -f lib/libwx_$(TOOLCHAIN_NAME).3.rsrc lib/libwx_$(TOOLCHAIN_NAME).3.r
+       rm -f lib/libwx_$(TOOLCHAIN_NAME).4.rsrc lib/libwx_$(TOOLCHAIN_NAME).4.r
 
 distclean: clean
        rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
@@ -15000,13 +15000,13 @@ locale_msw_uninstall:
        fi ; \
        done
 
-@COND_TOOLKIT_COCOA@lib/libwx_$(TOOLCHAIN_NAME).3.r: 
-@COND_TOOLKIT_COCOA@   $(REZ) -d __UNIX__ -useDF $(top_srcdir)/src/cocoa/dummy.r -o lib/libwx_$(TOOLCHAIN_NAME).3.rsrc
-@COND_TOOLKIT_COCOA@   $(DEREZ) lib/libwx_$(TOOLCHAIN_NAME).3.rsrc -useDF >lib/libwx_$(TOOLCHAIN_NAME).3.r
+@COND_TOOLKIT_COCOA@lib/libwx_$(TOOLCHAIN_NAME).4.r: 
+@COND_TOOLKIT_COCOA@   $(REZ) -d __UNIX__ -useDF $(top_srcdir)/src/cocoa/dummy.r -o lib/libwx_$(TOOLCHAIN_NAME).4.rsrc
+@COND_TOOLKIT_COCOA@   $(DEREZ) lib/libwx_$(TOOLCHAIN_NAME).4.rsrc -useDF >lib/libwx_$(TOOLCHAIN_NAME).4.r
 
 @COND_TOOLKIT_COCOA@cocoa-res-install: $(__cocoa_res___depname)
-@COND_TOOLKIT_COCOA@   $(INSTALL_DATA) lib/libwx_$(TOOLCHAIN_NAME).3.r $(libdir)
-@COND_TOOLKIT_COCOA@   $(INSTALL_DATA) lib/libwx_$(TOOLCHAIN_NAME).3.rsrc $(libdir)
+@COND_TOOLKIT_COCOA@   $(INSTALL_DATA) lib/libwx_$(TOOLCHAIN_NAME).4.r $(libdir)
+@COND_TOOLKIT_COCOA@   $(INSTALL_DATA) lib/libwx_$(TOOLCHAIN_NAME).4.rsrc $(libdir)
 
 wxregex_regcomp.o: $(srcdir)/src/regex/regcomp.c
        $(CCC) -c -o $@ $(WXREGEX_CFLAGS) $(srcdir)/src/regex/regcomp.c
index 5d7ebadc5d0dddf50620cb9de22dc4f35b2cafc9..6492a5706d0a6d8b4ca5df68d12ce904303005a0 100644 (file)
@@ -23,7 +23,7 @@
        3. Else, i.e. if there were no changes at all to API but only internal
           changes, change C:R:A to C:R+1:A
     -->
-    <set var="WX_CURRENT">3</set>
+    <set var="WX_CURRENT">4</set>
     <set var="WX_REVISION">0</set>
     <set var="WX_AGE">0</set>
 
index 773e4749279f9a0328191088f3f5c996af450fad..1f20efe5ca258f3cd43ce9fcbbaaf2c0aa857e1a 100644 (file)
@@ -39,7 +39,7 @@ MAKEARGS = -DCC="$(CC)" -DCXX="$(CXX)" -DCFLAGS="$(CFLAGS)" \
        -DCFG="$(CFG)" -DCPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" \\r
        -DCPPUNIT_LIBS="$(CPPUNIT_LIBS)" -DRUNTIME_LIBS="$(RUNTIME_LIBS)"\r
 WX_RELEASE_NODOT = 29\r
-WX_VERSION_NODOT = $(WX_RELEASE_NODOT)3\r
+WX_VERSION_NODOT = $(WX_RELEASE_NODOT)4\r
 COMPILER_PREFIX = bcc\r
 OBJS = \\r
        $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
@@ -5357,7 +5357,7 @@ $(SETUPHDIR)\wx\msw\rcdefs.h: $(SETUPHDIR)\wx\msw ..\..\include\wx\msw\genrcdefs
 build_cfg_file: $(SETUPHDIR)\r
        @echo WXVER_MAJOR=2 >$(BUILD_CFG_FILE)\r
        @echo WXVER_MINOR=9 >>$(BUILD_CFG_FILE)\r
-       @echo WXVER_RELEASE=3 >>$(BUILD_CFG_FILE)\r
+       @echo WXVER_RELEASE=4 >>$(BUILD_CFG_FILE)\r
        @echo BUILD=$(BUILD) >>$(BUILD_CFG_FILE)\r
        @echo MONOLITHIC=$(MONOLITHIC) >>$(BUILD_CFG_FILE)\r
        @echo SHARED=$(SHARED) >>$(BUILD_CFG_FILE)\r
index b42052a7a6c4932300792bcb8a92d3274cc4a9b0..6c6e80c0e3ebd36fd8f7ae593b86327f885bb1f0 100644 (file)
@@ -31,7 +31,7 @@ MAKEARGS = LINK_DLL_FLAGS="$(LINK_DLL_FLAGS)" \
        RUNTIME_LIBS="$(RUNTIME_LIBS)" GCC_VERSION="$(GCC_VERSION)"\r
 CPPDEPS = -MT$@ -MF$@.d -MD -MP\r
 WX_RELEASE_NODOT = 29\r
-WX_VERSION_NODOT = $(WX_RELEASE_NODOT)3\r
+WX_VERSION_NODOT = $(WX_RELEASE_NODOT)4\r
 COMPILER_PREFIX = gcc\r
 OBJS = \\r
        $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
@@ -5525,7 +5525,7 @@ $(SETUPHDIR)\wx\msw\rcdefs.h: $(SETUPHDIR)\wx\msw ..\..\include\wx\msw\genrcdefs
 build_cfg_file: $(SETUPHDIR)\r
        @echo WXVER_MAJOR=2 >$(BUILD_CFG_FILE)\r
        @echo WXVER_MINOR=9 >>$(BUILD_CFG_FILE)\r
-       @echo WXVER_RELEASE=3 >>$(BUILD_CFG_FILE)\r
+       @echo WXVER_RELEASE=4 >>$(BUILD_CFG_FILE)\r
        @echo BUILD=$(BUILD) >>$(BUILD_CFG_FILE)\r
        @echo MONOLITHIC=$(MONOLITHIC) >>$(BUILD_CFG_FILE)\r
        @echo SHARED=$(SHARED) >>$(BUILD_CFG_FILE)\r
index 73928f423814b97265e1cdbab2998d1621209357..f5a3d6153a1239f9471439d004fd3c016235a361 100644 (file)
@@ -29,7 +29,7 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
        CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" \\r
        RUNTIME_LIBS="$(RUNTIME_LIBS)"\r
 WX_RELEASE_NODOT = 29\r
-WX_VERSION_NODOT = $(WX_RELEASE_NODOT)3\r
+WX_VERSION_NODOT = $(WX_RELEASE_NODOT)4\r
 COMPILER_PREFIX = vc\r
 OBJS = \\r
        $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)\r
@@ -5963,7 +5963,7 @@ $(SETUPHDIR)\wx\msw\rcdefs.h: $(SETUPHDIR)\wx\msw ..\..\include\wx\msw\genrcdefs
 build_cfg_file: $(SETUPHDIR)\r
        @echo WXVER_MAJOR=2 >$(BUILD_CFG_FILE)\r
        @echo WXVER_MINOR=9 >>$(BUILD_CFG_FILE)\r
-       @echo WXVER_RELEASE=3 >>$(BUILD_CFG_FILE)\r
+       @echo WXVER_RELEASE=4 >>$(BUILD_CFG_FILE)\r
        @echo BUILD=$(BUILD) >>$(BUILD_CFG_FILE)\r
        @echo MONOLITHIC=$(MONOLITHIC) >>$(BUILD_CFG_FILE)\r
        @echo SHARED=$(SHARED) >>$(BUILD_CFG_FILE)\r
index ff89936797b26771656c887cb6a7762594660ba7..16e895d86e5c11829adc4e5c65ece15d4cf7d278 100644 (file)
@@ -3567,7 +3567,7 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" &
        CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" &\r
        RUNTIME_LIBS="$(RUNTIME_LIBS)"\r
 WX_RELEASE_NODOT = 29\r
-WX_VERSION_NODOT = $(WX_RELEASE_NODOT)3\r
+WX_VERSION_NODOT = $(WX_RELEASE_NODOT)4\r
 COMPILER_PREFIX = wat\r
 OBJS = &\r
        $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
@@ -5796,7 +5796,7 @@ $(SETUPHDIR)\wx\msw\rcdefs.h :  $(SETUPHDIR)\wx\msw ..\..\include\wx\msw\genrcde
 build_cfg_file : .SYMBOLIC $(SETUPHDIR)\r
        @echo WXVER_MAJOR=2 >$(BUILD_CFG_FILE)\r
        @echo WXVER_MINOR=9 >>$(BUILD_CFG_FILE)\r
-       @echo WXVER_RELEASE=3 >>$(BUILD_CFG_FILE)\r
+       @echo WXVER_RELEASE=4 >>$(BUILD_CFG_FILE)\r
        @echo BUILD=$(BUILD) >>$(BUILD_CFG_FILE)\r
        @echo MONOLITHIC=$(MONOLITHIC) >>$(BUILD_CFG_FILE)\r
        @echo SHARED=$(SHARED) >>$(BUILD_CFG_FILE)\r
index b966effbc4223bb26bd76c8959001a80a1af2392..b0c68b4656e116093e3f3a0bbf6aa4442745ac37 100644 (file)
@@ -47,18 +47,18 @@ RSC=rc.exe
 # PROP Output_Dir "..\..\lib\vc_dll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\adv"\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_advdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv293u_adv_vc_custom.pdb /opt:ref /opt:icf /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 "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /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_advdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv293u_adv_vc_custom.pdb /opt:ref /opt:icf /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 "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /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_advdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv294u_adv_vc_custom.pdb /opt:ref /opt:icf /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 "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /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_advdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv294u_adv_vc_custom.pdb /opt:ref /opt:icf /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 "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv293u_adv_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_ADV\r
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv293u_adv_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_ADV\r
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv294u_adv_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_ADV\r
+# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv294u_adv_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_ADV\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_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv293u_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_adv.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv293u_adv_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_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv293u_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_adv.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv293u_adv_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_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv294u_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_adv.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv294u_adv_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_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv294u_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_adv.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv294u_adv_vc_custom.pdb"\r
 \r
 !ELSEIF  "$(CFG)" == "adv - 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\adv"\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_advdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv293ud_adv_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_ADV" /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_advdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv293ud_adv_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_ADV" /c\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_advdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv294ud_adv_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_ADV" /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_advdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv294ud_adv_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_ADV" /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_ADV" /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_ADV" /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=wxmswuniv293ud_adv_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_ADV\r
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv293ud_adv_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_ADV\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=wxmswuniv294ud_adv_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_ADV\r
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv294ud_adv_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_ADV\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_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv293ud_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_adv.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv293ud_adv_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_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv293ud_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_adv.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv293ud_adv_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_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv294ud_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_adv.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv294ud_adv_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_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv294ud_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_adv.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv294ud_adv_vc_custom.pdb"\r
 \r
 !ELSEIF  "$(CFG)" == "adv - Win32 DLL Release"\r
 \r
@@ -97,18 +97,18 @@ LINK32=link.exe
 # PROP Output_Dir "..\..\lib\vc_dll"\r
 # PROP Intermediate_Dir "vc_mswudll\adv"\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_advdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw293u_adv_vc_custom.pdb /opt:ref /opt:icf /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 "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /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_advdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw293u_adv_vc_custom.pdb /opt:ref /opt:icf /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 "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /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_advdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw294u_adv_vc_custom.pdb /opt:ref /opt:icf /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 "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /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_advdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw294u_adv_vc_custom.pdb /opt:ref /opt:icf /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 "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw293u_adv_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_ADV\r
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw293u_adv_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_ADV\r
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw294u_adv_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_ADV\r
+# ADD RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw294u_adv_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_ADV\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_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw293u_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_adv.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw293u_adv_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_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw293u_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_adv.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw293u_adv_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_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw294u_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_adv.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw294u_adv_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_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw294u_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_adv.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw294u_adv_vc_custom.pdb"\r
 \r
 !ELSEIF  "$(CFG)" == "adv - Win32 DLL Debug"\r
 \r
@@ -122,18 +122,18 @@ LINK32=link.exe
 # PROP Output_Dir "..\..\lib\vc_dll"\r
 # PROP Intermediate_Dir "vc_mswuddll\adv"\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_advdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw293ud_adv_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_ADV" /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_advdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw293ud_adv_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_ADV" /c\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_advdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw294ud_adv_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_ADV" /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_advdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw294ud_adv_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_ADV" /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_ADV" /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_ADV" /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=wxmsw293ud_adv_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_ADV\r
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw293ud_adv_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_ADV\r
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw294ud_adv_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_ADV\r
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw294ud_adv_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_ADV\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_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw293ud_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_adv.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw293ud_adv_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_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw293ud_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_adv.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw293ud_adv_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_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw294ud_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_adv.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw294ud_adv_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_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw294ud_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_adv.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw294ud_adv_vc_custom.pdb"\r
 \r
 !ELSEIF  "$(CFG)" == "adv - Win32 Universal Release"\r
 \r
index 2467cb0129f10b281a191a72bc1dab074b374e92..286cf66a575b4005989ee5968c166e464223e967 100644 (file)
@@ -47,18 +47,18 @@ RSC=rc.exe
 # PROP Output_Dir "..\..\lib\vc_dll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\aui"\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_auidll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv293u_aui_vc_custom.pdb /opt:ref /opt:icf /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 "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_AUI" /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_auidll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv293u_aui_vc_custom.pdb /opt:ref /opt:icf /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 "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_AUI" /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_auidll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv294u_aui_vc_custom.pdb /opt:ref /opt:icf /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 "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_AUI" /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_auidll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv294u_aui_vc_custom.pdb /opt:ref /opt:icf /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 "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_AUI" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_AUI" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_AUI" /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv293u_aui_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_AUI\r
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv293u_aui_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_AUI\r
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv294u_aui_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_AUI\r
+# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv294u_aui_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_AUI\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\wxmswuniv293u_aui_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_aui.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv293u_aui_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\wxmswuniv293u_aui_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_aui.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv293u_aui_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\wxmswuniv294u_aui_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_aui.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv294u_aui_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\wxmswuniv294u_aui_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_aui.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv294u_aui_vc_custom.pdb"\r
 \r
 !ELSEIF  "$(CFG)" == "aui - 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\aui"\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_auidll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv293ud_aui_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_AUI" /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_auidll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv293ud_aui_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_AUI" /c\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_auidll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv294ud_aui_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_AUI" /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_auidll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv294ud_aui_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_AUI" /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_AUI" /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_AUI" /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=wxmswuniv293ud_aui_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_AUI\r
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv293ud_aui_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_AUI\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=wxmswuniv294ud_aui_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_AUI\r
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv294ud_aui_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_AUI\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\wxmswuniv293ud_aui_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_aui.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv293ud_aui_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\wxmswuniv293ud_aui_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_aui.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv293ud_aui_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\wxmswuniv294ud_aui_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_aui.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv294ud_aui_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\wxmswuniv294ud_aui_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_aui.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv294ud_aui_vc_custom.pdb"\r
 \r
 !ELSEIF  "$(CFG)" == "aui - Win32 DLL Release"\r
 \r
@@ -97,18 +97,18 @@ LINK32=link.exe
 # PROP Output_Dir "..\..\lib\vc_dll"\r
 # PROP Intermediate_Dir "vc_mswudll\aui"\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_auidll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw293u_aui_vc_custom.pdb /opt:ref /opt:icf /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 "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_AUI" /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_auidll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw293u_aui_vc_custom.pdb /opt:ref /opt:icf /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 "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_AUI" /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_auidll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw294u_aui_vc_custom.pdb /opt:ref /opt:icf /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 "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_AUI" /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_auidll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw294u_aui_vc_custom.pdb /opt:ref /opt:icf /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 "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_AUI" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_AUI" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_AUI" /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw293u_aui_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_AUI\r
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw293u_aui_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_AUI\r
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw294u_aui_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_AUI\r
+# ADD RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw294u_aui_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_AUI\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\wxmsw293u_aui_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_aui.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw293u_aui_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\wxmsw293u_aui_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_aui.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw293u_aui_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\wxmsw294u_aui_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_aui.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw294u_aui_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\wxmsw294u_aui_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_aui.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw294u_aui_vc_custom.pdb"\r
 \r
 !ELSEIF  "$(CFG)" == "aui - Win32 DLL Debug"\r
 \r
@@ -122,18 +122,18 @@ LINK32=link.exe
 # PROP Output_Dir "..\..\lib\vc_dll"\r
 # PROP Intermediate_Dir "vc_mswuddll\aui"\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_auidll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw293ud_aui_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_AUI" /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_auidll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw293ud_aui_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_AUI" /c\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_auidll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw294ud_aui_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_AUI" /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_auidll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw294ud_aui_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_AUI" /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_AUI" /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_AUI" /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=wxmsw293ud_aui_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_AUI\r
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw293ud_aui_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_AUI\r
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw294ud_aui_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_AUI\r
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw294ud_aui_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_AUI\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\wxmsw293ud_aui_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_aui.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw293ud_aui_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\wxmsw293ud_aui_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_aui.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw293ud_aui_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\wxmsw294ud_aui_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_aui.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw294ud_aui_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\wxmsw294ud_aui_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_aui.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw294ud_aui_vc_custom.pdb"\r
 \r
 !ELSEIF  "$(CFG)" == "aui - Win32 Universal Release"\r
 \r
index 9a7b582b4e02c063c8f0feb62f69a5106aabfbbd..839eff83a2834d3938fd543b9b25c50d3da62521 100644 (file)
@@ -47,18 +47,18 @@ RSC=rc.exe
 # PROP Output_Dir "..\..\lib\vc_dll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\base"\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_basedll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase293u_vc_custom.pdb /opt:ref /opt:icf /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 "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /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_basedll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase293u_vc_custom.pdb /opt:ref /opt:icf /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 "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /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_basedll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase294u_vc_custom.pdb /opt:ref /opt:icf /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 "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /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_basedll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase294u_vc_custom.pdb /opt:ref /opt:icf /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 "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase293u_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1\r
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase293u_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1\r
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase294u_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1\r
+# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase294u_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1\r
 BSC32=bscmake.exe\r
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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 /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase293u_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29u.lib" /debug /pdb:"..\..\lib\vc_dll\wxbase293u_vc_custom.pdb"\r
-# ADD LINK32 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 /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase293u_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29u.lib" /debug /pdb:"..\..\lib\vc_dll\wxbase293u_vc_custom.pdb"\r
+# ADD BASE LINK32 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 /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase294u_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29u.lib" /debug /pdb:"..\..\lib\vc_dll\wxbase294u_vc_custom.pdb"\r
+# ADD LINK32 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 /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase294u_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29u.lib" /debug /pdb:"..\..\lib\vc_dll\wxbase294u_vc_custom.pdb"\r
 \r
 !ELSEIF  "$(CFG)" == "base - 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\base"\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_basedll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase293ud_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 wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /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_basedll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase293ud_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 wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /c\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_basedll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase294ud_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 wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /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_basedll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase294ud_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 wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /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=wxbase293ud_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1\r
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase293ud_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1\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=wxbase294ud_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1\r
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase294ud_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1\r
 BSC32=bscmake.exe\r
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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 /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase293ud_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29ud.lib" /debug /pdb:"..\..\lib\vc_dll\wxbase293ud_vc_custom.pdb"\r
-# ADD LINK32 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 /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase293ud_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29ud.lib" /debug /pdb:"..\..\lib\vc_dll\wxbase293ud_vc_custom.pdb"\r
+# ADD BASE LINK32 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 /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase294ud_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29ud.lib" /debug /pdb:"..\..\lib\vc_dll\wxbase294ud_vc_custom.pdb"\r
+# ADD LINK32 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 /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase294ud_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29ud.lib" /debug /pdb:"..\..\lib\vc_dll\wxbase294ud_vc_custom.pdb"\r
 \r
 !ELSEIF  "$(CFG)" == "base - Win32 DLL Release"\r
 \r
@@ -97,18 +97,18 @@ LINK32=link.exe
 # PROP Output_Dir "..\..\lib\vc_dll"\r
 # PROP Intermediate_Dir "vc_mswudll\base"\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_basedll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase293u_vc_custom.pdb /opt:ref /opt:icf /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 "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /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_basedll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase293u_vc_custom.pdb /opt:ref /opt:icf /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 "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /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_basedll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase294u_vc_custom.pdb /opt:ref /opt:icf /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 "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /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_basedll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase294u_vc_custom.pdb /opt:ref /opt:icf /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 "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase293u_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1\r
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase293u_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1\r
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase294u_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1\r
+# ADD RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase294u_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1\r
 BSC32=bscmake.exe\r
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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 /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase293u_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29u.lib" /debug /pdb:"..\..\lib\vc_dll\wxbase293u_vc_custom.pdb"\r
-# ADD LINK32 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 /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase293u_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29u.lib" /debug /pdb:"..\..\lib\vc_dll\wxbase293u_vc_custom.pdb"\r
+# ADD BASE LINK32 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 /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase294u_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29u.lib" /debug /pdb:"..\..\lib\vc_dll\wxbase294u_vc_custom.pdb"\r
+# ADD LINK32 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 /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase294u_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29u.lib" /debug /pdb:"..\..\lib\vc_dll\wxbase294u_vc_custom.pdb"\r
 \r
 !ELSEIF  "$(CFG)" == "base - Win32 DLL Debug"\r
 \r
@@ -122,18 +122,18 @@ LINK32=link.exe
 # PROP Output_Dir "..\..\lib\vc_dll"\r
 # PROP Intermediate_Dir "vc_mswuddll\base"\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_basedll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase293ud_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 wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /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_basedll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase293ud_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 wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /c\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_basedll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase294ud_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 wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /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_basedll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase294ud_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 wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /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=wxbase293ud_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1\r
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase293ud_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1\r
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase294ud_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1\r
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase294ud_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1\r
 BSC32=bscmake.exe\r
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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 /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase293ud_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29ud.lib" /debug /pdb:"..\..\lib\vc_dll\wxbase293ud_vc_custom.pdb"\r
-# ADD LINK32 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 /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase293ud_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29ud.lib" /debug /pdb:"..\..\lib\vc_dll\wxbase293ud_vc_custom.pdb"\r
+# ADD BASE LINK32 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 /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase294ud_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29ud.lib" /debug /pdb:"..\..\lib\vc_dll\wxbase294ud_vc_custom.pdb"\r
+# ADD LINK32 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 /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase294ud_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29ud.lib" /debug /pdb:"..\..\lib\vc_dll\wxbase294ud_vc_custom.pdb"\r
 \r
 !ELSEIF  "$(CFG)" == "base - Win32 Universal Release"\r
 \r
index 202ce086d9918008774d0f4ea4908854bb6a588f..b7734c7efed9c674e93b61bfdfd1bc53c55a30ba 100644 (file)
@@ -47,18 +47,18 @@ RSC=rc.exe
 # PROP Output_Dir "..\..\lib\vc_dll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\core"\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_coredll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv293u_core_vc_custom.pdb /opt:ref /opt:icf /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 "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /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_coredll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv293u_core_vc_custom.pdb /opt:ref /opt:icf /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 "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /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_coredll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv294u_core_vc_custom.pdb /opt:ref /opt:icf /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 "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /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_coredll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv294u_core_vc_custom.pdb /opt:ref /opt:icf /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 "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv293u_core_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_CORE" /d wxUSE_BASE=0\r
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv293u_core_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_CORE" /d wxUSE_BASE=0\r
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv294u_core_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_CORE" /d wxUSE_BASE=0\r
+# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv294u_core_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_CORE" /d wxUSE_BASE=0\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\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv293u_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_core.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv293u_core_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\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv293u_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_core.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv293u_core_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\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv294u_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_core.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv294u_core_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\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv294u_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_core.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv294u_core_vc_custom.pdb"\r
 \r
 !ELSEIF  "$(CFG)" == "core - 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\core"\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_coredll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv293ud_core_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_CORE" /D wxUSE_BASE=0 /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_coredll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv293ud_core_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_CORE" /D wxUSE_BASE=0 /c\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_coredll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv294ud_core_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_CORE" /D wxUSE_BASE=0 /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_coredll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv294ud_core_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_CORE" /D wxUSE_BASE=0 /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_CORE" /D wxUSE_BASE=0 /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_CORE" /D wxUSE_BASE=0 /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=wxmswuniv293ud_core_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_CORE" /d wxUSE_BASE=0\r
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv293ud_core_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_CORE" /d wxUSE_BASE=0\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=wxmswuniv294ud_core_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_CORE" /d wxUSE_BASE=0\r
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv294ud_core_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_CORE" /d wxUSE_BASE=0\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\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv293ud_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_core.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv293ud_core_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\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv293ud_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_core.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv293ud_core_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\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv294ud_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_core.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv294ud_core_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\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv294ud_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_core.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv294ud_core_vc_custom.pdb"\r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
@@ -97,18 +97,18 @@ LINK32=link.exe
 # PROP Output_Dir "..\..\lib\vc_dll"\r
 # PROP Intermediate_Dir "vc_mswudll\core"\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_coredll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw293u_core_vc_custom.pdb /opt:ref /opt:icf /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 "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /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_coredll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw293u_core_vc_custom.pdb /opt:ref /opt:icf /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 "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /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_coredll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw294u_core_vc_custom.pdb /opt:ref /opt:icf /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 "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /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_coredll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw294u_core_vc_custom.pdb /opt:ref /opt:icf /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 "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw293u_core_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_CORE" /d wxUSE_BASE=0\r
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw293u_core_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_CORE" /d wxUSE_BASE=0\r
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw294u_core_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_CORE" /d wxUSE_BASE=0\r
+# ADD RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw294u_core_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_CORE" /d wxUSE_BASE=0\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\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw293u_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_core.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw293u_core_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\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw293u_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_core.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw293u_core_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\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw294u_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_core.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw294u_core_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\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw294u_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_core.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw294u_core_vc_custom.pdb"\r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"\r
 \r
@@ -122,18 +122,18 @@ LINK32=link.exe
 # PROP Output_Dir "..\..\lib\vc_dll"\r
 # PROP Intermediate_Dir "vc_mswuddll\core"\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_coredll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw293ud_core_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_CORE" /D wxUSE_BASE=0 /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_coredll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw293ud_core_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_CORE" /D wxUSE_BASE=0 /c\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_coredll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw294ud_core_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_CORE" /D wxUSE_BASE=0 /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_coredll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw294ud_core_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_CORE" /D wxUSE_BASE=0 /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_CORE" /D wxUSE_BASE=0 /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_CORE" /D wxUSE_BASE=0 /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=wxmsw293ud_core_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_CORE" /d wxUSE_BASE=0\r
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw293ud_core_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_CORE" /d wxUSE_BASE=0\r
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw294ud_core_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_CORE" /d wxUSE_BASE=0\r
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw294ud_core_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_CORE" /d wxUSE_BASE=0\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\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw293ud_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_core.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw293ud_core_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\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw293ud_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_core.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw293ud_core_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\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw294ud_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_core.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw294ud_core_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\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw294ud_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_core.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw294ud_core_vc_custom.pdb"\r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
index a719cc555dfcb175e10545105c16d279adb80388..5c716b0a938c2b471c1c905d644442ea1a8f1759 100644 (file)
@@ -47,18 +47,18 @@ RSC=rc.exe
 # PROP Output_Dir "..\..\lib\vc_dll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\gl"\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_gldll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv293u_gl_vc_custom.pdb /opt:ref /opt:icf /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 "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /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_gldll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv293u_gl_vc_custom.pdb /opt:ref /opt:icf /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 "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /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_gldll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv294u_gl_vc_custom.pdb /opt:ref /opt:icf /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 "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /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_gldll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv294u_gl_vc_custom.pdb /opt:ref /opt:icf /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 "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv293u_gl_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_GL\r
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv293u_gl_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_GL\r
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv294u_gl_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_GL\r
+# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv294u_gl_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_GL\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 wxmswuniv29u_core.lib wxbase29u.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv293u_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_gl.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv293u_gl_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 wxmswuniv29u_core.lib wxbase29u.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv293u_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_gl.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv293u_gl_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 wxmswuniv29u_core.lib wxbase29u.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv294u_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_gl.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv294u_gl_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 wxmswuniv29u_core.lib wxbase29u.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv294u_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_gl.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv294u_gl_vc_custom.pdb"\r
 \r
 !ELSEIF  "$(CFG)" == "gl - 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\gl"\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_gldll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv293ud_gl_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_GL" /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_gldll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv293ud_gl_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_GL" /c\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_gldll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv294ud_gl_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_GL" /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_gldll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv294ud_gl_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_GL" /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_GL" /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_GL" /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=wxmswuniv293ud_gl_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_GL\r
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv293ud_gl_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_GL\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=wxmswuniv294ud_gl_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_GL\r
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv294ud_gl_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_GL\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 wxmswuniv29ud_core.lib wxbase29ud.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv293ud_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_gl.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv293ud_gl_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 wxmswuniv29ud_core.lib wxbase29ud.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv293ud_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_gl.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv293ud_gl_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 wxmswuniv29ud_core.lib wxbase29ud.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv294ud_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_gl.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv294ud_gl_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 wxmswuniv29ud_core.lib wxbase29ud.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv294ud_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_gl.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv294ud_gl_vc_custom.pdb"\r
 \r
 !ELSEIF  "$(CFG)" == "gl - Win32 DLL Release"\r
 \r
@@ -97,18 +97,18 @@ LINK32=link.exe
 # PROP Output_Dir "..\..\lib\vc_dll"\r
 # PROP Intermediate_Dir "vc_mswudll\gl"\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_gldll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw293u_gl_vc_custom.pdb /opt:ref /opt:icf /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 "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /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_gldll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw293u_gl_vc_custom.pdb /opt:ref /opt:icf /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 "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /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_gldll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw294u_gl_vc_custom.pdb /opt:ref /opt:icf /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 "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /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_gldll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw294u_gl_vc_custom.pdb /opt:ref /opt:icf /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 "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw293u_gl_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_GL\r
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw293u_gl_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_GL\r
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw294u_gl_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_GL\r
+# ADD RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw294u_gl_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_GL\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 wxmsw29u_core.lib wxbase29u.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw293u_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_gl.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw293u_gl_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 wxmsw29u_core.lib wxbase29u.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw293u_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_gl.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw293u_gl_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 wxmsw29u_core.lib wxbase29u.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw294u_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_gl.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw294u_gl_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 wxmsw29u_core.lib wxbase29u.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw294u_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_gl.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw294u_gl_vc_custom.pdb"\r
 \r
 !ELSEIF  "$(CFG)" == "gl - Win32 DLL Debug"\r
 \r
@@ -122,18 +122,18 @@ LINK32=link.exe
 # PROP Output_Dir "..\..\lib\vc_dll"\r
 # PROP Intermediate_Dir "vc_mswuddll\gl"\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_gldll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw293ud_gl_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_GL" /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_gldll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw293ud_gl_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_GL" /c\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_gldll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw294ud_gl_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_GL" /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_gldll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw294ud_gl_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_GL" /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_GL" /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_GL" /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=wxmsw293ud_gl_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_GL\r
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw293ud_gl_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_GL\r
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw294ud_gl_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_GL\r
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw294ud_gl_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_GL\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 wxmsw29ud_core.lib wxbase29ud.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw293ud_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_gl.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw293ud_gl_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 wxmsw29ud_core.lib wxbase29ud.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw293ud_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_gl.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw293ud_gl_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 wxmsw29ud_core.lib wxbase29ud.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw294ud_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_gl.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw294ud_gl_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 wxmsw29ud_core.lib wxbase29ud.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw294ud_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_gl.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw294ud_gl_vc_custom.pdb"\r
 \r
 !ELSEIF  "$(CFG)" == "gl - Win32 Universal Release"\r
 \r
index c02f88d2d41557b8cb90081096c3a98a881b01ca..4d72b830a0d49cb2065025061552cea0b30496b2 100644 (file)
@@ -47,18 +47,18 @@ RSC=rc.exe
 # PROP Output_Dir "..\..\lib\vc_dll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\html"\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_htmldll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv293u_html_vc_custom.pdb /opt:ref /opt:icf /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 "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /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_htmldll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv293u_html_vc_custom.pdb /opt:ref /opt:icf /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 "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /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_htmldll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv294u_html_vc_custom.pdb /opt:ref /opt:icf /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 "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /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_htmldll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv294u_html_vc_custom.pdb /opt:ref /opt:icf /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 "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv293u_html_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_HTML\r
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv293u_html_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_HTML\r
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv294u_html_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_HTML\r
+# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv294u_html_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_HTML\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_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv293u_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_html.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv293u_html_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_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv293u_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_html.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv293u_html_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_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv294u_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_html.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv294u_html_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_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv294u_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_html.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv294u_html_vc_custom.pdb"\r
 \r
 !ELSEIF  "$(CFG)" == "html - 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\html"\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_htmldll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv293ud_html_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_HTML" /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_htmldll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv293ud_html_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_HTML" /c\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_htmldll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv294ud_html_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_HTML" /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_htmldll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv294ud_html_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_HTML" /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_HTML" /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_HTML" /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=wxmswuniv293ud_html_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_HTML\r
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv293ud_html_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_HTML\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=wxmswuniv294ud_html_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_HTML\r
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv294ud_html_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_HTML\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_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv293ud_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_html.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv293ud_html_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_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv293ud_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_html.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv293ud_html_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_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv294ud_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_html.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv294ud_html_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_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv294ud_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_html.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv294ud_html_vc_custom.pdb"\r
 \r
 !ELSEIF  "$(CFG)" == "html - Win32 DLL Release"\r
 \r
@@ -97,18 +97,18 @@ LINK32=link.exe
 # PROP Output_Dir "..\..\lib\vc_dll"\r
 # PROP Intermediate_Dir "vc_mswudll\html"\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_htmldll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw293u_html_vc_custom.pdb /opt:ref /opt:icf /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 "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /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_htmldll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw293u_html_vc_custom.pdb /opt:ref /opt:icf /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 "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /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_htmldll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw294u_html_vc_custom.pdb /opt:ref /opt:icf /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 "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /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_htmldll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw294u_html_vc_custom.pdb /opt:ref /opt:icf /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 "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw293u_html_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_HTML\r
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw293u_html_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_HTML\r
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw294u_html_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_HTML\r
+# ADD RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw294u_html_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_HTML\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_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw293u_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_html.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw293u_html_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_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw293u_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_html.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw293u_html_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_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw294u_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_html.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw294u_html_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_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw294u_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_html.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw294u_html_vc_custom.pdb"\r
 \r
 !ELSEIF  "$(CFG)" == "html - Win32 DLL Debug"\r
 \r
@@ -122,18 +122,18 @@ LINK32=link.exe
 # PROP Output_Dir "..\..\lib\vc_dll"\r
 # PROP Intermediate_Dir "vc_mswuddll\html"\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_htmldll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw293ud_html_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_HTML" /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_htmldll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw293ud_html_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_HTML" /c\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_htmldll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw294ud_html_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_HTML" /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_htmldll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw294ud_html_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_HTML" /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_HTML" /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_HTML" /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=wxmsw293ud_html_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_HTML\r
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw293ud_html_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_HTML\r
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw294ud_html_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_HTML\r
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw294ud_html_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_HTML\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_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw293ud_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_html.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw293ud_html_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_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw293ud_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_html.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw293ud_html_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_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw294ud_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_html.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw294ud_html_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_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw294ud_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_html.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw294ud_html_vc_custom.pdb"\r
 \r
 !ELSEIF  "$(CFG)" == "html - Win32 Universal Release"\r
 \r
index 41b197b77921576c58ce3bcbbddf2e9c9e117611..4b68bde306d55abc4c8542aa167835a0570889de 100644 (file)
@@ -47,18 +47,18 @@ RSC=rc.exe
 # PROP Output_Dir "..\..\lib\vc_dll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\media"\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_mediadll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv293u_media_vc_custom.pdb /opt:ref /opt:icf /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 "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_MEDIA" /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_mediadll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv293u_media_vc_custom.pdb /opt:ref /opt:icf /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 "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_MEDIA" /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_mediadll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv294u_media_vc_custom.pdb /opt:ref /opt:icf /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 "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_MEDIA" /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_mediadll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv294u_media_vc_custom.pdb /opt:ref /opt:icf /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 "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_MEDIA" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_MEDIA" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_MEDIA" /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv293u_media_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_MEDIA\r
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv293u_media_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_MEDIA\r
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv294u_media_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_MEDIA\r
+# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv294u_media_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_MEDIA\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_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv293u_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_media.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv293u_media_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_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv293u_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_media.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv293u_media_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_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv294u_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_media.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv294u_media_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_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv294u_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_media.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv294u_media_vc_custom.pdb"\r
 \r
 !ELSEIF  "$(CFG)" == "media - 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\media"\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_mediadll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv293ud_media_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_MEDIA" /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_mediadll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv293ud_media_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_MEDIA" /c\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_mediadll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv294ud_media_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_MEDIA" /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_mediadll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv294ud_media_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_MEDIA" /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_MEDIA" /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_MEDIA" /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=wxmswuniv293ud_media_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_MEDIA\r
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv293ud_media_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_MEDIA\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=wxmswuniv294ud_media_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_MEDIA\r
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv294ud_media_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_MEDIA\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_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv293ud_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_media.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv293ud_media_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_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv293ud_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_media.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv293ud_media_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_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv294ud_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_media.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv294ud_media_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_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv294ud_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_media.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv294ud_media_vc_custom.pdb"\r
 \r
 !ELSEIF  "$(CFG)" == "media - Win32 DLL Release"\r
 \r
@@ -97,18 +97,18 @@ LINK32=link.exe
 # PROP Output_Dir "..\..\lib\vc_dll"\r
 # PROP Intermediate_Dir "vc_mswudll\media"\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_mediadll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw293u_media_vc_custom.pdb /opt:ref /opt:icf /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 "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_MEDIA" /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_mediadll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw293u_media_vc_custom.pdb /opt:ref /opt:icf /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 "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_MEDIA" /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_mediadll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw294u_media_vc_custom.pdb /opt:ref /opt:icf /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 "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_MEDIA" /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_mediadll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw294u_media_vc_custom.pdb /opt:ref /opt:icf /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 "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_MEDIA" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_MEDIA" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_MEDIA" /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw293u_media_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_MEDIA\r
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw293u_media_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_MEDIA\r
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw294u_media_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_MEDIA\r
+# ADD RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw294u_media_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_MEDIA\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_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw293u_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_media.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw293u_media_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_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw293u_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_media.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw293u_media_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_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw294u_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_media.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw294u_media_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_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw294u_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_media.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw294u_media_vc_custom.pdb"\r
 \r
 !ELSEIF  "$(CFG)" == "media - Win32 DLL Debug"\r
 \r
@@ -122,18 +122,18 @@ LINK32=link.exe
 # PROP Output_Dir "..\..\lib\vc_dll"\r
 # PROP Intermediate_Dir "vc_mswuddll\media"\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_mediadll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw293ud_media_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_MEDIA" /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_mediadll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw293ud_media_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_MEDIA" /c\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_mediadll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw294ud_media_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_MEDIA" /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_mediadll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw294ud_media_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_MEDIA" /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_MEDIA" /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_MEDIA" /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=wxmsw293ud_media_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_MEDIA\r
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw293ud_media_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_MEDIA\r
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw294ud_media_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_MEDIA\r
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw294ud_media_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_MEDIA\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_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw293ud_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_media.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw293ud_media_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_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw293ud_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_media.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw293ud_media_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_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw294ud_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_media.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw294ud_media_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_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw294ud_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_media.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw294ud_media_vc_custom.pdb"\r
 \r
 !ELSEIF  "$(CFG)" == "media - Win32 Universal Release"\r
 \r
index 5d704c4d1514a872cd3a7bd50abde449397863ac..48dbf92ec8736162c56e93b99eec8d719be6f606 100644 (file)
@@ -47,18 +47,18 @@ RSC=rc.exe
 # PROP Output_Dir "..\..\lib\vc_dll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\net"\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_netdll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase293u_net_vc_custom.pdb /opt:ref /opt:icf /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 "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /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_netdll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase293u_net_vc_custom.pdb /opt:ref /opt:icf /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 "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /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_netdll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase294u_net_vc_custom.pdb /opt:ref /opt:icf /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 "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /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_netdll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase294u_net_vc_custom.pdb /opt:ref /opt:icf /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 "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase293u_net_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_NET\r
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase293u_net_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_NET\r
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase294u_net_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_NET\r
+# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase294u_net_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_NET\r
 BSC32=bscmake.exe\r
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase293u_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29u_net.lib" /debug /pdb:"..\..\lib\vc_dll\wxbase293u_net_vc_custom.pdb"\r
-# ADD LINK32 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\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase293u_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29u_net.lib" /debug /pdb:"..\..\lib\vc_dll\wxbase293u_net_vc_custom.pdb"\r
+# ADD BASE LINK32 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\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase294u_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29u_net.lib" /debug /pdb:"..\..\lib\vc_dll\wxbase294u_net_vc_custom.pdb"\r
+# ADD LINK32 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\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase294u_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29u_net.lib" /debug /pdb:"..\..\lib\vc_dll\wxbase294u_net_vc_custom.pdb"\r
 \r
 !ELSEIF  "$(CFG)" == "net - 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\net"\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_netdll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase293ud_net_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 wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /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_netdll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase293ud_net_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 wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c\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_netdll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase294ud_net_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 wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /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_netdll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase294ud_net_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 wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /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=wxbase293ud_net_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_NET\r
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase293ud_net_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_NET\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=wxbase294ud_net_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_NET\r
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase294ud_net_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_NET\r
 BSC32=bscmake.exe\r
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase293ud_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29ud_net.lib" /debug /pdb:"..\..\lib\vc_dll\wxbase293ud_net_vc_custom.pdb"\r
-# ADD LINK32 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\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase293ud_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29ud_net.lib" /debug /pdb:"..\..\lib\vc_dll\wxbase293ud_net_vc_custom.pdb"\r
+# ADD BASE LINK32 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\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase294ud_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29ud_net.lib" /debug /pdb:"..\..\lib\vc_dll\wxbase294ud_net_vc_custom.pdb"\r
+# ADD LINK32 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\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase294ud_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29ud_net.lib" /debug /pdb:"..\..\lib\vc_dll\wxbase294ud_net_vc_custom.pdb"\r
 \r
 !ELSEIF  "$(CFG)" == "net - Win32 DLL Release"\r
 \r
@@ -97,18 +97,18 @@ LINK32=link.exe
 # PROP Output_Dir "..\..\lib\vc_dll"\r
 # PROP Intermediate_Dir "vc_mswudll\net"\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_netdll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase293u_net_vc_custom.pdb /opt:ref /opt:icf /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 "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /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_netdll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase293u_net_vc_custom.pdb /opt:ref /opt:icf /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 "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /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_netdll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase294u_net_vc_custom.pdb /opt:ref /opt:icf /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 "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /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_netdll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase294u_net_vc_custom.pdb /opt:ref /opt:icf /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 "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase293u_net_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_NET\r
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase293u_net_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_NET\r
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase294u_net_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_NET\r
+# ADD RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase294u_net_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_NET\r
 BSC32=bscmake.exe\r
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase293u_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29u_net.lib" /debug /pdb:"..\..\lib\vc_dll\wxbase293u_net_vc_custom.pdb"\r
-# ADD LINK32 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\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase293u_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29u_net.lib" /debug /pdb:"..\..\lib\vc_dll\wxbase293u_net_vc_custom.pdb"\r
+# ADD BASE LINK32 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\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase294u_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29u_net.lib" /debug /pdb:"..\..\lib\vc_dll\wxbase294u_net_vc_custom.pdb"\r
+# ADD LINK32 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\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase294u_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29u_net.lib" /debug /pdb:"..\..\lib\vc_dll\wxbase294u_net_vc_custom.pdb"\r
 \r
 !ELSEIF  "$(CFG)" == "net - Win32 DLL Debug"\r
 \r
@@ -122,18 +122,18 @@ LINK32=link.exe
 # PROP Output_Dir "..\..\lib\vc_dll"\r
 # PROP Intermediate_Dir "vc_mswuddll\net"\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_netdll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase293ud_net_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 wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /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_netdll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase293ud_net_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 wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c\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_netdll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase294ud_net_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 wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /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_netdll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase294ud_net_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 wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /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=wxbase293ud_net_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_NET\r
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase293ud_net_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_NET\r
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase294ud_net_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_NET\r
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase294ud_net_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_NET\r
 BSC32=bscmake.exe\r
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase293ud_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29ud_net.lib" /debug /pdb:"..\..\lib\vc_dll\wxbase293ud_net_vc_custom.pdb"\r
-# ADD LINK32 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\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase293ud_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29ud_net.lib" /debug /pdb:"..\..\lib\vc_dll\wxbase293ud_net_vc_custom.pdb"\r
+# ADD BASE LINK32 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\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase294ud_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29ud_net.lib" /debug /pdb:"..\..\lib\vc_dll\wxbase294ud_net_vc_custom.pdb"\r
+# ADD LINK32 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\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase294ud_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29ud_net.lib" /debug /pdb:"..\..\lib\vc_dll\wxbase294ud_net_vc_custom.pdb"\r
 \r
 !ELSEIF  "$(CFG)" == "net - Win32 Universal Release"\r
 \r
index 48546a38129e91a7e16cec938691d2a77f20b2a2..f1e5f6e6197f6da9de0db5dfdb5548b2bd0765b7 100644 (file)
@@ -47,18 +47,18 @@ RSC=rc.exe
 # PROP Output_Dir "..\..\lib\vc_dll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\propgrid"\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_propgriddll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv293u_propgrid_vc_custom.pdb /opt:ref /opt:icf /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 "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_PROPGRID" /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_propgriddll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv293u_propgrid_vc_custom.pdb /opt:ref /opt:icf /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 "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_PROPGRID" /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_propgriddll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv294u_propgrid_vc_custom.pdb /opt:ref /opt:icf /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 "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_PROPGRID" /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_propgriddll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv294u_propgrid_vc_custom.pdb /opt:ref /opt:icf /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 "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_PROPGRID" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_PROPGRID" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_PROPGRID" /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv293u_propgrid_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_PROPGRID\r
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv293u_propgrid_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_PROPGRID\r
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv294u_propgrid_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_PROPGRID\r
+# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv294u_propgrid_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_PROPGRID\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\wxmswuniv293u_propgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_propgrid.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv293u_propgrid_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\wxmswuniv293u_propgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_propgrid.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv293u_propgrid_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\wxmswuniv294u_propgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_propgrid.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv294u_propgrid_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\wxmswuniv294u_propgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_propgrid.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv294u_propgrid_vc_custom.pdb"\r
 \r
 !ELSEIF  "$(CFG)" == "propgrid - 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\propgrid"\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_propgriddll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv293ud_propgrid_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_PROPGRID" /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_propgriddll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv293ud_propgrid_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_PROPGRID" /c\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_propgriddll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv294ud_propgrid_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_PROPGRID" /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_propgriddll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv294ud_propgrid_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_PROPGRID" /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_PROPGRID" /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_PROPGRID" /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=wxmswuniv293ud_propgrid_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_PROPGRID\r
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv293ud_propgrid_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_PROPGRID\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=wxmswuniv294ud_propgrid_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_PROPGRID\r
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv294ud_propgrid_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_PROPGRID\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\wxmswuniv293ud_propgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_propgrid.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv293ud_propgrid_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\wxmswuniv293ud_propgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_propgrid.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv293ud_propgrid_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\wxmswuniv294ud_propgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_propgrid.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv294ud_propgrid_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\wxmswuniv294ud_propgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_propgrid.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv294ud_propgrid_vc_custom.pdb"\r
 \r
 !ELSEIF  "$(CFG)" == "propgrid - Win32 DLL Release"\r
 \r
@@ -97,18 +97,18 @@ LINK32=link.exe
 # PROP Output_Dir "..\..\lib\vc_dll"\r
 # PROP Intermediate_Dir "vc_mswudll\propgrid"\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_propgriddll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw293u_propgrid_vc_custom.pdb /opt:ref /opt:icf /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 "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_PROPGRID" /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_propgriddll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw293u_propgrid_vc_custom.pdb /opt:ref /opt:icf /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 "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_PROPGRID" /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_propgriddll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw294u_propgrid_vc_custom.pdb /opt:ref /opt:icf /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 "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_PROPGRID" /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_propgriddll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw294u_propgrid_vc_custom.pdb /opt:ref /opt:icf /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 "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_PROPGRID" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_PROPGRID" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_PROPGRID" /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw293u_propgrid_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_PROPGRID\r
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw293u_propgrid_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_PROPGRID\r
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw294u_propgrid_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_PROPGRID\r
+# ADD RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw294u_propgrid_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_PROPGRID\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\wxmsw293u_propgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_propgrid.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw293u_propgrid_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\wxmsw293u_propgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_propgrid.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw293u_propgrid_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\wxmsw294u_propgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_propgrid.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw294u_propgrid_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\wxmsw294u_propgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_propgrid.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw294u_propgrid_vc_custom.pdb"\r
 \r
 !ELSEIF  "$(CFG)" == "propgrid - Win32 DLL Debug"\r
 \r
@@ -122,18 +122,18 @@ LINK32=link.exe
 # PROP Output_Dir "..\..\lib\vc_dll"\r
 # PROP Intermediate_Dir "vc_mswuddll\propgrid"\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_propgriddll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw293ud_propgrid_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_PROPGRID" /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_propgriddll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw293ud_propgrid_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_PROPGRID" /c\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_propgriddll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw294ud_propgrid_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_PROPGRID" /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_propgriddll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw294ud_propgrid_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_PROPGRID" /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_PROPGRID" /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_PROPGRID" /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=wxmsw293ud_propgrid_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_PROPGRID\r
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw293ud_propgrid_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_PROPGRID\r
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw294ud_propgrid_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_PROPGRID\r
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw294ud_propgrid_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_PROPGRID\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\wxmsw293ud_propgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_propgrid.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw293ud_propgrid_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\wxmsw293ud_propgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_propgrid.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw293ud_propgrid_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\wxmsw294ud_propgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_propgrid.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw294ud_propgrid_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\wxmsw294ud_propgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_propgrid.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw294ud_propgrid_vc_custom.pdb"\r
 \r
 !ELSEIF  "$(CFG)" == "propgrid - Win32 Universal Release"\r
 \r
index 7e77396d79ece67b7ed2fe9592f412ea615a938e..dd546d95bd6b6d7854ba91e11de2186fffb27d14 100644 (file)
@@ -47,18 +47,18 @@ RSC=rc.exe
 # PROP Output_Dir "..\..\lib\vc_dll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\qa"\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_qadll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv293u_qa_vc_custom.pdb /opt:ref /opt:icf /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 "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_QA" /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_qadll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv293u_qa_vc_custom.pdb /opt:ref /opt:icf /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 "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_QA" /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_qadll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv294u_qa_vc_custom.pdb /opt:ref /opt:icf /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 "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_QA" /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_qadll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv294u_qa_vc_custom.pdb /opt:ref /opt:icf /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 "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_QA" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_QA" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_QA" /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv293u_qa_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_QA\r
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv293u_qa_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_QA\r
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv294u_qa_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_QA\r
+# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv294u_qa_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_QA\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_core.lib ..\..\lib\vc_dll\wxbase29u.lib ..\..\lib\vc_dll\wxbase29u_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv293u_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_qa.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv293u_qa_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_core.lib ..\..\lib\vc_dll\wxbase29u.lib ..\..\lib\vc_dll\wxbase29u_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv293u_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_qa.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv293u_qa_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_core.lib ..\..\lib\vc_dll\wxbase29u.lib ..\..\lib\vc_dll\wxbase29u_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv294u_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_qa.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv294u_qa_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_core.lib ..\..\lib\vc_dll\wxbase29u.lib ..\..\lib\vc_dll\wxbase29u_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv294u_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_qa.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv294u_qa_vc_custom.pdb"\r
 \r
 !ELSEIF  "$(CFG)" == "qa - 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\qa"\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_qadll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv293ud_qa_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_QA" /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_qadll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv293ud_qa_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_QA" /c\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_qadll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv294ud_qa_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_QA" /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_qadll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv294ud_qa_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_QA" /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_QA" /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_QA" /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=wxmswuniv293ud_qa_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_QA\r
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv293ud_qa_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_QA\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=wxmswuniv294ud_qa_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_QA\r
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv294ud_qa_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_QA\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_core.lib ..\..\lib\vc_dll\wxbase29ud.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv293ud_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_qa.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv293ud_qa_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_core.lib ..\..\lib\vc_dll\wxbase29ud.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv293ud_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_qa.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv293ud_qa_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_core.lib ..\..\lib\vc_dll\wxbase29ud.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv294ud_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_qa.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv294ud_qa_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_core.lib ..\..\lib\vc_dll\wxbase29ud.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv294ud_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_qa.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv294ud_qa_vc_custom.pdb"\r
 \r
 !ELSEIF  "$(CFG)" == "qa - Win32 DLL Release"\r
 \r
@@ -97,18 +97,18 @@ LINK32=link.exe
 # PROP Output_Dir "..\..\lib\vc_dll"\r
 # PROP Intermediate_Dir "vc_mswudll\qa"\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_qadll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw293u_qa_vc_custom.pdb /opt:ref /opt:icf /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 "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_QA" /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_qadll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw293u_qa_vc_custom.pdb /opt:ref /opt:icf /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 "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_QA" /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_qadll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw294u_qa_vc_custom.pdb /opt:ref /opt:icf /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 "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_QA" /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_qadll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw294u_qa_vc_custom.pdb /opt:ref /opt:icf /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 "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_QA" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_QA" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_QA" /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw293u_qa_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_QA\r
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw293u_qa_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_QA\r
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw294u_qa_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_QA\r
+# ADD RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw294u_qa_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_QA\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_core.lib ..\..\lib\vc_dll\wxbase29u.lib ..\..\lib\vc_dll\wxbase29u_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw293u_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_qa.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw293u_qa_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_core.lib ..\..\lib\vc_dll\wxbase29u.lib ..\..\lib\vc_dll\wxbase29u_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw293u_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_qa.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw293u_qa_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_core.lib ..\..\lib\vc_dll\wxbase29u.lib ..\..\lib\vc_dll\wxbase29u_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw294u_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_qa.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw294u_qa_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_core.lib ..\..\lib\vc_dll\wxbase29u.lib ..\..\lib\vc_dll\wxbase29u_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw294u_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_qa.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw294u_qa_vc_custom.pdb"\r
 \r
 !ELSEIF  "$(CFG)" == "qa - Win32 DLL Debug"\r
 \r
@@ -122,18 +122,18 @@ LINK32=link.exe
 # PROP Output_Dir "..\..\lib\vc_dll"\r
 # PROP Intermediate_Dir "vc_mswuddll\qa"\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_qadll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw293ud_qa_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_QA" /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_qadll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw293ud_qa_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_QA" /c\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_qadll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw294ud_qa_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_QA" /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_qadll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw294ud_qa_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_QA" /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_QA" /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_QA" /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=wxmsw293ud_qa_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_QA\r
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw293ud_qa_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_QA\r
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw294ud_qa_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_QA\r
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw294ud_qa_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_QA\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_core.lib ..\..\lib\vc_dll\wxbase29ud.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw293ud_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_qa.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw293ud_qa_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_core.lib ..\..\lib\vc_dll\wxbase29ud.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw293ud_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_qa.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw293ud_qa_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_core.lib ..\..\lib\vc_dll\wxbase29ud.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw294ud_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_qa.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw294ud_qa_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_core.lib ..\..\lib\vc_dll\wxbase29ud.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw294ud_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_qa.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw294ud_qa_vc_custom.pdb"\r
 \r
 !ELSEIF  "$(CFG)" == "qa - Win32 Universal Release"\r
 \r
index a214dfca16d4a64836799b3230b0202f0ff91732..76a6889dd598dc744e3df8e1a204f35699e92435 100644 (file)
@@ -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
-# 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\wxmswuniv293u_ribbon_vc_custom.pdb /opt:ref /opt:icf /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 "NDEBUG" /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\wxmswuniv293u_ribbon_vc_custom.pdb /opt:ref /opt:icf /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 "NDEBUG" /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\wxmswuniv294u_ribbon_vc_custom.pdb /opt:ref /opt:icf /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 "NDEBUG" /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\wxmswuniv294u_ribbon_vc_custom.pdb /opt:ref /opt:icf /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 "NDEBUG" /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 "NDEBUG" /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 "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RIBBON" /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv293u_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 "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv293u_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 "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv294u_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 "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv294u_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
-# 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\wxmswuniv293u_ribbon_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_ribbon.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv293u_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\wxmswuniv293u_ribbon_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_ribbon.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv293u_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\wxmswuniv294u_ribbon_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_ribbon.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv294u_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\wxmswuniv294u_ribbon_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_ribbon.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv294u_ribbon_vc_custom.pdb"\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
-# 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\wxmswuniv293ud_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\wxmswuniv293ud_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 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\wxmswuniv294ud_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\wxmswuniv294ud_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=wxmswuniv293ud_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=wxmswuniv293ud_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 "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv294ud_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=wxmswuniv294ud_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
-# 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\wxmswuniv293ud_ribbon_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_ribbon.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv293ud_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\wxmswuniv293ud_ribbon_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_ribbon.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv293ud_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\wxmswuniv294ud_ribbon_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_ribbon.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv294ud_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\wxmswuniv294ud_ribbon_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_ribbon.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv294ud_ribbon_vc_custom.pdb"\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
-# 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\wxmsw293u_ribbon_vc_custom.pdb /opt:ref /opt:icf /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 "NDEBUG" /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\wxmsw293u_ribbon_vc_custom.pdb /opt:ref /opt:icf /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 "NDEBUG" /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\wxmsw294u_ribbon_vc_custom.pdb /opt:ref /opt:icf /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 "NDEBUG" /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\wxmsw294u_ribbon_vc_custom.pdb /opt:ref /opt:icf /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 "NDEBUG" /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 "NDEBUG" /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 "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RIBBON" /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw293u_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 "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw293u_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 "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw294u_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 "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw294u_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
-# 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\wxmsw293u_ribbon_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_ribbon.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw293u_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\wxmsw293u_ribbon_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_ribbon.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw293u_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\wxmsw294u_ribbon_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_ribbon.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw294u_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\wxmsw294u_ribbon_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_ribbon.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw294u_ribbon_vc_custom.pdb"\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
-# 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\wxmsw293ud_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\wxmsw293ud_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 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\wxmsw294ud_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\wxmsw294ud_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=wxmsw293ud_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=wxmsw293ud_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 "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw294ud_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=wxmsw294ud_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
-# 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\wxmsw293ud_ribbon_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_ribbon.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw293ud_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\wxmsw293ud_ribbon_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_ribbon.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw293ud_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\wxmsw294ud_ribbon_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_ribbon.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw294ud_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\wxmsw294ud_ribbon_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_ribbon.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw294ud_ribbon_vc_custom.pdb"\r
 \r
 !ELSEIF  "$(CFG)" == "ribbon - Win32 Universal Release"\r
 \r
index 7e4d653b8a844920980870b0073a2ef95aed8be2..2f30d84061fb3bb2bf80aa1018cca0cf282517c8 100644 (file)
@@ -47,18 +47,18 @@ RSC=rc.exe
 # PROP Output_Dir "..\..\lib\vc_dll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\richtext"\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_richtextdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv293u_richtext_vc_custom.pdb /opt:ref /opt:icf /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 "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RICHTEXT" /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_richtextdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv293u_richtext_vc_custom.pdb /opt:ref /opt:icf /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 "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RICHTEXT" /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_richtextdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv294u_richtext_vc_custom.pdb /opt:ref /opt:icf /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 "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RICHTEXT" /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_richtextdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv294u_richtext_vc_custom.pdb /opt:ref /opt:icf /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 "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RICHTEXT" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RICHTEXT" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RICHTEXT" /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv293u_richtext_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_RICHTEXT\r
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv293u_richtext_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_RICHTEXT\r
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv294u_richtext_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_RICHTEXT\r
+# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv294u_richtext_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_RICHTEXT\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_html.lib ..\..\lib\vc_dll\wxbase29u_xml.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv293u_richtext_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_richtext.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv293u_richtext_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_html.lib ..\..\lib\vc_dll\wxbase29u_xml.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv293u_richtext_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_richtext.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv293u_richtext_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_html.lib ..\..\lib\vc_dll\wxbase29u_xml.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv294u_richtext_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_richtext.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv294u_richtext_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_html.lib ..\..\lib\vc_dll\wxbase29u_xml.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv294u_richtext_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_richtext.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv294u_richtext_vc_custom.pdb"\r
 \r
 !ELSEIF  "$(CFG)" == "richtext - 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\richtext"\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_richtextdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv293ud_richtext_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_RICHTEXT" /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_richtextdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv293ud_richtext_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_RICHTEXT" /c\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_richtextdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv294ud_richtext_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_RICHTEXT" /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_richtextdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv294ud_richtext_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_RICHTEXT" /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_RICHTEXT" /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_RICHTEXT" /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=wxmswuniv293ud_richtext_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_RICHTEXT\r
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv293ud_richtext_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_RICHTEXT\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=wxmswuniv294ud_richtext_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_RICHTEXT\r
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv294ud_richtext_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_RICHTEXT\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_html.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv293ud_richtext_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_richtext.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv293ud_richtext_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_html.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv293ud_richtext_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_richtext.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv293ud_richtext_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_html.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv294ud_richtext_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_richtext.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv294ud_richtext_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_html.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv294ud_richtext_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_richtext.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv294ud_richtext_vc_custom.pdb"\r
 \r
 !ELSEIF  "$(CFG)" == "richtext - Win32 DLL Release"\r
 \r
@@ -97,18 +97,18 @@ LINK32=link.exe
 # PROP Output_Dir "..\..\lib\vc_dll"\r
 # PROP Intermediate_Dir "vc_mswudll\richtext"\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_richtextdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw293u_richtext_vc_custom.pdb /opt:ref /opt:icf /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 "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RICHTEXT" /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_richtextdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw293u_richtext_vc_custom.pdb /opt:ref /opt:icf /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 "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RICHTEXT" /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_richtextdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw294u_richtext_vc_custom.pdb /opt:ref /opt:icf /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 "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RICHTEXT" /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_richtextdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw294u_richtext_vc_custom.pdb /opt:ref /opt:icf /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 "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RICHTEXT" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RICHTEXT" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RICHTEXT" /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw293u_richtext_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_RICHTEXT\r
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw293u_richtext_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_RICHTEXT\r
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw294u_richtext_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_RICHTEXT\r
+# ADD RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw294u_richtext_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_RICHTEXT\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_html.lib ..\..\lib\vc_dll\wxbase29u_xml.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw293u_richtext_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_richtext.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw293u_richtext_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_html.lib ..\..\lib\vc_dll\wxbase29u_xml.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw293u_richtext_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_richtext.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw293u_richtext_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_html.lib ..\..\lib\vc_dll\wxbase29u_xml.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw294u_richtext_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_richtext.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw294u_richtext_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_html.lib ..\..\lib\vc_dll\wxbase29u_xml.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw294u_richtext_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_richtext.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw294u_richtext_vc_custom.pdb"\r
 \r
 !ELSEIF  "$(CFG)" == "richtext - Win32 DLL Debug"\r
 \r
@@ -122,18 +122,18 @@ LINK32=link.exe
 # PROP Output_Dir "..\..\lib\vc_dll"\r
 # PROP Intermediate_Dir "vc_mswuddll\richtext"\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_richtextdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw293ud_richtext_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_RICHTEXT" /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_richtextdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw293ud_richtext_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_RICHTEXT" /c\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_richtextdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw294ud_richtext_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_RICHTEXT" /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_richtextdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw294ud_richtext_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_RICHTEXT" /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_RICHTEXT" /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_RICHTEXT" /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=wxmsw293ud_richtext_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_RICHTEXT\r
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw293ud_richtext_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_RICHTEXT\r
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw294ud_richtext_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_RICHTEXT\r
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw294ud_richtext_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_RICHTEXT\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_html.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw293ud_richtext_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_richtext.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw293ud_richtext_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_html.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw293ud_richtext_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_richtext.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw293ud_richtext_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_html.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw294ud_richtext_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_richtext.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw294ud_richtext_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_html.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw294ud_richtext_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_richtext.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw294ud_richtext_vc_custom.pdb"\r
 \r
 !ELSEIF  "$(CFG)" == "richtext - Win32 Universal Release"\r
 \r
index 50cbbc40c6006617e13d1763226a884cd1b5550b..54a978a70f77445c5a0fe868f23c7be9793c805f 100644 (file)
@@ -47,18 +47,18 @@ RSC=rc.exe
 # PROP Output_Dir "..\..\lib\vc_dll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\stc"\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_stcdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv293u_stc_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /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_stcdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv293u_stc_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /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_stcdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv294u_stc_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /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_stcdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv294u_stc_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv293u_stc_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /i "..\..\src\stc\scintilla\include" /i "..\..\src\stc\scintilla\src" /d "__WX__" /d "SCI_LEXER" /d "LINK_LEXERS" /d "WXUSINGDLL" /d WXMAKINGDLL_STC\r
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv293u_stc_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /i "..\..\src\stc\scintilla\include" /i "..\..\src\stc\scintilla\src" /d "__WX__" /d "SCI_LEXER" /d "LINK_LEXERS" /d "WXUSINGDLL" /d WXMAKINGDLL_STC\r
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv294u_stc_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /i "..\..\src\stc\scintilla\include" /i "..\..\src\stc\scintilla\src" /d "__WX__" /d "SCI_LEXER" /d "LINK_LEXERS" /d "WXUSINGDLL" /d WXMAKINGDLL_STC\r
+# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv294u_stc_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /i "..\..\src\stc\scintilla\include" /i "..\..\src\stc\scintilla\src" /d "__WX__" /d "SCI_LEXER" /d "LINK_LEXERS" /d "WXUSINGDLL" /d WXMAKINGDLL_STC\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\wxscintilla.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv293u_stc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_stc.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv293u_stc_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\wxscintilla.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv293u_stc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_stc.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv293u_stc_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\wxscintilla.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv294u_stc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_stc.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv294u_stc_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\wxscintilla.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv294u_stc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_stc.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv294u_stc_vc_custom.pdb"\r
 \r
 !ELSEIF  "$(CFG)" == "stc - 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\stc"\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_stcdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv293ud_stc_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /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_stcdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv293ud_stc_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /c\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_stcdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv294ud_stc_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /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_stcdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv294ud_stc_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /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=wxmswuniv293ud_stc_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /i "..\..\src\stc\scintilla\include" /i "..\..\src\stc\scintilla\src" /d "__WX__" /d "SCI_LEXER" /d "LINK_LEXERS" /d "WXUSINGDLL" /d WXMAKINGDLL_STC\r
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv293ud_stc_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /i "..\..\src\stc\scintilla\include" /i "..\..\src\stc\scintilla\src" /d "__WX__" /d "SCI_LEXER" /d "LINK_LEXERS" /d "WXUSINGDLL" /d WXMAKINGDLL_STC\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=wxmswuniv294ud_stc_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /i "..\..\src\stc\scintilla\include" /i "..\..\src\stc\scintilla\src" /d "__WX__" /d "SCI_LEXER" /d "LINK_LEXERS" /d "WXUSINGDLL" /d WXMAKINGDLL_STC\r
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv294ud_stc_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /i "..\..\src\stc\scintilla\include" /i "..\..\src\stc\scintilla\src" /d "__WX__" /d "SCI_LEXER" /d "LINK_LEXERS" /d "WXUSINGDLL" /d WXMAKINGDLL_STC\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\wxscintillad.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv293ud_stc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_stc.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv293ud_stc_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\wxscintillad.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv293ud_stc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_stc.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv293ud_stc_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\wxscintillad.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv294ud_stc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_stc.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv294ud_stc_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\wxscintillad.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv294ud_stc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_stc.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv294ud_stc_vc_custom.pdb"\r
 \r
 !ELSEIF  "$(CFG)" == "stc - Win32 DLL Release"\r
 \r
@@ -97,18 +97,18 @@ LINK32=link.exe
 # PROP Output_Dir "..\..\lib\vc_dll"\r
 # PROP Intermediate_Dir "vc_mswudll\stc"\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_stcdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw293u_stc_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /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_stcdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw293u_stc_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /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_stcdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw294u_stc_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /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_stcdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw294u_stc_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw293u_stc_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /i "..\..\src\stc\scintilla\include" /i "..\..\src\stc\scintilla\src" /d "__WX__" /d "SCI_LEXER" /d "LINK_LEXERS" /d "WXUSINGDLL" /d WXMAKINGDLL_STC\r
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw293u_stc_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /i "..\..\src\stc\scintilla\include" /i "..\..\src\stc\scintilla\src" /d "__WX__" /d "SCI_LEXER" /d "LINK_LEXERS" /d "WXUSINGDLL" /d WXMAKINGDLL_STC\r
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw294u_stc_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /i "..\..\src\stc\scintilla\include" /i "..\..\src\stc\scintilla\src" /d "__WX__" /d "SCI_LEXER" /d "LINK_LEXERS" /d "WXUSINGDLL" /d WXMAKINGDLL_STC\r
+# ADD RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw294u_stc_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /i "..\..\src\stc\scintilla\include" /i "..\..\src\stc\scintilla\src" /d "__WX__" /d "SCI_LEXER" /d "LINK_LEXERS" /d "WXUSINGDLL" /d WXMAKINGDLL_STC\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\wxscintilla.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw293u_stc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_stc.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw293u_stc_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\wxscintilla.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw293u_stc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_stc.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw293u_stc_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\wxscintilla.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw294u_stc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_stc.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw294u_stc_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\wxscintilla.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw294u_stc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_stc.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw294u_stc_vc_custom.pdb"\r
 \r
 !ELSEIF  "$(CFG)" == "stc - Win32 DLL Debug"\r
 \r
@@ -122,18 +122,18 @@ LINK32=link.exe
 # PROP Output_Dir "..\..\lib\vc_dll"\r
 # PROP Intermediate_Dir "vc_mswuddll\stc"\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_stcdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw293ud_stc_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /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_stcdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw293ud_stc_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /c\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_stcdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw294ud_stc_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /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_stcdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw294ud_stc_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /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=wxmsw293ud_stc_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /i "..\..\src\stc\scintilla\include" /i "..\..\src\stc\scintilla\src" /d "__WX__" /d "SCI_LEXER" /d "LINK_LEXERS" /d "WXUSINGDLL" /d WXMAKINGDLL_STC\r
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw293ud_stc_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /i "..\..\src\stc\scintilla\include" /i "..\..\src\stc\scintilla\src" /d "__WX__" /d "SCI_LEXER" /d "LINK_LEXERS" /d "WXUSINGDLL" /d WXMAKINGDLL_STC\r
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw294ud_stc_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /i "..\..\src\stc\scintilla\include" /i "..\..\src\stc\scintilla\src" /d "__WX__" /d "SCI_LEXER" /d "LINK_LEXERS" /d "WXUSINGDLL" /d WXMAKINGDLL_STC\r
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw294ud_stc_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /i "..\..\src\stc\scintilla\include" /i "..\..\src\stc\scintilla\src" /d "__WX__" /d "SCI_LEXER" /d "LINK_LEXERS" /d "WXUSINGDLL" /d WXMAKINGDLL_STC\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\wxscintillad.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw293ud_stc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_stc.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw293ud_stc_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\wxscintillad.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw293ud_stc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_stc.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw293ud_stc_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\wxscintillad.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw294ud_stc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_stc.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw294ud_stc_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\wxscintillad.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw294ud_stc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_stc.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw294ud_stc_vc_custom.pdb"\r
 \r
 !ELSEIF  "$(CFG)" == "stc - Win32 Universal Release"\r
 \r
index 9415d891a334ab18b448a72aa5b5a29eb424c35b..38890a59d8b04c3f56b3eb495186a7591145e5ce 100644 (file)
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswuddll\wxprec_advdll.pch"\r
                                ObjectFile="vc_mswuddll\adv\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw293ud_adv_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw294ud_adv_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="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\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmsw293ud_adv_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmsw294ud_adv_vc_custom.dll"\r
                                LinkIncremental="2"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_adv.lib"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293ud_adv_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw294ud_adv_vc_custom.pdb"\r
                                TargetMachine="1"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw293ud_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw294ud_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV"\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
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswudll\wxprec_advdll.pch"\r
                                ObjectFile="vc_mswudll\adv\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw293u_adv_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw294u_adv_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="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_core.lib ..\..\lib\vc_dll\wxbase29u.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmsw293u_adv_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmsw294u_adv_vc_custom.dll"\r
                                LinkIncremental="1"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmsw29u_adv.lib"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293u_adv_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw294u_adv_vc_custom.pdb"\r
                                TargetMachine="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"/>\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw293u_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV"\r
+                               PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw294u_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV"\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
                        <Tool\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswunivuddll\wxprec_advdll.pch"\r
                                ObjectFile="vc_mswunivuddll\adv\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv293ud_adv_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv294ud_adv_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="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_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmswuniv293ud_adv_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmswuniv294ud_adv_vc_custom.dll"\r
                                LinkIncremental="2"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_adv.lib"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293ud_adv_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv294ud_adv_vc_custom.pdb"\r
                                TargetMachine="1"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv293ud_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv294ud_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV"\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
                        <Tool\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswunivudll\wxprec_advdll.pch"\r
                                ObjectFile="vc_mswunivudll\adv\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv293u_adv_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv294u_adv_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="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\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmswuniv293u_adv_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmswuniv294u_adv_vc_custom.dll"\r
                                LinkIncremental="1"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_adv.lib"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293u_adv_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv294u_adv_vc_custom.pdb"\r
                                TargetMachine="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"/>\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv293u_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv294u_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV"\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
                        <Tool\r
index 59e196e1f8a4a177dd3c45ba5b297bf231d3275f..fe10da9f2fe0a0e51a343cd3706a387edacbe3a9 100644 (file)
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswuddll\wxprec_auidll.pch"\r
                                ObjectFile="vc_mswuddll\aui\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw293ud_aui_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw294ud_aui_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="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\wxmsw29ud_adv.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmsw293ud_aui_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmsw294ud_aui_vc_custom.dll"\r
                                LinkIncremental="2"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_aui.lib"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293ud_aui_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw294ud_aui_vc_custom.pdb"\r
                                TargetMachine="1"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw293ud_aui_vc_custom;WXUSINGDLL;WXMAKINGDLL_AUI"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw294ud_aui_vc_custom;WXUSINGDLL;WXMAKINGDLL_AUI"\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
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswudll\wxprec_auidll.pch"\r
                                ObjectFile="vc_mswudll\aui\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw293u_aui_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw294u_aui_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="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\wxmsw293u_aui_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmsw294u_aui_vc_custom.dll"\r
                                LinkIncremental="1"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmsw29u_aui.lib"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293u_aui_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw294u_aui_vc_custom.pdb"\r
                                TargetMachine="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"/>\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw293u_aui_vc_custom;WXUSINGDLL;WXMAKINGDLL_AUI"\r
+                               PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw294u_aui_vc_custom;WXUSINGDLL;WXMAKINGDLL_AUI"\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
                        <Tool\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswunivuddll\wxprec_auidll.pch"\r
                                ObjectFile="vc_mswunivuddll\aui\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv293ud_aui_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv294ud_aui_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="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\wxmswuniv293ud_aui_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmswuniv294ud_aui_vc_custom.dll"\r
                                LinkIncremental="2"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_aui.lib"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293ud_aui_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv294ud_aui_vc_custom.pdb"\r
                                TargetMachine="1"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv293ud_aui_vc_custom;WXUSINGDLL;WXMAKINGDLL_AUI"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv294ud_aui_vc_custom;WXUSINGDLL;WXMAKINGDLL_AUI"\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
                        <Tool\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswunivudll\wxprec_auidll.pch"\r
                                ObjectFile="vc_mswunivudll\aui\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv293u_aui_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv294u_aui_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="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\wxmswuniv29u_adv.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmswuniv293u_aui_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmswuniv294u_aui_vc_custom.dll"\r
                                LinkIncremental="1"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_aui.lib"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293u_aui_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv294u_aui_vc_custom.pdb"\r
                                TargetMachine="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"/>\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv293u_aui_vc_custom;WXUSINGDLL;WXMAKINGDLL_AUI"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv294u_aui_vc_custom;WXUSINGDLL;WXMAKINGDLL_AUI"\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
                        <Tool\r
index a65ea6d32a6e4045f89672e6ee81e218cb1f54aa..089d5e103b3e37831d0bf52a2e8b6bee82919af6 100644 (file)
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswuddll\wxprec_basedll.pch"\r
                                ObjectFile="vc_mswuddll\base\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase293ud_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase294ud_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="TRUE"\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
                                AdditionalDependencies="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="..\..\lib\vc_dll\wxbase293ud_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxbase294ud_vc_custom.dll"\r
                                LinkIncremental="2"\r
                                ImportLibrary="..\..\lib\vc_dll\wxbase29ud.lib"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxbase293ud_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxbase294ud_vc_custom.pdb"\r
                                TargetMachine="1"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase293ud_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase294ud_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"\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
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswudll\wxprec_basedll.pch"\r
                                ObjectFile="vc_mswudll\base\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase293u_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase294u_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="TRUE"\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
                                AdditionalDependencies="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="..\..\lib\vc_dll\wxbase293u_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxbase294u_vc_custom.dll"\r
                                LinkIncremental="1"\r
                                ImportLibrary="..\..\lib\vc_dll\wxbase29u.lib"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxbase293u_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxbase294u_vc_custom.pdb"\r
                                TargetMachine="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"/>\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase293u_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"\r
+                               PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase294u_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"\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
                        <Tool\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswunivuddll\wxprec_basedll.pch"\r
                                ObjectFile="vc_mswunivuddll\base\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase293ud_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase294ud_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="TRUE"\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
                                AdditionalDependencies="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="..\..\lib\vc_dll\wxbase293ud_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxbase294ud_vc_custom.dll"\r
                                LinkIncremental="2"\r
                                ImportLibrary="..\..\lib\vc_dll\wxbase29ud.lib"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxbase293ud_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxbase294ud_vc_custom.pdb"\r
                                TargetMachine="1"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase293ud_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase294ud_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"\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
                        <Tool\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswunivudll\wxprec_basedll.pch"\r
                                ObjectFile="vc_mswunivudll\base\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase293u_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase294u_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="TRUE"\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
                                AdditionalDependencies="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="..\..\lib\vc_dll\wxbase293u_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxbase294u_vc_custom.dll"\r
                                LinkIncremental="1"\r
                                ImportLibrary="..\..\lib\vc_dll\wxbase29u.lib"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxbase293u_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxbase294u_vc_custom.pdb"\r
                                TargetMachine="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"/>\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase293u_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase294u_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"\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
                        <Tool\r
index a8f792507c5143b54c0745194399ae7918680324..a8889153e8b5501b3291185db7dea3e0943c8dad 100644 (file)
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswuddll\wxprec_coredll.pch"\r
                                ObjectFile="vc_mswuddll\core\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw293ud_core_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw294ud_core_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="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\wxbase29ud.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmsw293ud_core_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmsw294ud_core_vc_custom.dll"\r
                                LinkIncremental="2"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_core.lib"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293ud_core_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw294ud_core_vc_custom.pdb"\r
                                TargetMachine="1"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw293ud_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw294ud_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"\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
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswudll\wxprec_coredll.pch"\r
                                ObjectFile="vc_mswudll\core\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw293u_core_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw294u_core_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="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\wxbase29u.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmsw293u_core_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmsw294u_core_vc_custom.dll"\r
                                LinkIncremental="1"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmsw29u_core.lib"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293u_core_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw294u_core_vc_custom.pdb"\r
                                TargetMachine="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"/>\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw293u_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"\r
+                               PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw294u_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"\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
                        <Tool\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswunivuddll\wxprec_coredll.pch"\r
                                ObjectFile="vc_mswunivuddll\core\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv293ud_core_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv294ud_core_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="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\wxbase29ud.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmswuniv293ud_core_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmswuniv294ud_core_vc_custom.dll"\r
                                LinkIncremental="2"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_core.lib"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293ud_core_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv294ud_core_vc_custom.pdb"\r
                                TargetMachine="1"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv293ud_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv294ud_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"\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
                        <Tool\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswunivudll\wxprec_coredll.pch"\r
                                ObjectFile="vc_mswunivudll\core\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv293u_core_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv294u_core_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="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\wxbase29u.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmswuniv293u_core_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmswuniv294u_core_vc_custom.dll"\r
                                LinkIncremental="1"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_core.lib"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293u_core_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv294u_core_vc_custom.pdb"\r
                                TargetMachine="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"/>\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv293u_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv294u_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"\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
                        <Tool\r
index 8a76742bf688451fd3920d8abdacc956e3502d17..cb1f0da55e09508bd502a37b78dbe785a258ad7c 100644 (file)
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswuddll\wxprec_gldll.pch"\r
                                ObjectFile="vc_mswuddll\gl\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw293ud_gl_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw294ud_gl_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="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 wxmsw29ud_core.lib wxbase29ud.lib  opengl32.lib glu32.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmsw293ud_gl_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmsw294ud_gl_vc_custom.dll"\r
                                LinkIncremental="2"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_gl.lib"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293ud_gl_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw294ud_gl_vc_custom.pdb"\r
                                TargetMachine="1"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw293ud_gl_vc_custom;WXUSINGDLL;WXMAKINGDLL_GL"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw294ud_gl_vc_custom;WXUSINGDLL;WXMAKINGDLL_GL"\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
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswudll\wxprec_gldll.pch"\r
                                ObjectFile="vc_mswudll\gl\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw293u_gl_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw294u_gl_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="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 wxmsw29u_core.lib wxbase29u.lib  opengl32.lib glu32.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmsw293u_gl_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmsw294u_gl_vc_custom.dll"\r
                                LinkIncremental="1"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmsw29u_gl.lib"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293u_gl_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw294u_gl_vc_custom.pdb"\r
                                TargetMachine="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"/>\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw293u_gl_vc_custom;WXUSINGDLL;WXMAKINGDLL_GL"\r
+                               PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw294u_gl_vc_custom;WXUSINGDLL;WXMAKINGDLL_GL"\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
                        <Tool\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswunivuddll\wxprec_gldll.pch"\r
                                ObjectFile="vc_mswunivuddll\gl\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv293ud_gl_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv294ud_gl_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="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 wxmswuniv29ud_core.lib wxbase29ud.lib  opengl32.lib glu32.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmswuniv293ud_gl_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmswuniv294ud_gl_vc_custom.dll"\r
                                LinkIncremental="2"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_gl.lib"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293ud_gl_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv294ud_gl_vc_custom.pdb"\r
                                TargetMachine="1"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv293ud_gl_vc_custom;WXUSINGDLL;WXMAKINGDLL_GL"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv294ud_gl_vc_custom;WXUSINGDLL;WXMAKINGDLL_GL"\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
                        <Tool\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswunivudll\wxprec_gldll.pch"\r
                                ObjectFile="vc_mswunivudll\gl\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv293u_gl_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv294u_gl_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="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 wxmswuniv29u_core.lib wxbase29u.lib  opengl32.lib glu32.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmswuniv293u_gl_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmswuniv294u_gl_vc_custom.dll"\r
                                LinkIncremental="1"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_gl.lib"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293u_gl_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv294u_gl_vc_custom.pdb"\r
                                TargetMachine="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"/>\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv293u_gl_vc_custom;WXUSINGDLL;WXMAKINGDLL_GL"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv294u_gl_vc_custom;WXUSINGDLL;WXMAKINGDLL_GL"\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
                        <Tool\r
index 2d88b224eecb603042aed9515c40fc70dd6ddc84..f5f94761dd83568fba6ee1773f69b3480652b13e 100644 (file)
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswuddll\wxprec_htmldll.pch"\r
                                ObjectFile="vc_mswuddll\html\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw293ud_html_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw294ud_html_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="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\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmsw293ud_html_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmsw294ud_html_vc_custom.dll"\r
                                LinkIncremental="2"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_html.lib"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293ud_html_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw294ud_html_vc_custom.pdb"\r
                                TargetMachine="1"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw293ud_html_vc_custom;WXUSINGDLL;WXMAKINGDLL_HTML"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw294ud_html_vc_custom;WXUSINGDLL;WXMAKINGDLL_HTML"\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
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswudll\wxprec_htmldll.pch"\r
                                ObjectFile="vc_mswudll\html\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw293u_html_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw294u_html_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="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_core.lib ..\..\lib\vc_dll\wxbase29u.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmsw293u_html_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmsw294u_html_vc_custom.dll"\r
                                LinkIncremental="1"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmsw29u_html.lib"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293u_html_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw294u_html_vc_custom.pdb"\r
                                TargetMachine="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"/>\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw293u_html_vc_custom;WXUSINGDLL;WXMAKINGDLL_HTML"\r
+                               PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw294u_html_vc_custom;WXUSINGDLL;WXMAKINGDLL_HTML"\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
                        <Tool\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswunivuddll\wxprec_htmldll.pch"\r
                                ObjectFile="vc_mswunivuddll\html\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv293ud_html_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv294ud_html_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="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_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmswuniv293ud_html_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmswuniv294ud_html_vc_custom.dll"\r
                                LinkIncremental="2"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_html.lib"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293ud_html_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv294ud_html_vc_custom.pdb"\r
                                TargetMachine="1"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv293ud_html_vc_custom;WXUSINGDLL;WXMAKINGDLL_HTML"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv294ud_html_vc_custom;WXUSINGDLL;WXMAKINGDLL_HTML"\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
                        <Tool\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswunivudll\wxprec_htmldll.pch"\r
                                ObjectFile="vc_mswunivudll\html\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv293u_html_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv294u_html_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="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\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmswuniv293u_html_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmswuniv294u_html_vc_custom.dll"\r
                                LinkIncremental="1"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_html.lib"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293u_html_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv294u_html_vc_custom.pdb"\r
                                TargetMachine="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"/>\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv293u_html_vc_custom;WXUSINGDLL;WXMAKINGDLL_HTML"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv294u_html_vc_custom;WXUSINGDLL;WXMAKINGDLL_HTML"\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
                        <Tool\r
index 84584f999f60160866ea6d8bac97ea0c5d7b872b..6d162c16f443411d465e008f54a79b9c79ba3ad4 100644 (file)
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswuddll\wxprec_mediadll.pch"\r
                                ObjectFile="vc_mswuddll\media\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw293ud_media_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw294ud_media_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="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\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmsw293ud_media_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmsw294ud_media_vc_custom.dll"\r
                                LinkIncremental="2"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_media.lib"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293ud_media_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw294ud_media_vc_custom.pdb"\r
                                TargetMachine="1"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw293ud_media_vc_custom;WXUSINGDLL;WXMAKINGDLL_MEDIA"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw294ud_media_vc_custom;WXUSINGDLL;WXMAKINGDLL_MEDIA"\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
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswudll\wxprec_mediadll.pch"\r
                                ObjectFile="vc_mswudll\media\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw293u_media_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw294u_media_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="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_core.lib ..\..\lib\vc_dll\wxbase29u.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmsw293u_media_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmsw294u_media_vc_custom.dll"\r
                                LinkIncremental="1"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmsw29u_media.lib"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293u_media_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw294u_media_vc_custom.pdb"\r
                                TargetMachine="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"/>\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw293u_media_vc_custom;WXUSINGDLL;WXMAKINGDLL_MEDIA"\r
+                               PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw294u_media_vc_custom;WXUSINGDLL;WXMAKINGDLL_MEDIA"\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
                        <Tool\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswunivuddll\wxprec_mediadll.pch"\r
                                ObjectFile="vc_mswunivuddll\media\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv293ud_media_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv294ud_media_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="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_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmswuniv293ud_media_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmswuniv294ud_media_vc_custom.dll"\r
                                LinkIncremental="2"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_media.lib"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293ud_media_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv294ud_media_vc_custom.pdb"\r
                                TargetMachine="1"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv293ud_media_vc_custom;WXUSINGDLL;WXMAKINGDLL_MEDIA"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv294ud_media_vc_custom;WXUSINGDLL;WXMAKINGDLL_MEDIA"\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
                        <Tool\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswunivudll\wxprec_mediadll.pch"\r
                                ObjectFile="vc_mswunivudll\media\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv293u_media_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv294u_media_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="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\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmswuniv293u_media_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmswuniv294u_media_vc_custom.dll"\r
                                LinkIncremental="1"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_media.lib"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293u_media_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv294u_media_vc_custom.pdb"\r
                                TargetMachine="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"/>\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv293u_media_vc_custom;WXUSINGDLL;WXMAKINGDLL_MEDIA"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv294u_media_vc_custom;WXUSINGDLL;WXMAKINGDLL_MEDIA"\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
                        <Tool\r
index bb68f883e7eaed23a3eca86e89b68405baa96b7c..a779d09eb949f60b3e49a7947790c876b22945b0 100644 (file)
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswuddll\wxprec_netdll.pch"\r
                                ObjectFile="vc_mswuddll\net\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase293ud_net_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase294ud_net_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="TRUE"\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
                                AdditionalDependencies="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\wxbase29ud.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxbase293ud_net_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxbase294ud_net_vc_custom.dll"\r
                                LinkIncremental="2"\r
                                ImportLibrary="..\..\lib\vc_dll\wxbase29ud_net.lib"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxbase293ud_net_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxbase294ud_net_vc_custom.pdb"\r
                                TargetMachine="1"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase293ud_net_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase294ud_net_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET"\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
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswudll\wxprec_netdll.pch"\r
                                ObjectFile="vc_mswudll\net\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase293u_net_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase294u_net_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="TRUE"\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
                                AdditionalDependencies="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\wxbase29u.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxbase293u_net_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxbase294u_net_vc_custom.dll"\r
                                LinkIncremental="1"\r
                                ImportLibrary="..\..\lib\vc_dll\wxbase29u_net.lib"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxbase293u_net_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxbase294u_net_vc_custom.pdb"\r
                                TargetMachine="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"/>\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase293u_net_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET"\r
+                               PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase294u_net_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET"\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
                        <Tool\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswunivuddll\wxprec_netdll.pch"\r
                                ObjectFile="vc_mswunivuddll\net\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase293ud_net_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase294ud_net_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="TRUE"\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
                                AdditionalDependencies="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\wxbase29ud.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxbase293ud_net_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxbase294ud_net_vc_custom.dll"\r
                                LinkIncremental="2"\r
                                ImportLibrary="..\..\lib\vc_dll\wxbase29ud_net.lib"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxbase293ud_net_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxbase294ud_net_vc_custom.pdb"\r
                                TargetMachine="1"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase293ud_net_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase294ud_net_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET"\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
                        <Tool\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswunivudll\wxprec_netdll.pch"\r
                                ObjectFile="vc_mswunivudll\net\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase293u_net_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase294u_net_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="TRUE"\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
                                AdditionalDependencies="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\wxbase29u.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxbase293u_net_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxbase294u_net_vc_custom.dll"\r
                                LinkIncremental="1"\r
                                ImportLibrary="..\..\lib\vc_dll\wxbase29u_net.lib"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxbase293u_net_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxbase294u_net_vc_custom.pdb"\r
                                TargetMachine="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"/>\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase293u_net_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase294u_net_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET"\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
                        <Tool\r
index 8b7420f8673e1c7923b63e370d510302bb82e4e9..383777a74def648251e8d2e402d7df4606c9d826 100644 (file)
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswuddll\wxprec_propgriddll.pch"\r
                                ObjectFile="vc_mswuddll\propgrid\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw293ud_propgrid_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw294ud_propgrid_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="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\wxmsw29ud_adv.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmsw293ud_propgrid_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmsw294ud_propgrid_vc_custom.dll"\r
                                LinkIncremental="2"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_propgrid.lib"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293ud_propgrid_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw294ud_propgrid_vc_custom.pdb"\r
                                TargetMachine="1"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw293ud_propgrid_vc_custom;WXUSINGDLL;WXMAKINGDLL_PROPGRID"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw294ud_propgrid_vc_custom;WXUSINGDLL;WXMAKINGDLL_PROPGRID"\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
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswudll\wxprec_propgriddll.pch"\r
                                ObjectFile="vc_mswudll\propgrid\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw293u_propgrid_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw294u_propgrid_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="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\wxmsw293u_propgrid_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmsw294u_propgrid_vc_custom.dll"\r
                                LinkIncremental="1"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmsw29u_propgrid.lib"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293u_propgrid_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw294u_propgrid_vc_custom.pdb"\r
                                TargetMachine="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"/>\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw293u_propgrid_vc_custom;WXUSINGDLL;WXMAKINGDLL_PROPGRID"\r
+                               PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw294u_propgrid_vc_custom;WXUSINGDLL;WXMAKINGDLL_PROPGRID"\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
                        <Tool\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswunivuddll\wxprec_propgriddll.pch"\r
                                ObjectFile="vc_mswunivuddll\propgrid\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv293ud_propgrid_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv294ud_propgrid_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="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\wxmswuniv293ud_propgrid_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmswuniv294ud_propgrid_vc_custom.dll"\r
                                LinkIncremental="2"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_propgrid.lib"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293ud_propgrid_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv294ud_propgrid_vc_custom.pdb"\r
                                TargetMachine="1"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv293ud_propgrid_vc_custom;WXUSINGDLL;WXMAKINGDLL_PROPGRID"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv294ud_propgrid_vc_custom;WXUSINGDLL;WXMAKINGDLL_PROPGRID"\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
                        <Tool\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswunivudll\wxprec_propgriddll.pch"\r
                                ObjectFile="vc_mswunivudll\propgrid\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv293u_propgrid_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv294u_propgrid_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="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\wxmswuniv29u_adv.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmswuniv293u_propgrid_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmswuniv294u_propgrid_vc_custom.dll"\r
                                LinkIncremental="1"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_propgrid.lib"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293u_propgrid_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv294u_propgrid_vc_custom.pdb"\r
                                TargetMachine="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"/>\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv293u_propgrid_vc_custom;WXUSINGDLL;WXMAKINGDLL_PROPGRID"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv294u_propgrid_vc_custom;WXUSINGDLL;WXMAKINGDLL_PROPGRID"\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
                        <Tool\r
index a805f1e212b14b8e0fe8e2fe374f6f40fe0ed2c6..81d26bce35a44e0f546b2e84eb7d32e1195d3072 100644 (file)
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswuddll\wxprec_qadll.pch"\r
                                ObjectFile="vc_mswuddll\qa\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw293ud_qa_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw294ud_qa_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="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\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmsw293ud_qa_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmsw294ud_qa_vc_custom.dll"\r
                                LinkIncremental="2"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_qa.lib"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293ud_qa_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw294ud_qa_vc_custom.pdb"\r
                                TargetMachine="1"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw293ud_qa_vc_custom;WXUSINGDLL;WXMAKINGDLL_QA"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw294ud_qa_vc_custom;WXUSINGDLL;WXMAKINGDLL_QA"\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
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswudll\wxprec_qadll.pch"\r
                                ObjectFile="vc_mswudll\qa\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw293u_qa_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw294u_qa_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="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_core.lib ..\..\lib\vc_dll\wxbase29u.lib ..\..\lib\vc_dll\wxbase29u_xml.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmsw293u_qa_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmsw294u_qa_vc_custom.dll"\r
                                LinkIncremental="1"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmsw29u_qa.lib"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293u_qa_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw294u_qa_vc_custom.pdb"\r
                                TargetMachine="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"/>\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw293u_qa_vc_custom;WXUSINGDLL;WXMAKINGDLL_QA"\r
+                               PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw294u_qa_vc_custom;WXUSINGDLL;WXMAKINGDLL_QA"\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
                        <Tool\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswunivuddll\wxprec_qadll.pch"\r
                                ObjectFile="vc_mswunivuddll\qa\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv293ud_qa_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv294ud_qa_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="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_core.lib ..\..\lib\vc_dll\wxbase29ud.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmswuniv293ud_qa_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmswuniv294ud_qa_vc_custom.dll"\r
                                LinkIncremental="2"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_qa.lib"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293ud_qa_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv294ud_qa_vc_custom.pdb"\r
                                TargetMachine="1"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv293ud_qa_vc_custom;WXUSINGDLL;WXMAKINGDLL_QA"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv294ud_qa_vc_custom;WXUSINGDLL;WXMAKINGDLL_QA"\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
                        <Tool\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswunivudll\wxprec_qadll.pch"\r
                                ObjectFile="vc_mswunivudll\qa\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv293u_qa_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv294u_qa_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="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\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib ..\..\lib\vc_dll\wxbase29u_xml.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmswuniv293u_qa_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmswuniv294u_qa_vc_custom.dll"\r
                                LinkIncremental="1"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_qa.lib"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293u_qa_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv294u_qa_vc_custom.pdb"\r
                                TargetMachine="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"/>\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv293u_qa_vc_custom;WXUSINGDLL;WXMAKINGDLL_QA"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv294u_qa_vc_custom;WXUSINGDLL;WXMAKINGDLL_QA"\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
                        <Tool\r
index a7c178b8ec05bb1f952ebeb4195ec18366078427..ba5b2a91571f18ac640cacf414fb6e92ccf06d1a 100644 (file)
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswuddll\wxprec_ribbondll.pch"\r
                                ObjectFile="vc_mswuddll\ribbon\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw293ud_ribbon_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw294ud_ribbon_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="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\wxmsw29ud_adv.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmsw293ud_ribbon_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmsw294ud_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
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293ud_ribbon_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw294ud_ribbon_vc_custom.pdb"\r
                                TargetMachine="1"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw293ud_ribbon_vc_custom;WXUSINGDLL;WXMAKINGDLL_RIBBON"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw294ud_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
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswudll\wxprec_ribbondll.pch"\r
                                ObjectFile="vc_mswudll\ribbon\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw293u_ribbon_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw294u_ribbon_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="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\wxmsw293u_ribbon_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmsw294u_ribbon_vc_custom.dll"\r
                                LinkIncremental="1"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmsw29u_ribbon.lib"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293u_ribbon_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw294u_ribbon_vc_custom.pdb"\r
                                TargetMachine="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"/>\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw293u_ribbon_vc_custom;WXUSINGDLL;WXMAKINGDLL_RIBBON"\r
+                               PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw294u_ribbon_vc_custom;WXUSINGDLL;WXMAKINGDLL_RIBBON"\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
                        <Tool\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswunivuddll\wxprec_ribbondll.pch"\r
                                ObjectFile="vc_mswunivuddll\ribbon\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv293ud_ribbon_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv294ud_ribbon_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="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\wxmswuniv293ud_ribbon_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmswuniv294ud_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\wxmswuniv293ud_ribbon_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv294ud_ribbon_vc_custom.pdb"\r
                                TargetMachine="1"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv293ud_ribbon_vc_custom;WXUSINGDLL;WXMAKINGDLL_RIBBON"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv294ud_ribbon_vc_custom;WXUSINGDLL;WXMAKINGDLL_RIBBON"\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
                        <Tool\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswunivudll\wxprec_ribbondll.pch"\r
                                ObjectFile="vc_mswunivudll\ribbon\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv293u_ribbon_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv294u_ribbon_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="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\wxmswuniv29u_adv.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmswuniv293u_ribbon_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmswuniv294u_ribbon_vc_custom.dll"\r
                                LinkIncremental="1"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_ribbon.lib"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293u_ribbon_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv294u_ribbon_vc_custom.pdb"\r
                                TargetMachine="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"/>\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv293u_ribbon_vc_custom;WXUSINGDLL;WXMAKINGDLL_RIBBON"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv294u_ribbon_vc_custom;WXUSINGDLL;WXMAKINGDLL_RIBBON"\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
                        <Tool\r
index 94ed2f5db948a7d63d5b98be51a55230711f6402..eb5fef50d29bd70b135a8773024402079147d91c 100644 (file)
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswuddll\wxprec_richtextdll.pch"\r
                                ObjectFile="vc_mswuddll\richtext\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw293ud_richtext_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw294ud_richtext_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="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\wxmsw29ud_adv.lib ..\..\lib\vc_dll\wxmsw29ud_html.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmsw293ud_richtext_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmsw294ud_richtext_vc_custom.dll"\r
                                LinkIncremental="2"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_richtext.lib"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293ud_richtext_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw294ud_richtext_vc_custom.pdb"\r
                                TargetMachine="1"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw293ud_richtext_vc_custom;WXUSINGDLL;WXMAKINGDLL_RICHTEXT"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw294ud_richtext_vc_custom;WXUSINGDLL;WXMAKINGDLL_RICHTEXT"\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
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswudll\wxprec_richtextdll.pch"\r
                                ObjectFile="vc_mswudll\richtext\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw293u_richtext_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw294u_richtext_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="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_html.lib ..\..\lib\vc_dll\wxbase29u_xml.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmsw293u_richtext_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmsw294u_richtext_vc_custom.dll"\r
                                LinkIncremental="1"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmsw29u_richtext.lib"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293u_richtext_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw294u_richtext_vc_custom.pdb"\r
                                TargetMachine="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"/>\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw293u_richtext_vc_custom;WXUSINGDLL;WXMAKINGDLL_RICHTEXT"\r
+                               PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw294u_richtext_vc_custom;WXUSINGDLL;WXMAKINGDLL_RICHTEXT"\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
                        <Tool\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswunivuddll\wxprec_richtextdll.pch"\r
                                ObjectFile="vc_mswunivuddll\richtext\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv293ud_richtext_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv294ud_richtext_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="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_html.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmswuniv293ud_richtext_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmswuniv294ud_richtext_vc_custom.dll"\r
                                LinkIncremental="2"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_richtext.lib"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293ud_richtext_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv294ud_richtext_vc_custom.pdb"\r
                                TargetMachine="1"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv293ud_richtext_vc_custom;WXUSINGDLL;WXMAKINGDLL_RICHTEXT"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv294ud_richtext_vc_custom;WXUSINGDLL;WXMAKINGDLL_RICHTEXT"\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
                        <Tool\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswunivudll\wxprec_richtextdll.pch"\r
                                ObjectFile="vc_mswunivudll\richtext\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv293u_richtext_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv294u_richtext_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="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\wxmswuniv29u_adv.lib ..\..\lib\vc_dll\wxmswuniv29u_html.lib ..\..\lib\vc_dll\wxbase29u_xml.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmswuniv293u_richtext_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmswuniv294u_richtext_vc_custom.dll"\r
                                LinkIncremental="1"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_richtext.lib"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293u_richtext_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv294u_richtext_vc_custom.pdb"\r
                                TargetMachine="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"/>\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv293u_richtext_vc_custom;WXUSINGDLL;WXMAKINGDLL_RICHTEXT"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv294u_richtext_vc_custom;WXUSINGDLL;WXMAKINGDLL_RICHTEXT"\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
                        <Tool\r
index a370d9b22f8e89243353aca2623a79164aad3932..cb20a5daafbccaa3ccac31178e50536a0cb604db 100644 (file)
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswuddll\wxprec_stcdll.pch"\r
                                ObjectFile="vc_mswuddll\stc\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw293ud_stc_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw294ud_stc_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="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\wxscintillad.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmsw293ud_stc_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmsw294ud_stc_vc_custom.dll"\r
                                LinkIncremental="2"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_stc.lib"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293ud_stc_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw294ud_stc_vc_custom.pdb"\r
                                TargetMachine="1"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw293ud_stc_vc_custom;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw294ud_stc_vc_custom;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"/>\r
                        <Tool\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswudll\wxprec_stcdll.pch"\r
                                ObjectFile="vc_mswudll\stc\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw293u_stc_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw294u_stc_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="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\wxscintilla.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmsw293u_stc_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmsw294u_stc_vc_custom.dll"\r
                                LinkIncremental="1"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmsw29u_stc.lib"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293u_stc_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw294u_stc_vc_custom.pdb"\r
                                TargetMachine="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"/>\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw293u_stc_vc_custom;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"\r
+                               PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw294u_stc_vc_custom;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"/>\r
                        <Tool\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswunivuddll\wxprec_stcdll.pch"\r
                                ObjectFile="vc_mswunivuddll\stc\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv293ud_stc_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv294ud_stc_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="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\wxscintillad.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmswuniv293ud_stc_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmswuniv294ud_stc_vc_custom.dll"\r
                                LinkIncremental="2"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_stc.lib"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293ud_stc_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv294ud_stc_vc_custom.pdb"\r
                                TargetMachine="1"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv293ud_stc_vc_custom;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv294ud_stc_vc_custom;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"/>\r
                        <Tool\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswunivudll\wxprec_stcdll.pch"\r
                                ObjectFile="vc_mswunivudll\stc\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv293u_stc_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv294u_stc_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="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\wxscintilla.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmswuniv293u_stc_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmswuniv294u_stc_vc_custom.dll"\r
                                LinkIncremental="1"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_stc.lib"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293u_stc_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv294u_stc_vc_custom.pdb"\r
                                TargetMachine="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"/>\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv293u_stc_vc_custom;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv294u_stc_vc_custom;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"/>\r
                        <Tool\r
index 11525bd65fd5a21315a56077aeb7c840b90f74a3..aaaacc651cffad9586da6c9ec8a01b85c4b3cdcb 100644 (file)
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswuddll\wxprec_webviewdll.pch"\r
                                ObjectFile="vc_mswuddll\webview\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw293ud_webview_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw294ud_webview_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="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\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmsw293ud_webview_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmsw294ud_webview_vc_custom.dll"\r
                                LinkIncremental="2"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_webview.lib"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293ud_webview_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw294ud_webview_vc_custom.pdb"\r
                                TargetMachine="1"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw293ud_webview_vc_custom;WXUSINGDLL;WXMAKINGDLL_WEBVIEW"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw294ud_webview_vc_custom;WXUSINGDLL;WXMAKINGDLL_WEBVIEW"\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
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswudll\wxprec_webviewdll.pch"\r
                                ObjectFile="vc_mswudll\webview\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw293u_webview_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw294u_webview_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="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_core.lib ..\..\lib\vc_dll\wxbase29u.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmsw293u_webview_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmsw294u_webview_vc_custom.dll"\r
                                LinkIncremental="1"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmsw29u_webview.lib"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293u_webview_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw294u_webview_vc_custom.pdb"\r
                                TargetMachine="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"/>\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw293u_webview_vc_custom;WXUSINGDLL;WXMAKINGDLL_WEBVIEW"\r
+                               PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw294u_webview_vc_custom;WXUSINGDLL;WXMAKINGDLL_WEBVIEW"\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
                        <Tool\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswunivuddll\wxprec_webviewdll.pch"\r
                                ObjectFile="vc_mswunivuddll\webview\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv293ud_webview_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv294ud_webview_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="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_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmswuniv293ud_webview_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmswuniv294ud_webview_vc_custom.dll"\r
                                LinkIncremental="2"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_webview.lib"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293ud_webview_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv294ud_webview_vc_custom.pdb"\r
                                TargetMachine="1"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv293ud_webview_vc_custom;WXUSINGDLL;WXMAKINGDLL_WEBVIEW"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv294ud_webview_vc_custom;WXUSINGDLL;WXMAKINGDLL_WEBVIEW"\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
                        <Tool\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswunivudll\wxprec_webviewdll.pch"\r
                                ObjectFile="vc_mswunivudll\webview\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv293u_webview_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv294u_webview_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="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\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmswuniv293u_webview_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmswuniv294u_webview_vc_custom.dll"\r
                                LinkIncremental="1"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_webview.lib"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293u_webview_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv294u_webview_vc_custom.pdb"\r
                                TargetMachine="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"/>\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv293u_webview_vc_custom;WXUSINGDLL;WXMAKINGDLL_WEBVIEW"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv294u_webview_vc_custom;WXUSINGDLL;WXMAKINGDLL_WEBVIEW"\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
                        <Tool\r
index 76a5306253eaa73bdbe8914b29da17a9ce9e37cf..23f145c852cf8d8b1c14de23933a5e4500029867 100644 (file)
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswuddll\wxprec_xmldll.pch"\r
                                ObjectFile="vc_mswuddll\xml\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase293ud_xml_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase294ud_xml_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="TRUE"\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
                                AdditionalDependencies="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\wxbase29ud.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxbase293ud_xml_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxbase294ud_xml_vc_custom.dll"\r
                                LinkIncremental="2"\r
                                ImportLibrary="..\..\lib\vc_dll\wxbase29ud_xml.lib"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxbase293ud_xml_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxbase294ud_xml_vc_custom.pdb"\r
                                TargetMachine="1"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase293ud_xml_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase294ud_xml_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML"\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
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswudll\wxprec_xmldll.pch"\r
                                ObjectFile="vc_mswudll\xml\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase293u_xml_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase294u_xml_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="TRUE"\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
                                AdditionalDependencies="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\wxbase29u.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxbase293u_xml_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxbase294u_xml_vc_custom.dll"\r
                                LinkIncremental="1"\r
                                ImportLibrary="..\..\lib\vc_dll\wxbase29u_xml.lib"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxbase293u_xml_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxbase294u_xml_vc_custom.pdb"\r
                                TargetMachine="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"/>\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase293u_xml_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML"\r
+                               PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase294u_xml_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML"\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
                        <Tool\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswunivuddll\wxprec_xmldll.pch"\r
                                ObjectFile="vc_mswunivuddll\xml\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase293ud_xml_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase294ud_xml_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="TRUE"\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
                                AdditionalDependencies="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\wxbase29ud.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxbase293ud_xml_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxbase294ud_xml_vc_custom.dll"\r
                                LinkIncremental="2"\r
                                ImportLibrary="..\..\lib\vc_dll\wxbase29ud_xml.lib"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxbase293ud_xml_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxbase294ud_xml_vc_custom.pdb"\r
                                TargetMachine="1"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase293ud_xml_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase294ud_xml_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML"\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
                        <Tool\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswunivudll\wxprec_xmldll.pch"\r
                                ObjectFile="vc_mswunivudll\xml\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase293u_xml_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase294u_xml_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="TRUE"\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
                                AdditionalDependencies="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\wxbase29u.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxbase293u_xml_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxbase294u_xml_vc_custom.dll"\r
                                LinkIncremental="1"\r
                                ImportLibrary="..\..\lib\vc_dll\wxbase29u_xml.lib"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxbase293u_xml_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxbase294u_xml_vc_custom.pdb"\r
                                TargetMachine="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"/>\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase293u_xml_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase294u_xml_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML"\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
                        <Tool\r
index 0ad7748cb9ac324792d2b3307ecd7fe177b63ed4..746d8d1fd1d044a17444f83c6bf45d013374a1ba 100644 (file)
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswuddll\wxprec_xrcdll.pch"\r
                                ObjectFile="vc_mswuddll\xrc\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw293ud_xrc_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw294ud_xrc_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="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\wxmsw29ud_html.lib ..\..\lib\vc_dll\wxmsw29ud_adv.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib ..\..\lib\vc_dll\wxbase29ud.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmsw293ud_xrc_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmsw294ud_xrc_vc_custom.dll"\r
                                LinkIncremental="2"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_xrc.lib"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293ud_xrc_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw294ud_xrc_vc_custom.pdb"\r
                                TargetMachine="1"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw293ud_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw294ud_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC"\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
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswudll\wxprec_xrcdll.pch"\r
                                ObjectFile="vc_mswudll\xrc\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw293u_xrc_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw294u_xrc_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="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_html.lib ..\..\lib\vc_dll\wxmsw29u_adv.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u_xml.lib ..\..\lib\vc_dll\wxbase29u.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmsw293u_xrc_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmsw294u_xrc_vc_custom.dll"\r
                                LinkIncremental="1"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmsw29u_xrc.lib"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293u_xrc_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw294u_xrc_vc_custom.pdb"\r
                                TargetMachine="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"/>\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw293u_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC"\r
+                               PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw294u_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC"\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
                        <Tool\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswunivuddll\wxprec_xrcdll.pch"\r
                                ObjectFile="vc_mswunivuddll\xrc\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv293ud_xrc_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv294ud_xrc_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="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_html.lib ..\..\lib\vc_dll\wxmswuniv29ud_adv.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib ..\..\lib\vc_dll\wxbase29ud.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmswuniv293ud_xrc_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmswuniv294ud_xrc_vc_custom.dll"\r
                                LinkIncremental="2"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_xrc.lib"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293ud_xrc_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv294ud_xrc_vc_custom.pdb"\r
                                TargetMachine="1"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv293ud_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv294ud_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC"\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
                        <Tool\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswunivudll\wxprec_xrcdll.pch"\r
                                ObjectFile="vc_mswunivudll\xrc\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv293u_xrc_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv294u_xrc_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="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\wxmswuniv29u_html.lib ..\..\lib\vc_dll\wxmswuniv29u_adv.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u_xml.lib ..\..\lib\vc_dll\wxbase29u.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmswuniv293u_xrc_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmswuniv294u_xrc_vc_custom.dll"\r
                                LinkIncremental="1"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_xrc.lib"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293u_xrc_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv294u_xrc_vc_custom.pdb"\r
                                TargetMachine="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"/>\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv293u_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv294u_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC"\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
                        <Tool\r
index d4bee28a70c291681211e0103abec0d0bc8f086b..4484866eb75429fdecd76a4aebeb7d77afc9d98e 100644 (file)
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswuddll\wxprec_advdll.pch"\r
                                ObjectFile="vc_mswuddll\adv\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw293ud_adv_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw294ud_adv_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                Detect64BitPortabilityProblems="true"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw293ud_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw294ud_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV"\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
                        />\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_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmsw293ud_adv_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmsw294ud_adv_vc_custom.dll"\r
                                LinkIncremental="2"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_adv.lib"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293ud_adv_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw294ud_adv_vc_custom.pdb"\r
                                TargetMachine="1"\r
                        />\r
                        <Tool\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswudll\wxprec_advdll.pch"\r
                                ObjectFile="vc_mswudll\adv\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw293u_adv_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw294u_adv_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                Detect64BitPortabilityProblems="true"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw293u_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV"\r
+                               PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw294u_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV"\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
                        />\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_core.lib ..\..\lib\vc_dll\wxbase29u.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmsw293u_adv_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmsw294u_adv_vc_custom.dll"\r
                                LinkIncremental="1"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmsw29u_adv.lib"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293u_adv_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw294u_adv_vc_custom.pdb"\r
                                TargetMachine="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswunivuddll\wxprec_advdll.pch"\r
                                ObjectFile="vc_mswunivuddll\adv\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv293ud_adv_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv294ud_adv_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                Detect64BitPortabilityProblems="true"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv293ud_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv294ud_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV"\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
                        />\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_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmswuniv293ud_adv_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmswuniv294ud_adv_vc_custom.dll"\r
                                LinkIncremental="2"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_adv.lib"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293ud_adv_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv294ud_adv_vc_custom.pdb"\r
                                TargetMachine="1"\r
                        />\r
                        <Tool\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswunivudll\wxprec_advdll.pch"\r
                                ObjectFile="vc_mswunivudll\adv\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv293u_adv_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv294u_adv_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                Detect64BitPortabilityProblems="true"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv293u_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv294u_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV"\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
                        />\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_core.lib ..\..\lib\vc_dll\wxbase29u.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmswuniv293u_adv_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmswuniv294u_adv_vc_custom.dll"\r
                                LinkIncremental="1"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_adv.lib"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293u_adv_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv294u_adv_vc_custom.pdb"\r
                                TargetMachine="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
index f4e240ee195102530bf137342fd528004c9e6f10..7f839c3958ab1e0324c053181c057286aa992975 100644 (file)
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswuddll\wxprec_auidll.pch"\r
                                ObjectFile="vc_mswuddll\aui\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw293ud_aui_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw294ud_aui_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                Detect64BitPortabilityProblems="true"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw293ud_aui_vc_custom;WXUSINGDLL;WXMAKINGDLL_AUI"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw294ud_aui_vc_custom;WXUSINGDLL;WXMAKINGDLL_AUI"\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
                        />\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\wxmsw293ud_aui_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmsw294ud_aui_vc_custom.dll"\r
                                LinkIncremental="2"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_aui.lib"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293ud_aui_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw294ud_aui_vc_custom.pdb"\r
                                TargetMachine="1"\r
                        />\r
                        <Tool\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswudll\wxprec_auidll.pch"\r
                                ObjectFile="vc_mswudll\aui\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw293u_aui_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw294u_aui_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                Detect64BitPortabilityProblems="true"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw293u_aui_vc_custom;WXUSINGDLL;WXMAKINGDLL_AUI"\r
+                               PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw294u_aui_vc_custom;WXUSINGDLL;WXMAKINGDLL_AUI"\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
                        />\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\wxmsw293u_aui_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmsw294u_aui_vc_custom.dll"\r
                                LinkIncremental="1"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmsw29u_aui.lib"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293u_aui_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw294u_aui_vc_custom.pdb"\r
                                TargetMachine="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswunivuddll\wxprec_auidll.pch"\r
                                ObjectFile="vc_mswunivuddll\aui\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv293ud_aui_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv294ud_aui_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                Detect64BitPortabilityProblems="true"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv293ud_aui_vc_custom;WXUSINGDLL;WXMAKINGDLL_AUI"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv294ud_aui_vc_custom;WXUSINGDLL;WXMAKINGDLL_AUI"\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
                        />\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\wxmswuniv293ud_aui_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmswuniv294ud_aui_vc_custom.dll"\r
                                LinkIncremental="2"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_aui.lib"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293ud_aui_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv294ud_aui_vc_custom.pdb"\r
                                TargetMachine="1"\r
                        />\r
                        <Tool\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswunivudll\wxprec_auidll.pch"\r
                                ObjectFile="vc_mswunivudll\aui\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv293u_aui_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv294u_aui_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                Detect64BitPortabilityProblems="true"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv293u_aui_vc_custom;WXUSINGDLL;WXMAKINGDLL_AUI"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv294u_aui_vc_custom;WXUSINGDLL;WXMAKINGDLL_AUI"\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
                        />\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\wxmswuniv293u_aui_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmswuniv294u_aui_vc_custom.dll"\r
                                LinkIncremental="1"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_aui.lib"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293u_aui_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv294u_aui_vc_custom.pdb"\r
                                TargetMachine="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
index 268ba0971c6d1ee2fb7cec3cc01d6424d08b0d7c..4b875a3d346665689846503c3640775754defa69 100644 (file)
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswuddll\wxprec_basedll.pch"\r
                                ObjectFile="vc_mswuddll\base\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase293ud_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase294ud_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                Detect64BitPortabilityProblems="true"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase293ud_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase294ud_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"\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
                        />\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
                                AdditionalDependencies="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="..\..\lib\vc_dll\wxbase293ud_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxbase294ud_vc_custom.dll"\r
                                LinkIncremental="2"\r
                                ImportLibrary="..\..\lib\vc_dll\wxbase29ud.lib"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxbase293ud_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxbase294ud_vc_custom.pdb"\r
                                TargetMachine="1"\r
                        />\r
                        <Tool\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswudll\wxprec_basedll.pch"\r
                                ObjectFile="vc_mswudll\base\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase293u_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase294u_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                Detect64BitPortabilityProblems="true"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase293u_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"\r
+                               PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase294u_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"\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
                        />\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
                                AdditionalDependencies="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="..\..\lib\vc_dll\wxbase293u_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxbase294u_vc_custom.dll"\r
                                LinkIncremental="1"\r
                                ImportLibrary="..\..\lib\vc_dll\wxbase29u.lib"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxbase293u_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxbase294u_vc_custom.pdb"\r
                                TargetMachine="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswunivuddll\wxprec_basedll.pch"\r
                                ObjectFile="vc_mswunivuddll\base\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase293ud_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase294ud_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                Detect64BitPortabilityProblems="true"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase293ud_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase294ud_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"\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
                        />\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
                                AdditionalDependencies="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="..\..\lib\vc_dll\wxbase293ud_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxbase294ud_vc_custom.dll"\r
                                LinkIncremental="2"\r
                                ImportLibrary="..\..\lib\vc_dll\wxbase29ud.lib"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxbase293ud_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxbase294ud_vc_custom.pdb"\r
                                TargetMachine="1"\r
                        />\r
                        <Tool\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswunivudll\wxprec_basedll.pch"\r
                                ObjectFile="vc_mswunivudll\base\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase293u_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase294u_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                Detect64BitPortabilityProblems="true"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase293u_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase294u_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"\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
                        />\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
                                AdditionalDependencies="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="..\..\lib\vc_dll\wxbase293u_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxbase294u_vc_custom.dll"\r
                                LinkIncremental="1"\r
                                ImportLibrary="..\..\lib\vc_dll\wxbase29u.lib"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxbase293u_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxbase294u_vc_custom.pdb"\r
                                TargetMachine="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
index bd23086eef0da944725574b9c08d3a5ae49e92e5..c613b85d5094fc999e4db6885e7c4465a7d5126d 100644 (file)
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswuddll\wxprec_coredll.pch"\r
                                ObjectFile="vc_mswuddll\core\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw293ud_core_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw294ud_core_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                Detect64BitPortabilityProblems="true"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw293ud_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw294ud_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"\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
                        />\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\wxbase29ud.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmsw293ud_core_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmsw294ud_core_vc_custom.dll"\r
                                LinkIncremental="2"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_core.lib"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293ud_core_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw294ud_core_vc_custom.pdb"\r
                                TargetMachine="1"\r
                        />\r
                        <Tool\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswudll\wxprec_coredll.pch"\r
                                ObjectFile="vc_mswudll\core\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw293u_core_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw294u_core_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                Detect64BitPortabilityProblems="true"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw293u_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"\r
+                               PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw294u_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"\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
                        />\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\wxbase29u.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmsw293u_core_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmsw294u_core_vc_custom.dll"\r
                                LinkIncremental="1"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmsw29u_core.lib"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293u_core_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw294u_core_vc_custom.pdb"\r
                                TargetMachine="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswunivuddll\wxprec_coredll.pch"\r
                                ObjectFile="vc_mswunivuddll\core\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv293ud_core_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv294ud_core_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                Detect64BitPortabilityProblems="true"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv293ud_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv294ud_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"\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
                        />\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\wxbase29ud.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmswuniv293ud_core_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmswuniv294ud_core_vc_custom.dll"\r
                                LinkIncremental="2"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_core.lib"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293ud_core_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv294ud_core_vc_custom.pdb"\r
                                TargetMachine="1"\r
                        />\r
                        <Tool\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswunivudll\wxprec_coredll.pch"\r
                                ObjectFile="vc_mswunivudll\core\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv293u_core_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv294u_core_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                Detect64BitPortabilityProblems="true"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv293u_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv294u_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"\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
                        />\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\wxbase29u.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmswuniv293u_core_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmswuniv294u_core_vc_custom.dll"\r
                                LinkIncremental="1"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_core.lib"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293u_core_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv294u_core_vc_custom.pdb"\r
                                TargetMachine="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
index 7b9741c8729fdfdb8d66f2a3436238500965f462..6fdb5ecf03905fa2d9c44d43b49fcf0c8fe0d854 100644 (file)
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswuddll\wxprec_gldll.pch"\r
                                ObjectFile="vc_mswuddll\gl\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw293ud_gl_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw294ud_gl_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                Detect64BitPortabilityProblems="true"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw293ud_gl_vc_custom;WXUSINGDLL;WXMAKINGDLL_GL"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw294ud_gl_vc_custom;WXUSINGDLL;WXMAKINGDLL_GL"\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
                        />\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 wxmsw29ud_core.lib wxbase29ud.lib  opengl32.lib glu32.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmsw293ud_gl_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmsw294ud_gl_vc_custom.dll"\r
                                LinkIncremental="2"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_gl.lib"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293ud_gl_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw294ud_gl_vc_custom.pdb"\r
                                TargetMachine="1"\r
                        />\r
                        <Tool\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswudll\wxprec_gldll.pch"\r
                                ObjectFile="vc_mswudll\gl\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw293u_gl_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw294u_gl_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                Detect64BitPortabilityProblems="true"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw293u_gl_vc_custom;WXUSINGDLL;WXMAKINGDLL_GL"\r
+                               PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw294u_gl_vc_custom;WXUSINGDLL;WXMAKINGDLL_GL"\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
                        />\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 wxmsw29u_core.lib wxbase29u.lib  opengl32.lib glu32.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmsw293u_gl_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmsw294u_gl_vc_custom.dll"\r
                                LinkIncremental="1"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmsw29u_gl.lib"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293u_gl_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw294u_gl_vc_custom.pdb"\r
                                TargetMachine="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswunivuddll\wxprec_gldll.pch"\r
                                ObjectFile="vc_mswunivuddll\gl\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv293ud_gl_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv294ud_gl_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                Detect64BitPortabilityProblems="true"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv293ud_gl_vc_custom;WXUSINGDLL;WXMAKINGDLL_GL"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv294ud_gl_vc_custom;WXUSINGDLL;WXMAKINGDLL_GL"\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
                        />\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 wxmswuniv29ud_core.lib wxbase29ud.lib  opengl32.lib glu32.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmswuniv293ud_gl_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmswuniv294ud_gl_vc_custom.dll"\r
                                LinkIncremental="2"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_gl.lib"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293ud_gl_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv294ud_gl_vc_custom.pdb"\r
                                TargetMachine="1"\r
                        />\r
                        <Tool\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswunivudll\wxprec_gldll.pch"\r
                                ObjectFile="vc_mswunivudll\gl\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv293u_gl_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv294u_gl_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                Detect64BitPortabilityProblems="true"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv293u_gl_vc_custom;WXUSINGDLL;WXMAKINGDLL_GL"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv294u_gl_vc_custom;WXUSINGDLL;WXMAKINGDLL_GL"\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
                        />\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 wxmswuniv29u_core.lib wxbase29u.lib  opengl32.lib glu32.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmswuniv293u_gl_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmswuniv294u_gl_vc_custom.dll"\r
                                LinkIncremental="1"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_gl.lib"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293u_gl_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv294u_gl_vc_custom.pdb"\r
                                TargetMachine="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
index 84db1d1e3b7ff4612bb1ed090627b96e375e6d41..2cc21ad748d68045d7dd1ecb8e4ad24dd7943ef1 100644 (file)
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswuddll\wxprec_htmldll.pch"\r
                                ObjectFile="vc_mswuddll\html\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw293ud_html_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw294ud_html_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                Detect64BitPortabilityProblems="true"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw293ud_html_vc_custom;WXUSINGDLL;WXMAKINGDLL_HTML"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw294ud_html_vc_custom;WXUSINGDLL;WXMAKINGDLL_HTML"\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
                        />\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_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmsw293ud_html_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmsw294ud_html_vc_custom.dll"\r
                                LinkIncremental="2"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_html.lib"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293ud_html_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw294ud_html_vc_custom.pdb"\r
                                TargetMachine="1"\r
                        />\r
                        <Tool\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswudll\wxprec_htmldll.pch"\r
                                ObjectFile="vc_mswudll\html\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw293u_html_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw294u_html_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                Detect64BitPortabilityProblems="true"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw293u_html_vc_custom;WXUSINGDLL;WXMAKINGDLL_HTML"\r
+                               PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw294u_html_vc_custom;WXUSINGDLL;WXMAKINGDLL_HTML"\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
                        />\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_core.lib ..\..\lib\vc_dll\wxbase29u.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmsw293u_html_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmsw294u_html_vc_custom.dll"\r
                                LinkIncremental="1"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmsw29u_html.lib"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293u_html_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw294u_html_vc_custom.pdb"\r
                                TargetMachine="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswunivuddll\wxprec_htmldll.pch"\r
                                ObjectFile="vc_mswunivuddll\html\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv293ud_html_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv294ud_html_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                Detect64BitPortabilityProblems="true"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv293ud_html_vc_custom;WXUSINGDLL;WXMAKINGDLL_HTML"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv294ud_html_vc_custom;WXUSINGDLL;WXMAKINGDLL_HTML"\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
                        />\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_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmswuniv293ud_html_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmswuniv294ud_html_vc_custom.dll"\r
                                LinkIncremental="2"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_html.lib"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293ud_html_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv294ud_html_vc_custom.pdb"\r
                                TargetMachine="1"\r
                        />\r
                        <Tool\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswunivudll\wxprec_htmldll.pch"\r
                                ObjectFile="vc_mswunivudll\html\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv293u_html_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv294u_html_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                Detect64BitPortabilityProblems="true"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv293u_html_vc_custom;WXUSINGDLL;WXMAKINGDLL_HTML"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv294u_html_vc_custom;WXUSINGDLL;WXMAKINGDLL_HTML"\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
                        />\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_core.lib ..\..\lib\vc_dll\wxbase29u.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmswuniv293u_html_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmswuniv294u_html_vc_custom.dll"\r
                                LinkIncremental="1"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_html.lib"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293u_html_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv294u_html_vc_custom.pdb"\r
                                TargetMachine="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
index 7c661e6fce2a7e93f53ec5b446f291e40ad9920b..b1628fecb07c02766fa169c968f31cd58a20c697 100644 (file)
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswuddll\wxprec_mediadll.pch"\r
                                ObjectFile="vc_mswuddll\media\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw293ud_media_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw294ud_media_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                Detect64BitPortabilityProblems="true"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw293ud_media_vc_custom;WXUSINGDLL;WXMAKINGDLL_MEDIA"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw294ud_media_vc_custom;WXUSINGDLL;WXMAKINGDLL_MEDIA"\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
                        />\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_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmsw293ud_media_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmsw294ud_media_vc_custom.dll"\r
                                LinkIncremental="2"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_media.lib"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293ud_media_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw294ud_media_vc_custom.pdb"\r
                                TargetMachine="1"\r
                        />\r
                        <Tool\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswudll\wxprec_mediadll.pch"\r
                                ObjectFile="vc_mswudll\media\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw293u_media_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw294u_media_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                Detect64BitPortabilityProblems="true"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw293u_media_vc_custom;WXUSINGDLL;WXMAKINGDLL_MEDIA"\r
+                               PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw294u_media_vc_custom;WXUSINGDLL;WXMAKINGDLL_MEDIA"\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
                        />\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_core.lib ..\..\lib\vc_dll\wxbase29u.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmsw293u_media_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmsw294u_media_vc_custom.dll"\r
                                LinkIncremental="1"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmsw29u_media.lib"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293u_media_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw294u_media_vc_custom.pdb"\r
                                TargetMachine="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswunivuddll\wxprec_mediadll.pch"\r
                                ObjectFile="vc_mswunivuddll\media\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv293ud_media_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv294ud_media_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                Detect64BitPortabilityProblems="true"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv293ud_media_vc_custom;WXUSINGDLL;WXMAKINGDLL_MEDIA"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv294ud_media_vc_custom;WXUSINGDLL;WXMAKINGDLL_MEDIA"\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
                        />\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_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmswuniv293ud_media_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmswuniv294ud_media_vc_custom.dll"\r
                                LinkIncremental="2"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_media.lib"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293ud_media_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv294ud_media_vc_custom.pdb"\r
                                TargetMachine="1"\r
                        />\r
                        <Tool\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswunivudll\wxprec_mediadll.pch"\r
                                ObjectFile="vc_mswunivudll\media\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv293u_media_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv294u_media_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                Detect64BitPortabilityProblems="true"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv293u_media_vc_custom;WXUSINGDLL;WXMAKINGDLL_MEDIA"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv294u_media_vc_custom;WXUSINGDLL;WXMAKINGDLL_MEDIA"\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
                        />\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_core.lib ..\..\lib\vc_dll\wxbase29u.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmswuniv293u_media_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmswuniv294u_media_vc_custom.dll"\r
                                LinkIncremental="1"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_media.lib"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293u_media_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv294u_media_vc_custom.pdb"\r
                                TargetMachine="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
index 04c561d4573ca46872007648a1bb004e3e5e93ad..0834a658406814ea9f1d7d5ae7cc87ea7292296f 100644 (file)
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswuddll\wxprec_netdll.pch"\r
                                ObjectFile="vc_mswuddll\net\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase293ud_net_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase294ud_net_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                Detect64BitPortabilityProblems="true"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase293ud_net_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase294ud_net_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET"\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
                        />\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
                                AdditionalDependencies="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\wxbase29ud.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxbase293ud_net_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxbase294ud_net_vc_custom.dll"\r
                                LinkIncremental="2"\r
                                ImportLibrary="..\..\lib\vc_dll\wxbase29ud_net.lib"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxbase293ud_net_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxbase294ud_net_vc_custom.pdb"\r
                                TargetMachine="1"\r
                        />\r
                        <Tool\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswudll\wxprec_netdll.pch"\r
                                ObjectFile="vc_mswudll\net\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase293u_net_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase294u_net_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                Detect64BitPortabilityProblems="true"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase293u_net_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET"\r
+                               PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase294u_net_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET"\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
                        />\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
                                AdditionalDependencies="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\wxbase29u.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxbase293u_net_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxbase294u_net_vc_custom.dll"\r
                                LinkIncremental="1"\r
                                ImportLibrary="..\..\lib\vc_dll\wxbase29u_net.lib"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxbase293u_net_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxbase294u_net_vc_custom.pdb"\r
                                TargetMachine="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswunivuddll\wxprec_netdll.pch"\r
                                ObjectFile="vc_mswunivuddll\net\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase293ud_net_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase294ud_net_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                Detect64BitPortabilityProblems="true"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase293ud_net_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase294ud_net_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET"\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
                        />\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
                                AdditionalDependencies="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\wxbase29ud.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxbase293ud_net_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxbase294ud_net_vc_custom.dll"\r
                                LinkIncremental="2"\r
                                ImportLibrary="..\..\lib\vc_dll\wxbase29ud_net.lib"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxbase293ud_net_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxbase294ud_net_vc_custom.pdb"\r
                                TargetMachine="1"\r
                        />\r
                        <Tool\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswunivudll\wxprec_netdll.pch"\r
                                ObjectFile="vc_mswunivudll\net\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase293u_net_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase294u_net_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                Detect64BitPortabilityProblems="true"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase293u_net_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase294u_net_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET"\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
                        />\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
                                AdditionalDependencies="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\wxbase29u.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxbase293u_net_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxbase294u_net_vc_custom.dll"\r
                                LinkIncremental="1"\r
                                ImportLibrary="..\..\lib\vc_dll\wxbase29u_net.lib"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxbase293u_net_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxbase294u_net_vc_custom.pdb"\r
                                TargetMachine="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
index 5ffffac3f6e4316ada6ac17e888885276f877183..facc22056ce54b175edb07f1443e4a74974d2892 100644 (file)
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswuddll\wxprec_propgriddll.pch"\r
                                ObjectFile="vc_mswuddll\propgrid\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw293ud_propgrid_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw294ud_propgrid_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                Detect64BitPortabilityProblems="true"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw293ud_propgrid_vc_custom;WXUSINGDLL;WXMAKINGDLL_PROPGRID"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw294ud_propgrid_vc_custom;WXUSINGDLL;WXMAKINGDLL_PROPGRID"\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
                        />\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\wxmsw293ud_propgrid_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmsw294ud_propgrid_vc_custom.dll"\r
                                LinkIncremental="2"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_propgrid.lib"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293ud_propgrid_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw294ud_propgrid_vc_custom.pdb"\r
                                TargetMachine="1"\r
                        />\r
                        <Tool\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswudll\wxprec_propgriddll.pch"\r
                                ObjectFile="vc_mswudll\propgrid\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw293u_propgrid_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw294u_propgrid_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                Detect64BitPortabilityProblems="true"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw293u_propgrid_vc_custom;WXUSINGDLL;WXMAKINGDLL_PROPGRID"\r
+                               PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw294u_propgrid_vc_custom;WXUSINGDLL;WXMAKINGDLL_PROPGRID"\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
                        />\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\wxmsw293u_propgrid_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmsw294u_propgrid_vc_custom.dll"\r
                                LinkIncremental="1"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmsw29u_propgrid.lib"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293u_propgrid_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw294u_propgrid_vc_custom.pdb"\r
                                TargetMachine="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswunivuddll\wxprec_propgriddll.pch"\r
                                ObjectFile="vc_mswunivuddll\propgrid\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv293ud_propgrid_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv294ud_propgrid_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                Detect64BitPortabilityProblems="true"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv293ud_propgrid_vc_custom;WXUSINGDLL;WXMAKINGDLL_PROPGRID"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv294ud_propgrid_vc_custom;WXUSINGDLL;WXMAKINGDLL_PROPGRID"\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
                        />\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\wxmswuniv293ud_propgrid_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmswuniv294ud_propgrid_vc_custom.dll"\r
                                LinkIncremental="2"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_propgrid.lib"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293ud_propgrid_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv294ud_propgrid_vc_custom.pdb"\r
                                TargetMachine="1"\r
                        />\r
                        <Tool\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswunivudll\wxprec_propgriddll.pch"\r
                                ObjectFile="vc_mswunivudll\propgrid\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv293u_propgrid_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv294u_propgrid_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                Detect64BitPortabilityProblems="true"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv293u_propgrid_vc_custom;WXUSINGDLL;WXMAKINGDLL_PROPGRID"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv294u_propgrid_vc_custom;WXUSINGDLL;WXMAKINGDLL_PROPGRID"\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
                        />\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\wxmswuniv293u_propgrid_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmswuniv294u_propgrid_vc_custom.dll"\r
                                LinkIncremental="1"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_propgrid.lib"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293u_propgrid_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv294u_propgrid_vc_custom.pdb"\r
                                TargetMachine="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
index 5fe5f4dfa4569c9a091da50e7b913f2580b47285..2fb74fba2921af8c2a2d1e39103c331bb94ac1d7 100644 (file)
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswuddll\wxprec_qadll.pch"\r
                                ObjectFile="vc_mswuddll\qa\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw293ud_qa_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw294ud_qa_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                Detect64BitPortabilityProblems="true"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw293ud_qa_vc_custom;WXUSINGDLL;WXMAKINGDLL_QA"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw294ud_qa_vc_custom;WXUSINGDLL;WXMAKINGDLL_QA"\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
                        />\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_core.lib ..\..\lib\vc_dll\wxbase29ud.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmsw293ud_qa_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmsw294ud_qa_vc_custom.dll"\r
                                LinkIncremental="2"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_qa.lib"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293ud_qa_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw294ud_qa_vc_custom.pdb"\r
                                TargetMachine="1"\r
                        />\r
                        <Tool\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswudll\wxprec_qadll.pch"\r
                                ObjectFile="vc_mswudll\qa\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw293u_qa_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw294u_qa_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                Detect64BitPortabilityProblems="true"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw293u_qa_vc_custom;WXUSINGDLL;WXMAKINGDLL_QA"\r
+                               PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw294u_qa_vc_custom;WXUSINGDLL;WXMAKINGDLL_QA"\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
                        />\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_core.lib ..\..\lib\vc_dll\wxbase29u.lib ..\..\lib\vc_dll\wxbase29u_xml.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmsw293u_qa_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmsw294u_qa_vc_custom.dll"\r
                                LinkIncremental="1"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmsw29u_qa.lib"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293u_qa_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw294u_qa_vc_custom.pdb"\r
                                TargetMachine="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswunivuddll\wxprec_qadll.pch"\r
                                ObjectFile="vc_mswunivuddll\qa\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv293ud_qa_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv294ud_qa_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                Detect64BitPortabilityProblems="true"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv293ud_qa_vc_custom;WXUSINGDLL;WXMAKINGDLL_QA"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv294ud_qa_vc_custom;WXUSINGDLL;WXMAKINGDLL_QA"\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
                        />\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_core.lib ..\..\lib\vc_dll\wxbase29ud.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmswuniv293ud_qa_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmswuniv294ud_qa_vc_custom.dll"\r
                                LinkIncremental="2"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_qa.lib"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293ud_qa_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv294ud_qa_vc_custom.pdb"\r
                                TargetMachine="1"\r
                        />\r
                        <Tool\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswunivudll\wxprec_qadll.pch"\r
                                ObjectFile="vc_mswunivudll\qa\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv293u_qa_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv294u_qa_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                Detect64BitPortabilityProblems="true"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv293u_qa_vc_custom;WXUSINGDLL;WXMAKINGDLL_QA"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv294u_qa_vc_custom;WXUSINGDLL;WXMAKINGDLL_QA"\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
                        />\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_core.lib ..\..\lib\vc_dll\wxbase29u.lib ..\..\lib\vc_dll\wxbase29u_xml.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmswuniv293u_qa_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmswuniv294u_qa_vc_custom.dll"\r
                                LinkIncremental="1"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_qa.lib"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293u_qa_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv294u_qa_vc_custom.pdb"\r
                                TargetMachine="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
index b22537b0497e3604e5f29d1db00ef976dc17dc50..34adf361cc33c2abb00be7337ef25c19e6e4f56b 100644 (file)
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswuddll\wxprec_ribbondll.pch"\r
                                ObjectFile="vc_mswuddll\ribbon\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw293ud_ribbon_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw294ud_ribbon_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                Detect64BitPortabilityProblems="true"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw293ud_ribbon_vc_custom;WXUSINGDLL;WXMAKINGDLL_RIBBON"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw294ud_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
                        />\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\wxmsw293ud_ribbon_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmsw294ud_ribbon_vc_custom.dll"\r
                                LinkIncremental="2"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_ribbon.lib"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293ud_ribbon_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw294ud_ribbon_vc_custom.pdb"\r
                                TargetMachine="1"\r
                        />\r
                        <Tool\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswudll\wxprec_ribbondll.pch"\r
                                ObjectFile="vc_mswudll\ribbon\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw293u_ribbon_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw294u_ribbon_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                Detect64BitPortabilityProblems="true"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw293u_ribbon_vc_custom;WXUSINGDLL;WXMAKINGDLL_RIBBON"\r
+                               PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw294u_ribbon_vc_custom;WXUSINGDLL;WXMAKINGDLL_RIBBON"\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
                        />\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\wxmsw293u_ribbon_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmsw294u_ribbon_vc_custom.dll"\r
                                LinkIncremental="1"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmsw29u_ribbon.lib"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293u_ribbon_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw294u_ribbon_vc_custom.pdb"\r
                                TargetMachine="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswunivuddll\wxprec_ribbondll.pch"\r
                                ObjectFile="vc_mswunivuddll\ribbon\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv293ud_ribbon_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv294ud_ribbon_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                Detect64BitPortabilityProblems="true"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv293ud_ribbon_vc_custom;WXUSINGDLL;WXMAKINGDLL_RIBBON"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv294ud_ribbon_vc_custom;WXUSINGDLL;WXMAKINGDLL_RIBBON"\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
                        />\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\wxmswuniv293ud_ribbon_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmswuniv294ud_ribbon_vc_custom.dll"\r
                                LinkIncremental="2"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_ribbon.lib"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293ud_ribbon_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv294ud_ribbon_vc_custom.pdb"\r
                                TargetMachine="1"\r
                        />\r
                        <Tool\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswunivudll\wxprec_ribbondll.pch"\r
                                ObjectFile="vc_mswunivudll\ribbon\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv293u_ribbon_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv294u_ribbon_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                Detect64BitPortabilityProblems="true"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv293u_ribbon_vc_custom;WXUSINGDLL;WXMAKINGDLL_RIBBON"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv294u_ribbon_vc_custom;WXUSINGDLL;WXMAKINGDLL_RIBBON"\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
                        />\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\wxmswuniv293u_ribbon_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmswuniv294u_ribbon_vc_custom.dll"\r
                                LinkIncremental="1"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_ribbon.lib"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293u_ribbon_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv294u_ribbon_vc_custom.pdb"\r
                                TargetMachine="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
index 7fac8f2a9d94d21fa3effddc0b210d5c25766d0a..39133ea80f1beddf1a5f329b756aa099a98b7bf2 100644 (file)
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswuddll\wxprec_richtextdll.pch"\r
                                ObjectFile="vc_mswuddll\richtext\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw293ud_richtext_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw294ud_richtext_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                Detect64BitPortabilityProblems="true"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw293ud_richtext_vc_custom;WXUSINGDLL;WXMAKINGDLL_RICHTEXT"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw294ud_richtext_vc_custom;WXUSINGDLL;WXMAKINGDLL_RICHTEXT"\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
                        />\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_html.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmsw293ud_richtext_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmsw294ud_richtext_vc_custom.dll"\r
                                LinkIncremental="2"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_richtext.lib"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293ud_richtext_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw294ud_richtext_vc_custom.pdb"\r
                                TargetMachine="1"\r
                        />\r
                        <Tool\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswudll\wxprec_richtextdll.pch"\r
                                ObjectFile="vc_mswudll\richtext\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw293u_richtext_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw294u_richtext_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                Detect64BitPortabilityProblems="true"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw293u_richtext_vc_custom;WXUSINGDLL;WXMAKINGDLL_RICHTEXT"\r
+                               PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw294u_richtext_vc_custom;WXUSINGDLL;WXMAKINGDLL_RICHTEXT"\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
                        />\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_html.lib ..\..\lib\vc_dll\wxbase29u_xml.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmsw293u_richtext_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmsw294u_richtext_vc_custom.dll"\r
                                LinkIncremental="1"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmsw29u_richtext.lib"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293u_richtext_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw294u_richtext_vc_custom.pdb"\r
                                TargetMachine="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswunivuddll\wxprec_richtextdll.pch"\r
                                ObjectFile="vc_mswunivuddll\richtext\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv293ud_richtext_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv294ud_richtext_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                Detect64BitPortabilityProblems="true"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv293ud_richtext_vc_custom;WXUSINGDLL;WXMAKINGDLL_RICHTEXT"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv294ud_richtext_vc_custom;WXUSINGDLL;WXMAKINGDLL_RICHTEXT"\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
                        />\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_html.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmswuniv293ud_richtext_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmswuniv294ud_richtext_vc_custom.dll"\r
                                LinkIncremental="2"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_richtext.lib"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293ud_richtext_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv294ud_richtext_vc_custom.pdb"\r
                                TargetMachine="1"\r
                        />\r
                        <Tool\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswunivudll\wxprec_richtextdll.pch"\r
                                ObjectFile="vc_mswunivudll\richtext\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv293u_richtext_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv294u_richtext_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                Detect64BitPortabilityProblems="true"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv293u_richtext_vc_custom;WXUSINGDLL;WXMAKINGDLL_RICHTEXT"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv294u_richtext_vc_custom;WXUSINGDLL;WXMAKINGDLL_RICHTEXT"\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
                        />\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_html.lib ..\..\lib\vc_dll\wxbase29u_xml.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmswuniv293u_richtext_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmswuniv294u_richtext_vc_custom.dll"\r
                                LinkIncremental="1"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_richtext.lib"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293u_richtext_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv294u_richtext_vc_custom.pdb"\r
                                TargetMachine="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
index 02dc390bea977d121fb0a5efc5d35e69096a8879..ab3566c363903a8ff0903573f7fbcec652d9a561 100644 (file)
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswuddll\wxprec_stcdll.pch"\r
                                ObjectFile="vc_mswuddll\stc\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw293ud_stc_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw294ud_stc_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                Detect64BitPortabilityProblems="true"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw293ud_stc_vc_custom;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw294ud_stc_vc_custom;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
                        />\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\wxscintillad.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmsw293ud_stc_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmsw294ud_stc_vc_custom.dll"\r
                                LinkIncremental="2"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_stc.lib"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293ud_stc_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw294ud_stc_vc_custom.pdb"\r
                                TargetMachine="1"\r
                        />\r
                        <Tool\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswudll\wxprec_stcdll.pch"\r
                                ObjectFile="vc_mswudll\stc\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw293u_stc_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw294u_stc_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                Detect64BitPortabilityProblems="true"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw293u_stc_vc_custom;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"\r
+                               PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw294u_stc_vc_custom;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
                        />\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\wxscintilla.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmsw293u_stc_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmsw294u_stc_vc_custom.dll"\r
                                LinkIncremental="1"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmsw29u_stc.lib"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293u_stc_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw294u_stc_vc_custom.pdb"\r
                                TargetMachine="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswunivuddll\wxprec_stcdll.pch"\r
                                ObjectFile="vc_mswunivuddll\stc\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv293ud_stc_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv294ud_stc_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                Detect64BitPortabilityProblems="true"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv293ud_stc_vc_custom;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv294ud_stc_vc_custom;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
                        />\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\wxscintillad.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmswuniv293ud_stc_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmswuniv294ud_stc_vc_custom.dll"\r
                                LinkIncremental="2"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_stc.lib"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293ud_stc_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv294ud_stc_vc_custom.pdb"\r
                                TargetMachine="1"\r
                        />\r
                        <Tool\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswunivudll\wxprec_stcdll.pch"\r
                                ObjectFile="vc_mswunivudll\stc\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv293u_stc_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv294u_stc_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                Detect64BitPortabilityProblems="true"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv293u_stc_vc_custom;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv294u_stc_vc_custom;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
                        />\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\wxscintilla.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmswuniv293u_stc_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmswuniv294u_stc_vc_custom.dll"\r
                                LinkIncremental="1"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_stc.lib"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293u_stc_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv294u_stc_vc_custom.pdb"\r
                                TargetMachine="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
index ba24c517b9b2c1d42f919e860f04c225e667fab7..649316057ff222534d69a14634eca40f8023ade2 100644 (file)
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswuddll\wxprec_webviewdll.pch"\r
                                ObjectFile="vc_mswuddll\webview\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw293ud_webview_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw294ud_webview_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                Detect64BitPortabilityProblems="true"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw293ud_webview_vc_custom;WXUSINGDLL;WXMAKINGDLL_WEBVIEW"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw294ud_webview_vc_custom;WXUSINGDLL;WXMAKINGDLL_WEBVIEW"\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
                        />\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_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmsw293ud_webview_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmsw294ud_webview_vc_custom.dll"\r
                                LinkIncremental="2"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_webview.lib"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293ud_webview_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw294ud_webview_vc_custom.pdb"\r
                                TargetMachine="1"\r
                        />\r
                        <Tool\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswudll\wxprec_webviewdll.pch"\r
                                ObjectFile="vc_mswudll\webview\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw293u_webview_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw294u_webview_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                Detect64BitPortabilityProblems="true"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw293u_webview_vc_custom;WXUSINGDLL;WXMAKINGDLL_WEBVIEW"\r
+                               PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw294u_webview_vc_custom;WXUSINGDLL;WXMAKINGDLL_WEBVIEW"\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
                        />\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_core.lib ..\..\lib\vc_dll\wxbase29u.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmsw293u_webview_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmsw294u_webview_vc_custom.dll"\r
                                LinkIncremental="1"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmsw29u_webview.lib"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293u_webview_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw294u_webview_vc_custom.pdb"\r
                                TargetMachine="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswunivuddll\wxprec_webviewdll.pch"\r
                                ObjectFile="vc_mswunivuddll\webview\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv293ud_webview_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv294ud_webview_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                Detect64BitPortabilityProblems="true"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv293ud_webview_vc_custom;WXUSINGDLL;WXMAKINGDLL_WEBVIEW"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv294ud_webview_vc_custom;WXUSINGDLL;WXMAKINGDLL_WEBVIEW"\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
                        />\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_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmswuniv293ud_webview_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmswuniv294ud_webview_vc_custom.dll"\r
                                LinkIncremental="2"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_webview.lib"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293ud_webview_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv294ud_webview_vc_custom.pdb"\r
                                TargetMachine="1"\r
                        />\r
                        <Tool\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswunivudll\wxprec_webviewdll.pch"\r
                                ObjectFile="vc_mswunivudll\webview\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv293u_webview_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv294u_webview_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                Detect64BitPortabilityProblems="true"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv293u_webview_vc_custom;WXUSINGDLL;WXMAKINGDLL_WEBVIEW"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv294u_webview_vc_custom;WXUSINGDLL;WXMAKINGDLL_WEBVIEW"\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
                        />\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_core.lib ..\..\lib\vc_dll\wxbase29u.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmswuniv293u_webview_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmswuniv294u_webview_vc_custom.dll"\r
                                LinkIncremental="1"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_webview.lib"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293u_webview_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv294u_webview_vc_custom.pdb"\r
                                TargetMachine="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
index 723e5e7a4842e268babf9650bc65a1bb6ca51e34..8efbae48231b46d700f2dbfb9326df99e9c0db50 100644 (file)
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswuddll\wxprec_xmldll.pch"\r
                                ObjectFile="vc_mswuddll\xml\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase293ud_xml_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase294ud_xml_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                Detect64BitPortabilityProblems="true"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase293ud_xml_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase294ud_xml_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML"\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
                        />\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
                                AdditionalDependencies="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\wxbase29ud.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxbase293ud_xml_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxbase294ud_xml_vc_custom.dll"\r
                                LinkIncremental="2"\r
                                ImportLibrary="..\..\lib\vc_dll\wxbase29ud_xml.lib"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxbase293ud_xml_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxbase294ud_xml_vc_custom.pdb"\r
                                TargetMachine="1"\r
                        />\r
                        <Tool\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswudll\wxprec_xmldll.pch"\r
                                ObjectFile="vc_mswudll\xml\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase293u_xml_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase294u_xml_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                Detect64BitPortabilityProblems="true"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase293u_xml_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML"\r
+                               PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase294u_xml_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML"\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
                        />\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
                                AdditionalDependencies="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\wxbase29u.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxbase293u_xml_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxbase294u_xml_vc_custom.dll"\r
                                LinkIncremental="1"\r
                                ImportLibrary="..\..\lib\vc_dll\wxbase29u_xml.lib"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxbase293u_xml_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxbase294u_xml_vc_custom.pdb"\r
                                TargetMachine="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswunivuddll\wxprec_xmldll.pch"\r
                                ObjectFile="vc_mswunivuddll\xml\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase293ud_xml_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase294ud_xml_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                Detect64BitPortabilityProblems="true"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase293ud_xml_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase294ud_xml_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML"\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
                        />\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
                                AdditionalDependencies="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\wxbase29ud.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxbase293ud_xml_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxbase294ud_xml_vc_custom.dll"\r
                                LinkIncremental="2"\r
                                ImportLibrary="..\..\lib\vc_dll\wxbase29ud_xml.lib"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxbase293ud_xml_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxbase294ud_xml_vc_custom.pdb"\r
                                TargetMachine="1"\r
                        />\r
                        <Tool\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswunivudll\wxprec_xmldll.pch"\r
                                ObjectFile="vc_mswunivudll\xml\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase293u_xml_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase294u_xml_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                Detect64BitPortabilityProblems="true"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase293u_xml_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase294u_xml_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML"\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
                        />\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
                                AdditionalDependencies="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\wxbase29u.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxbase293u_xml_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxbase294u_xml_vc_custom.dll"\r
                                LinkIncremental="1"\r
                                ImportLibrary="..\..\lib\vc_dll\wxbase29u_xml.lib"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxbase293u_xml_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxbase294u_xml_vc_custom.pdb"\r
                                TargetMachine="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
index 196f1482fa2af9f32362c45b07c8f6e5f104946e..5ed61147d9fa693136619e397bc1d364ad1b7efb 100644 (file)
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswuddll\wxprec_xrcdll.pch"\r
                                ObjectFile="vc_mswuddll\xrc\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw293ud_xrc_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw294ud_xrc_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                Detect64BitPortabilityProblems="true"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw293ud_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw294ud_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC"\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
                        />\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_html.lib ..\..\lib\vc_dll\wxmsw29ud_adv.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib ..\..\lib\vc_dll\wxbase29ud.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmsw293ud_xrc_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmsw294ud_xrc_vc_custom.dll"\r
                                LinkIncremental="2"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_xrc.lib"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293ud_xrc_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw294ud_xrc_vc_custom.pdb"\r
                                TargetMachine="1"\r
                        />\r
                        <Tool\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswudll\wxprec_xrcdll.pch"\r
                                ObjectFile="vc_mswudll\xrc\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw293u_xrc_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw294u_xrc_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                Detect64BitPortabilityProblems="true"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw293u_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC"\r
+                               PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw294u_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC"\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
                        />\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_html.lib ..\..\lib\vc_dll\wxmsw29u_adv.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u_xml.lib ..\..\lib\vc_dll\wxbase29u.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmsw293u_xrc_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmsw294u_xrc_vc_custom.dll"\r
                                LinkIncremental="1"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmsw29u_xrc.lib"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293u_xrc_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw294u_xrc_vc_custom.pdb"\r
                                TargetMachine="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswunivuddll\wxprec_xrcdll.pch"\r
                                ObjectFile="vc_mswunivuddll\xrc\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv293ud_xrc_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv294ud_xrc_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                Detect64BitPortabilityProblems="true"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv293ud_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv294ud_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC"\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
                        />\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_html.lib ..\..\lib\vc_dll\wxmswuniv29ud_adv.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib ..\..\lib\vc_dll\wxbase29ud.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmswuniv293ud_xrc_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmswuniv294ud_xrc_vc_custom.dll"\r
                                LinkIncremental="2"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_xrc.lib"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293ud_xrc_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv294ud_xrc_vc_custom.pdb"\r
                                TargetMachine="1"\r
                        />\r
                        <Tool\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswunivudll\wxprec_xrcdll.pch"\r
                                ObjectFile="vc_mswunivudll\xrc\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv293u_xrc_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv294u_xrc_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                Detect64BitPortabilityProblems="true"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv293u_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv294u_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC"\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
                        />\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_html.lib ..\..\lib\vc_dll\wxmswuniv29u_adv.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u_xml.lib ..\..\lib\vc_dll\wxbase29u.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmswuniv293u_xrc_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmswuniv294u_xrc_vc_custom.dll"\r
                                LinkIncremental="1"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_xrc.lib"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293u_xrc_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv294u_xrc_vc_custom.pdb"\r
                                TargetMachine="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
index 5820692ca9d5693ade1c33ad679defea21ef2d0f..4b1c83a4822aee64478a279dd72b4d4ef4571601 100644 (file)
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswuddll\wxprec_advdll.pch"\r
                                ObjectFile="vc_mswuddll\adv\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw293ud_adv_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw294ud_adv_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw293ud_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw294ud_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV"\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
                        />\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_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmsw293ud_adv_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmsw294ud_adv_vc_custom.dll"\r
                                LinkIncremental="2"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_adv.lib"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293ud_adv_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw294ud_adv_vc_custom.pdb"\r
                                TargetMachine="1"\r
                        />\r
                        <Tool\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswudll\wxprec_advdll.pch"\r
                                ObjectFile="vc_mswudll\adv\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw293u_adv_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw294u_adv_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw293u_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV"\r
+                               PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw294u_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV"\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
                        />\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_core.lib ..\..\lib\vc_dll\wxbase29u.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmsw293u_adv_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmsw294u_adv_vc_custom.dll"\r
                                LinkIncremental="1"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmsw29u_adv.lib"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293u_adv_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw294u_adv_vc_custom.pdb"\r
                                TargetMachine="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswunivuddll\wxprec_advdll.pch"\r
                                ObjectFile="vc_mswunivuddll\adv\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv293ud_adv_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv294ud_adv_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv293ud_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv294ud_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV"\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
                        />\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_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmswuniv293ud_adv_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmswuniv294ud_adv_vc_custom.dll"\r
                                LinkIncremental="2"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_adv.lib"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293ud_adv_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv294ud_adv_vc_custom.pdb"\r
                                TargetMachine="1"\r
                        />\r
                        <Tool\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswunivudll\wxprec_advdll.pch"\r
                                ObjectFile="vc_mswunivudll\adv\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv293u_adv_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv294u_adv_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv293u_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv294u_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV"\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
                        />\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_core.lib ..\..\lib\vc_dll\wxbase29u.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmswuniv293u_adv_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmswuniv294u_adv_vc_custom.dll"\r
                                LinkIncremental="1"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_adv.lib"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293u_adv_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv294u_adv_vc_custom.pdb"\r
                                TargetMachine="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
index 4e42d46d33a67b13372f645c16fc84ad6e4825f2..d2d0c9f3a8781bf1e4df446e9b276e5a589653d5 100644 (file)
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswuddll\wxprec_auidll.pch"\r
                                ObjectFile="vc_mswuddll\aui\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw293ud_aui_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw294ud_aui_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw293ud_aui_vc_custom;WXUSINGDLL;WXMAKINGDLL_AUI"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw294ud_aui_vc_custom;WXUSINGDLL;WXMAKINGDLL_AUI"\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
                        />\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\wxmsw293ud_aui_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmsw294ud_aui_vc_custom.dll"\r
                                LinkIncremental="2"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_aui.lib"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293ud_aui_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw294ud_aui_vc_custom.pdb"\r
                                TargetMachine="1"\r
                        />\r
                        <Tool\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswudll\wxprec_auidll.pch"\r
                                ObjectFile="vc_mswudll\aui\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw293u_aui_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw294u_aui_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw293u_aui_vc_custom;WXUSINGDLL;WXMAKINGDLL_AUI"\r
+                               PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw294u_aui_vc_custom;WXUSINGDLL;WXMAKINGDLL_AUI"\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
                        />\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\wxmsw293u_aui_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmsw294u_aui_vc_custom.dll"\r
                                LinkIncremental="1"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmsw29u_aui.lib"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293u_aui_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw294u_aui_vc_custom.pdb"\r
                                TargetMachine="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswunivuddll\wxprec_auidll.pch"\r
                                ObjectFile="vc_mswunivuddll\aui\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv293ud_aui_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv294ud_aui_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv293ud_aui_vc_custom;WXUSINGDLL;WXMAKINGDLL_AUI"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv294ud_aui_vc_custom;WXUSINGDLL;WXMAKINGDLL_AUI"\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
                        />\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\wxmswuniv293ud_aui_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmswuniv294ud_aui_vc_custom.dll"\r
                                LinkIncremental="2"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_aui.lib"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293ud_aui_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv294ud_aui_vc_custom.pdb"\r
                                TargetMachine="1"\r
                        />\r
                        <Tool\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswunivudll\wxprec_auidll.pch"\r
                                ObjectFile="vc_mswunivudll\aui\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv293u_aui_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv294u_aui_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv293u_aui_vc_custom;WXUSINGDLL;WXMAKINGDLL_AUI"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv294u_aui_vc_custom;WXUSINGDLL;WXMAKINGDLL_AUI"\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
                        />\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\wxmswuniv293u_aui_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmswuniv294u_aui_vc_custom.dll"\r
                                LinkIncremental="1"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_aui.lib"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293u_aui_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv294u_aui_vc_custom.pdb"\r
                                TargetMachine="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
index 078db70378230ecdbf7ebc6aabcf4266bf86eca8..a48f097ce9ef2db1371edfeac6959c4bb92caad8 100644 (file)
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswuddll\wxprec_basedll.pch"\r
                                ObjectFile="vc_mswuddll\base\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase293ud_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase294ud_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase293ud_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase294ud_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"\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
                        />\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
                                AdditionalDependencies="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="..\..\lib\vc_dll\wxbase293ud_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxbase294ud_vc_custom.dll"\r
                                LinkIncremental="2"\r
                                ImportLibrary="..\..\lib\vc_dll\wxbase29ud.lib"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxbase293ud_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxbase294ud_vc_custom.pdb"\r
                                TargetMachine="1"\r
                        />\r
                        <Tool\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswudll\wxprec_basedll.pch"\r
                                ObjectFile="vc_mswudll\base\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase293u_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase294u_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase293u_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"\r
+                               PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase294u_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"\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
                        />\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
                                AdditionalDependencies="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="..\..\lib\vc_dll\wxbase293u_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxbase294u_vc_custom.dll"\r
                                LinkIncremental="1"\r
                                ImportLibrary="..\..\lib\vc_dll\wxbase29u.lib"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxbase293u_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxbase294u_vc_custom.pdb"\r
                                TargetMachine="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswunivuddll\wxprec_basedll.pch"\r
                                ObjectFile="vc_mswunivuddll\base\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase293ud_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase294ud_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase293ud_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase294ud_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"\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
                        />\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
                                AdditionalDependencies="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="..\..\lib\vc_dll\wxbase293ud_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxbase294ud_vc_custom.dll"\r
                                LinkIncremental="2"\r
                                ImportLibrary="..\..\lib\vc_dll\wxbase29ud.lib"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxbase293ud_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxbase294ud_vc_custom.pdb"\r
                                TargetMachine="1"\r
                        />\r
                        <Tool\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswunivudll\wxprec_basedll.pch"\r
                                ObjectFile="vc_mswunivudll\base\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase293u_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase294u_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase293u_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase294u_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"\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
                        />\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
                                AdditionalDependencies="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="..\..\lib\vc_dll\wxbase293u_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxbase294u_vc_custom.dll"\r
                                LinkIncremental="1"\r
                                ImportLibrary="..\..\lib\vc_dll\wxbase29u.lib"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxbase293u_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxbase294u_vc_custom.pdb"\r
                                TargetMachine="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
index 860a305e056097ff0a50660280046edd87840d72..092528f0cf4a0e96aa2e4efaec43f326c398af06 100644 (file)
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswuddll\wxprec_coredll.pch"\r
                                ObjectFile="vc_mswuddll\core\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw293ud_core_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw294ud_core_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw293ud_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw294ud_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"\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
                        />\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\wxbase29ud.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmsw293ud_core_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmsw294ud_core_vc_custom.dll"\r
                                LinkIncremental="2"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_core.lib"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293ud_core_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw294ud_core_vc_custom.pdb"\r
                                TargetMachine="1"\r
                        />\r
                        <Tool\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswudll\wxprec_coredll.pch"\r
                                ObjectFile="vc_mswudll\core\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw293u_core_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw294u_core_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw293u_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"\r
+                               PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw294u_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"\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
                        />\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\wxbase29u.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmsw293u_core_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmsw294u_core_vc_custom.dll"\r
                                LinkIncremental="1"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmsw29u_core.lib"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293u_core_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw294u_core_vc_custom.pdb"\r
                                TargetMachine="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswunivuddll\wxprec_coredll.pch"\r
                                ObjectFile="vc_mswunivuddll\core\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv293ud_core_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv294ud_core_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv293ud_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv294ud_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"\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
                        />\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\wxbase29ud.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmswuniv293ud_core_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmswuniv294ud_core_vc_custom.dll"\r
                                LinkIncremental="2"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_core.lib"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293ud_core_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv294ud_core_vc_custom.pdb"\r
                                TargetMachine="1"\r
                        />\r
                        <Tool\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswunivudll\wxprec_coredll.pch"\r
                                ObjectFile="vc_mswunivudll\core\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv293u_core_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv294u_core_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv293u_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv294u_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"\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
                        />\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\wxbase29u.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmswuniv293u_core_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmswuniv294u_core_vc_custom.dll"\r
                                LinkIncremental="1"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_core.lib"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293u_core_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv294u_core_vc_custom.pdb"\r
                                TargetMachine="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
index 627f75b16dcfad40bfb86209f522c1c4a049ad28..0bf357c5fb5d9356a8a743b5108c8a79c72ed7e3 100644 (file)
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswuddll\wxprec_gldll.pch"\r
                                ObjectFile="vc_mswuddll\gl\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw293ud_gl_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw294ud_gl_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw293ud_gl_vc_custom;WXUSINGDLL;WXMAKINGDLL_GL"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw294ud_gl_vc_custom;WXUSINGDLL;WXMAKINGDLL_GL"\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
                        />\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 wxmsw29ud_core.lib wxbase29ud.lib  opengl32.lib glu32.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmsw293ud_gl_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmsw294ud_gl_vc_custom.dll"\r
                                LinkIncremental="2"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_gl.lib"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293ud_gl_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw294ud_gl_vc_custom.pdb"\r
                                TargetMachine="1"\r
                        />\r
                        <Tool\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswudll\wxprec_gldll.pch"\r
                                ObjectFile="vc_mswudll\gl\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw293u_gl_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw294u_gl_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw293u_gl_vc_custom;WXUSINGDLL;WXMAKINGDLL_GL"\r
+                               PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw294u_gl_vc_custom;WXUSINGDLL;WXMAKINGDLL_GL"\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
                        />\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 wxmsw29u_core.lib wxbase29u.lib  opengl32.lib glu32.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmsw293u_gl_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmsw294u_gl_vc_custom.dll"\r
                                LinkIncremental="1"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmsw29u_gl.lib"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293u_gl_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw294u_gl_vc_custom.pdb"\r
                                TargetMachine="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswunivuddll\wxprec_gldll.pch"\r
                                ObjectFile="vc_mswunivuddll\gl\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv293ud_gl_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv294ud_gl_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv293ud_gl_vc_custom;WXUSINGDLL;WXMAKINGDLL_GL"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv294ud_gl_vc_custom;WXUSINGDLL;WXMAKINGDLL_GL"\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
                        />\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 wxmswuniv29ud_core.lib wxbase29ud.lib  opengl32.lib glu32.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmswuniv293ud_gl_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmswuniv294ud_gl_vc_custom.dll"\r
                                LinkIncremental="2"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_gl.lib"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293ud_gl_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv294ud_gl_vc_custom.pdb"\r
                                TargetMachine="1"\r
                        />\r
                        <Tool\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswunivudll\wxprec_gldll.pch"\r
                                ObjectFile="vc_mswunivudll\gl\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv293u_gl_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv294u_gl_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv293u_gl_vc_custom;WXUSINGDLL;WXMAKINGDLL_GL"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv294u_gl_vc_custom;WXUSINGDLL;WXMAKINGDLL_GL"\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
                        />\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 wxmswuniv29u_core.lib wxbase29u.lib  opengl32.lib glu32.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmswuniv293u_gl_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmswuniv294u_gl_vc_custom.dll"\r
                                LinkIncremental="1"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_gl.lib"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293u_gl_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv294u_gl_vc_custom.pdb"\r
                                TargetMachine="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
index 9842902dbf533638ab883bca63a6374c7edebfdb..8e3cb8d66051cadde845a6610bbd3bbd00ee12fa 100644 (file)
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswuddll\wxprec_htmldll.pch"\r
                                ObjectFile="vc_mswuddll\html\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw293ud_html_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw294ud_html_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw293ud_html_vc_custom;WXUSINGDLL;WXMAKINGDLL_HTML"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw294ud_html_vc_custom;WXUSINGDLL;WXMAKINGDLL_HTML"\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
                        />\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_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmsw293ud_html_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmsw294ud_html_vc_custom.dll"\r
                                LinkIncremental="2"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_html.lib"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293ud_html_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw294ud_html_vc_custom.pdb"\r
                                TargetMachine="1"\r
                        />\r
                        <Tool\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswudll\wxprec_htmldll.pch"\r
                                ObjectFile="vc_mswudll\html\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw293u_html_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw294u_html_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw293u_html_vc_custom;WXUSINGDLL;WXMAKINGDLL_HTML"\r
+                               PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw294u_html_vc_custom;WXUSINGDLL;WXMAKINGDLL_HTML"\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
                        />\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_core.lib ..\..\lib\vc_dll\wxbase29u.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmsw293u_html_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmsw294u_html_vc_custom.dll"\r
                                LinkIncremental="1"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmsw29u_html.lib"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293u_html_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw294u_html_vc_custom.pdb"\r
                                TargetMachine="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswunivuddll\wxprec_htmldll.pch"\r
                                ObjectFile="vc_mswunivuddll\html\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv293ud_html_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv294ud_html_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv293ud_html_vc_custom;WXUSINGDLL;WXMAKINGDLL_HTML"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv294ud_html_vc_custom;WXUSINGDLL;WXMAKINGDLL_HTML"\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
                        />\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_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmswuniv293ud_html_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmswuniv294ud_html_vc_custom.dll"\r
                                LinkIncremental="2"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_html.lib"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293ud_html_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv294ud_html_vc_custom.pdb"\r
                                TargetMachine="1"\r
                        />\r
                        <Tool\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswunivudll\wxprec_htmldll.pch"\r
                                ObjectFile="vc_mswunivudll\html\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv293u_html_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv294u_html_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv293u_html_vc_custom;WXUSINGDLL;WXMAKINGDLL_HTML"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv294u_html_vc_custom;WXUSINGDLL;WXMAKINGDLL_HTML"\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
                        />\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_core.lib ..\..\lib\vc_dll\wxbase29u.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmswuniv293u_html_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmswuniv294u_html_vc_custom.dll"\r
                                LinkIncremental="1"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_html.lib"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293u_html_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv294u_html_vc_custom.pdb"\r
                                TargetMachine="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
index fc16ea23264cf8dac1aeb1dad35a4875d86e0fbe..7f61bf57980e55fe0ffd6b6f3b067be4ff4e6aba 100644 (file)
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswuddll\wxprec_mediadll.pch"\r
                                ObjectFile="vc_mswuddll\media\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw293ud_media_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw294ud_media_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw293ud_media_vc_custom;WXUSINGDLL;WXMAKINGDLL_MEDIA"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw294ud_media_vc_custom;WXUSINGDLL;WXMAKINGDLL_MEDIA"\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
                        />\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_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmsw293ud_media_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmsw294ud_media_vc_custom.dll"\r
                                LinkIncremental="2"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_media.lib"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293ud_media_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw294ud_media_vc_custom.pdb"\r
                                TargetMachine="1"\r
                        />\r
                        <Tool\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswudll\wxprec_mediadll.pch"\r
                                ObjectFile="vc_mswudll\media\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw293u_media_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw294u_media_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw293u_media_vc_custom;WXUSINGDLL;WXMAKINGDLL_MEDIA"\r
+                               PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw294u_media_vc_custom;WXUSINGDLL;WXMAKINGDLL_MEDIA"\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
                        />\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_core.lib ..\..\lib\vc_dll\wxbase29u.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmsw293u_media_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmsw294u_media_vc_custom.dll"\r
                                LinkIncremental="1"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmsw29u_media.lib"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293u_media_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw294u_media_vc_custom.pdb"\r
                                TargetMachine="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswunivuddll\wxprec_mediadll.pch"\r
                                ObjectFile="vc_mswunivuddll\media\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv293ud_media_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv294ud_media_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv293ud_media_vc_custom;WXUSINGDLL;WXMAKINGDLL_MEDIA"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv294ud_media_vc_custom;WXUSINGDLL;WXMAKINGDLL_MEDIA"\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
                        />\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_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmswuniv293ud_media_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmswuniv294ud_media_vc_custom.dll"\r
                                LinkIncremental="2"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_media.lib"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293ud_media_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv294ud_media_vc_custom.pdb"\r
                                TargetMachine="1"\r
                        />\r
                        <Tool\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswunivudll\wxprec_mediadll.pch"\r
                                ObjectFile="vc_mswunivudll\media\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv293u_media_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv294u_media_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv293u_media_vc_custom;WXUSINGDLL;WXMAKINGDLL_MEDIA"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv294u_media_vc_custom;WXUSINGDLL;WXMAKINGDLL_MEDIA"\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
                        />\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_core.lib ..\..\lib\vc_dll\wxbase29u.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmswuniv293u_media_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmswuniv294u_media_vc_custom.dll"\r
                                LinkIncremental="1"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_media.lib"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293u_media_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv294u_media_vc_custom.pdb"\r
                                TargetMachine="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
index ab841b940a131ac4609e775487524a49c3a0ae1d..30588b955023524647a438710cda33d903fd9c1c 100644 (file)
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswuddll\wxprec_netdll.pch"\r
                                ObjectFile="vc_mswuddll\net\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase293ud_net_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase294ud_net_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase293ud_net_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase294ud_net_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET"\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
                        />\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
                                AdditionalDependencies="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\wxbase29ud.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxbase293ud_net_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxbase294ud_net_vc_custom.dll"\r
                                LinkIncremental="2"\r
                                ImportLibrary="..\..\lib\vc_dll\wxbase29ud_net.lib"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxbase293ud_net_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxbase294ud_net_vc_custom.pdb"\r
                                TargetMachine="1"\r
                        />\r
                        <Tool\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswudll\wxprec_netdll.pch"\r
                                ObjectFile="vc_mswudll\net\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase293u_net_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase294u_net_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase293u_net_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET"\r
+                               PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase294u_net_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET"\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
                        />\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
                                AdditionalDependencies="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\wxbase29u.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxbase293u_net_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxbase294u_net_vc_custom.dll"\r
                                LinkIncremental="1"\r
                                ImportLibrary="..\..\lib\vc_dll\wxbase29u_net.lib"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxbase293u_net_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxbase294u_net_vc_custom.pdb"\r
                                TargetMachine="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswunivuddll\wxprec_netdll.pch"\r
                                ObjectFile="vc_mswunivuddll\net\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase293ud_net_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase294ud_net_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase293ud_net_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase294ud_net_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET"\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
                        />\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
                                AdditionalDependencies="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\wxbase29ud.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxbase293ud_net_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxbase294ud_net_vc_custom.dll"\r
                                LinkIncremental="2"\r
                                ImportLibrary="..\..\lib\vc_dll\wxbase29ud_net.lib"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxbase293ud_net_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxbase294ud_net_vc_custom.pdb"\r
                                TargetMachine="1"\r
                        />\r
                        <Tool\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswunivudll\wxprec_netdll.pch"\r
                                ObjectFile="vc_mswunivudll\net\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase293u_net_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase294u_net_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase293u_net_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase294u_net_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET"\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
                        />\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
                                AdditionalDependencies="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\wxbase29u.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxbase293u_net_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxbase294u_net_vc_custom.dll"\r
                                LinkIncremental="1"\r
                                ImportLibrary="..\..\lib\vc_dll\wxbase29u_net.lib"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxbase293u_net_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxbase294u_net_vc_custom.pdb"\r
                                TargetMachine="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
index 92af51a81f82b683c8907ca4fe998144a304fb36..248fdfee2f3ecf0a193399941e653dd7bc2e249d 100644 (file)
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswuddll\wxprec_propgriddll.pch"\r
                                ObjectFile="vc_mswuddll\propgrid\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw293ud_propgrid_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw294ud_propgrid_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw293ud_propgrid_vc_custom;WXUSINGDLL;WXMAKINGDLL_PROPGRID"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw294ud_propgrid_vc_custom;WXUSINGDLL;WXMAKINGDLL_PROPGRID"\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
                        />\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\wxmsw293ud_propgrid_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmsw294ud_propgrid_vc_custom.dll"\r
                                LinkIncremental="2"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_propgrid.lib"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293ud_propgrid_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw294ud_propgrid_vc_custom.pdb"\r
                                TargetMachine="1"\r
                        />\r
                        <Tool\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswudll\wxprec_propgriddll.pch"\r
                                ObjectFile="vc_mswudll\propgrid\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw293u_propgrid_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw294u_propgrid_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw293u_propgrid_vc_custom;WXUSINGDLL;WXMAKINGDLL_PROPGRID"\r
+                               PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw294u_propgrid_vc_custom;WXUSINGDLL;WXMAKINGDLL_PROPGRID"\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
                        />\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\wxmsw293u_propgrid_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmsw294u_propgrid_vc_custom.dll"\r
                                LinkIncremental="1"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmsw29u_propgrid.lib"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293u_propgrid_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw294u_propgrid_vc_custom.pdb"\r
                                TargetMachine="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswunivuddll\wxprec_propgriddll.pch"\r
                                ObjectFile="vc_mswunivuddll\propgrid\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv293ud_propgrid_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv294ud_propgrid_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv293ud_propgrid_vc_custom;WXUSINGDLL;WXMAKINGDLL_PROPGRID"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv294ud_propgrid_vc_custom;WXUSINGDLL;WXMAKINGDLL_PROPGRID"\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
                        />\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\wxmswuniv293ud_propgrid_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmswuniv294ud_propgrid_vc_custom.dll"\r
                                LinkIncremental="2"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_propgrid.lib"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293ud_propgrid_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv294ud_propgrid_vc_custom.pdb"\r
                                TargetMachine="1"\r
                        />\r
                        <Tool\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswunivudll\wxprec_propgriddll.pch"\r
                                ObjectFile="vc_mswunivudll\propgrid\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv293u_propgrid_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv294u_propgrid_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv293u_propgrid_vc_custom;WXUSINGDLL;WXMAKINGDLL_PROPGRID"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv294u_propgrid_vc_custom;WXUSINGDLL;WXMAKINGDLL_PROPGRID"\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
                        />\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\wxmswuniv293u_propgrid_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmswuniv294u_propgrid_vc_custom.dll"\r
                                LinkIncremental="1"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_propgrid.lib"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293u_propgrid_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv294u_propgrid_vc_custom.pdb"\r
                                TargetMachine="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
index cfe32f2e7caa4cb6d96580bc1ce714862229ca6e..b9986546454f3e60a6564d723f6afd3c2cb180b5 100644 (file)
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswuddll\wxprec_qadll.pch"\r
                                ObjectFile="vc_mswuddll\qa\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw293ud_qa_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw294ud_qa_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw293ud_qa_vc_custom;WXUSINGDLL;WXMAKINGDLL_QA"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw294ud_qa_vc_custom;WXUSINGDLL;WXMAKINGDLL_QA"\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
                        />\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_core.lib ..\..\lib\vc_dll\wxbase29ud.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmsw293ud_qa_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmsw294ud_qa_vc_custom.dll"\r
                                LinkIncremental="2"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_qa.lib"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293ud_qa_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw294ud_qa_vc_custom.pdb"\r
                                TargetMachine="1"\r
                        />\r
                        <Tool\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswudll\wxprec_qadll.pch"\r
                                ObjectFile="vc_mswudll\qa\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw293u_qa_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw294u_qa_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw293u_qa_vc_custom;WXUSINGDLL;WXMAKINGDLL_QA"\r
+                               PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw294u_qa_vc_custom;WXUSINGDLL;WXMAKINGDLL_QA"\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
                        />\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_core.lib ..\..\lib\vc_dll\wxbase29u.lib ..\..\lib\vc_dll\wxbase29u_xml.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmsw293u_qa_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmsw294u_qa_vc_custom.dll"\r
                                LinkIncremental="1"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmsw29u_qa.lib"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293u_qa_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw294u_qa_vc_custom.pdb"\r
                                TargetMachine="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswunivuddll\wxprec_qadll.pch"\r
                                ObjectFile="vc_mswunivuddll\qa\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv293ud_qa_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv294ud_qa_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv293ud_qa_vc_custom;WXUSINGDLL;WXMAKINGDLL_QA"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv294ud_qa_vc_custom;WXUSINGDLL;WXMAKINGDLL_QA"\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
                        />\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_core.lib ..\..\lib\vc_dll\wxbase29ud.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmswuniv293ud_qa_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmswuniv294ud_qa_vc_custom.dll"\r
                                LinkIncremental="2"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_qa.lib"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293ud_qa_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv294ud_qa_vc_custom.pdb"\r
                                TargetMachine="1"\r
                        />\r
                        <Tool\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswunivudll\wxprec_qadll.pch"\r
                                ObjectFile="vc_mswunivudll\qa\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv293u_qa_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv294u_qa_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv293u_qa_vc_custom;WXUSINGDLL;WXMAKINGDLL_QA"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv294u_qa_vc_custom;WXUSINGDLL;WXMAKINGDLL_QA"\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
                        />\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_core.lib ..\..\lib\vc_dll\wxbase29u.lib ..\..\lib\vc_dll\wxbase29u_xml.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmswuniv293u_qa_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmswuniv294u_qa_vc_custom.dll"\r
                                LinkIncremental="1"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_qa.lib"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293u_qa_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv294u_qa_vc_custom.pdb"\r
                                TargetMachine="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
index 19ca87f114aeb11d84ff0d727a84fd0c46002a24..891703d4e9b1d7ddc4d24f85ec71fd4a48f569c3 100644 (file)
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswuddll\wxprec_ribbondll.pch"\r
                                ObjectFile="vc_mswuddll\ribbon\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw293ud_ribbon_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw294ud_ribbon_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw293ud_ribbon_vc_custom;WXUSINGDLL;WXMAKINGDLL_RIBBON"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw294ud_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
                        />\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\wxmsw293ud_ribbon_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmsw294ud_ribbon_vc_custom.dll"\r
                                LinkIncremental="2"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_ribbon.lib"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293ud_ribbon_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw294ud_ribbon_vc_custom.pdb"\r
                                TargetMachine="1"\r
                        />\r
                        <Tool\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswudll\wxprec_ribbondll.pch"\r
                                ObjectFile="vc_mswudll\ribbon\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw293u_ribbon_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw294u_ribbon_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw293u_ribbon_vc_custom;WXUSINGDLL;WXMAKINGDLL_RIBBON"\r
+                               PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw294u_ribbon_vc_custom;WXUSINGDLL;WXMAKINGDLL_RIBBON"\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
                        />\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\wxmsw293u_ribbon_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmsw294u_ribbon_vc_custom.dll"\r
                                LinkIncremental="1"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmsw29u_ribbon.lib"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293u_ribbon_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw294u_ribbon_vc_custom.pdb"\r
                                TargetMachine="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswunivuddll\wxprec_ribbondll.pch"\r
                                ObjectFile="vc_mswunivuddll\ribbon\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv293ud_ribbon_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv294ud_ribbon_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv293ud_ribbon_vc_custom;WXUSINGDLL;WXMAKINGDLL_RIBBON"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv294ud_ribbon_vc_custom;WXUSINGDLL;WXMAKINGDLL_RIBBON"\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
                        />\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\wxmswuniv293ud_ribbon_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmswuniv294ud_ribbon_vc_custom.dll"\r
                                LinkIncremental="2"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_ribbon.lib"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293ud_ribbon_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv294ud_ribbon_vc_custom.pdb"\r
                                TargetMachine="1"\r
                        />\r
                        <Tool\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswunivudll\wxprec_ribbondll.pch"\r
                                ObjectFile="vc_mswunivudll\ribbon\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv293u_ribbon_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv294u_ribbon_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv293u_ribbon_vc_custom;WXUSINGDLL;WXMAKINGDLL_RIBBON"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv294u_ribbon_vc_custom;WXUSINGDLL;WXMAKINGDLL_RIBBON"\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
                        />\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\wxmswuniv293u_ribbon_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmswuniv294u_ribbon_vc_custom.dll"\r
                                LinkIncremental="1"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_ribbon.lib"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293u_ribbon_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv294u_ribbon_vc_custom.pdb"\r
                                TargetMachine="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
index 525cd6635c4f040e737fefa8e9ab0db1dcbb62b4..7b883db43994c4535c0b0412e64875c2e2f243c4 100644 (file)
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswuddll\wxprec_richtextdll.pch"\r
                                ObjectFile="vc_mswuddll\richtext\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw293ud_richtext_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw294ud_richtext_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw293ud_richtext_vc_custom;WXUSINGDLL;WXMAKINGDLL_RICHTEXT"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw294ud_richtext_vc_custom;WXUSINGDLL;WXMAKINGDLL_RICHTEXT"\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
                        />\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_html.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmsw293ud_richtext_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmsw294ud_richtext_vc_custom.dll"\r
                                LinkIncremental="2"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_richtext.lib"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293ud_richtext_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw294ud_richtext_vc_custom.pdb"\r
                                TargetMachine="1"\r
                        />\r
                        <Tool\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswudll\wxprec_richtextdll.pch"\r
                                ObjectFile="vc_mswudll\richtext\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw293u_richtext_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw294u_richtext_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw293u_richtext_vc_custom;WXUSINGDLL;WXMAKINGDLL_RICHTEXT"\r
+                               PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw294u_richtext_vc_custom;WXUSINGDLL;WXMAKINGDLL_RICHTEXT"\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
                        />\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_html.lib ..\..\lib\vc_dll\wxbase29u_xml.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmsw293u_richtext_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmsw294u_richtext_vc_custom.dll"\r
                                LinkIncremental="1"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmsw29u_richtext.lib"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293u_richtext_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw294u_richtext_vc_custom.pdb"\r
                                TargetMachine="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswunivuddll\wxprec_richtextdll.pch"\r
                                ObjectFile="vc_mswunivuddll\richtext\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv293ud_richtext_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv294ud_richtext_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv293ud_richtext_vc_custom;WXUSINGDLL;WXMAKINGDLL_RICHTEXT"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv294ud_richtext_vc_custom;WXUSINGDLL;WXMAKINGDLL_RICHTEXT"\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
                        />\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_html.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmswuniv293ud_richtext_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmswuniv294ud_richtext_vc_custom.dll"\r
                                LinkIncremental="2"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_richtext.lib"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293ud_richtext_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv294ud_richtext_vc_custom.pdb"\r
                                TargetMachine="1"\r
                        />\r
                        <Tool\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswunivudll\wxprec_richtextdll.pch"\r
                                ObjectFile="vc_mswunivudll\richtext\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv293u_richtext_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv294u_richtext_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv293u_richtext_vc_custom;WXUSINGDLL;WXMAKINGDLL_RICHTEXT"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv294u_richtext_vc_custom;WXUSINGDLL;WXMAKINGDLL_RICHTEXT"\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
                        />\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_html.lib ..\..\lib\vc_dll\wxbase29u_xml.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmswuniv293u_richtext_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmswuniv294u_richtext_vc_custom.dll"\r
                                LinkIncremental="1"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_richtext.lib"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293u_richtext_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv294u_richtext_vc_custom.pdb"\r
                                TargetMachine="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
index a1d1b0c3c97beca526141909e5ac4f79d6a4e048..fdd72666f61cf90f28da100cd88d1e38595a1881 100644 (file)
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswuddll\wxprec_stcdll.pch"\r
                                ObjectFile="vc_mswuddll\stc\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw293ud_stc_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw294ud_stc_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw293ud_stc_vc_custom;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw294ud_stc_vc_custom;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
                        />\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\wxscintillad.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmsw293ud_stc_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmsw294ud_stc_vc_custom.dll"\r
                                LinkIncremental="2"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_stc.lib"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293ud_stc_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw294ud_stc_vc_custom.pdb"\r
                                TargetMachine="1"\r
                        />\r
                        <Tool\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswudll\wxprec_stcdll.pch"\r
                                ObjectFile="vc_mswudll\stc\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw293u_stc_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw294u_stc_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw293u_stc_vc_custom;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"\r
+                               PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw294u_stc_vc_custom;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
                        />\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\wxscintilla.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmsw293u_stc_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmsw294u_stc_vc_custom.dll"\r
                                LinkIncremental="1"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmsw29u_stc.lib"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293u_stc_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw294u_stc_vc_custom.pdb"\r
                                TargetMachine="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswunivuddll\wxprec_stcdll.pch"\r
                                ObjectFile="vc_mswunivuddll\stc\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv293ud_stc_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv294ud_stc_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv293ud_stc_vc_custom;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv294ud_stc_vc_custom;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
                        />\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\wxscintillad.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmswuniv293ud_stc_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmswuniv294ud_stc_vc_custom.dll"\r
                                LinkIncremental="2"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_stc.lib"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293ud_stc_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv294ud_stc_vc_custom.pdb"\r
                                TargetMachine="1"\r
                        />\r
                        <Tool\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswunivudll\wxprec_stcdll.pch"\r
                                ObjectFile="vc_mswunivudll\stc\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv293u_stc_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv294u_stc_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv293u_stc_vc_custom;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv294u_stc_vc_custom;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
                        />\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\wxscintilla.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmswuniv293u_stc_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmswuniv294u_stc_vc_custom.dll"\r
                                LinkIncremental="1"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_stc.lib"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293u_stc_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv294u_stc_vc_custom.pdb"\r
                                TargetMachine="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
index d86ac9911b80f96eaa3d6779069260ea5462a1c6..f792014725c084cb7a4e2b800a5615e9a83e82f1 100644 (file)
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswuddll\wxprec_webviewdll.pch"\r
                                ObjectFile="vc_mswuddll\webview\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw293ud_webview_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw294ud_webview_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw293ud_webview_vc_custom;WXUSINGDLL;WXMAKINGDLL_WEBVIEW"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw294ud_webview_vc_custom;WXUSINGDLL;WXMAKINGDLL_WEBVIEW"\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
                        />\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_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmsw293ud_webview_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmsw294ud_webview_vc_custom.dll"\r
                                LinkIncremental="2"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_webview.lib"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293ud_webview_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw294ud_webview_vc_custom.pdb"\r
                                TargetMachine="1"\r
                        />\r
                        <Tool\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswudll\wxprec_webviewdll.pch"\r
                                ObjectFile="vc_mswudll\webview\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw293u_webview_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw294u_webview_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw293u_webview_vc_custom;WXUSINGDLL;WXMAKINGDLL_WEBVIEW"\r
+                               PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw294u_webview_vc_custom;WXUSINGDLL;WXMAKINGDLL_WEBVIEW"\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
                        />\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_core.lib ..\..\lib\vc_dll\wxbase29u.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmsw293u_webview_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmsw294u_webview_vc_custom.dll"\r
                                LinkIncremental="1"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmsw29u_webview.lib"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293u_webview_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw294u_webview_vc_custom.pdb"\r
                                TargetMachine="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswunivuddll\wxprec_webviewdll.pch"\r
                                ObjectFile="vc_mswunivuddll\webview\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv293ud_webview_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv294ud_webview_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv293ud_webview_vc_custom;WXUSINGDLL;WXMAKINGDLL_WEBVIEW"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv294ud_webview_vc_custom;WXUSINGDLL;WXMAKINGDLL_WEBVIEW"\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
                        />\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_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmswuniv293ud_webview_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmswuniv294ud_webview_vc_custom.dll"\r
                                LinkIncremental="2"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_webview.lib"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293ud_webview_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv294ud_webview_vc_custom.pdb"\r
                                TargetMachine="1"\r
                        />\r
                        <Tool\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswunivudll\wxprec_webviewdll.pch"\r
                                ObjectFile="vc_mswunivudll\webview\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv293u_webview_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv294u_webview_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv293u_webview_vc_custom;WXUSINGDLL;WXMAKINGDLL_WEBVIEW"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv294u_webview_vc_custom;WXUSINGDLL;WXMAKINGDLL_WEBVIEW"\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
                        />\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_core.lib ..\..\lib\vc_dll\wxbase29u.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmswuniv293u_webview_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmswuniv294u_webview_vc_custom.dll"\r
                                LinkIncremental="1"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_webview.lib"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293u_webview_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv294u_webview_vc_custom.pdb"\r
                                TargetMachine="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
index 5bb5d647cededf37c793e741ec234a8c35355f04..98355e2c18288e44c0ebe3e8225b6940c54b8072 100644 (file)
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswuddll\wxprec_xmldll.pch"\r
                                ObjectFile="vc_mswuddll\xml\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase293ud_xml_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase294ud_xml_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase293ud_xml_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase294ud_xml_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML"\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
                        />\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
                                AdditionalDependencies="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\wxbase29ud.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxbase293ud_xml_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxbase294ud_xml_vc_custom.dll"\r
                                LinkIncremental="2"\r
                                ImportLibrary="..\..\lib\vc_dll\wxbase29ud_xml.lib"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxbase293ud_xml_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxbase294ud_xml_vc_custom.pdb"\r
                                TargetMachine="1"\r
                        />\r
                        <Tool\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswudll\wxprec_xmldll.pch"\r
                                ObjectFile="vc_mswudll\xml\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase293u_xml_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase294u_xml_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase293u_xml_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML"\r
+                               PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase294u_xml_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML"\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
                        />\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
                                AdditionalDependencies="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\wxbase29u.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxbase293u_xml_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxbase294u_xml_vc_custom.dll"\r
                                LinkIncremental="1"\r
                                ImportLibrary="..\..\lib\vc_dll\wxbase29u_xml.lib"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxbase293u_xml_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxbase294u_xml_vc_custom.pdb"\r
                                TargetMachine="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswunivuddll\wxprec_xmldll.pch"\r
                                ObjectFile="vc_mswunivuddll\xml\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase293ud_xml_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase294ud_xml_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase293ud_xml_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase294ud_xml_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML"\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
                        />\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
                                AdditionalDependencies="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\wxbase29ud.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxbase293ud_xml_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxbase294ud_xml_vc_custom.dll"\r
                                LinkIncremental="2"\r
                                ImportLibrary="..\..\lib\vc_dll\wxbase29ud_xml.lib"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxbase293ud_xml_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxbase294ud_xml_vc_custom.pdb"\r
                                TargetMachine="1"\r
                        />\r
                        <Tool\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswunivudll\wxprec_xmldll.pch"\r
                                ObjectFile="vc_mswunivudll\xml\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase293u_xml_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase294u_xml_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase293u_xml_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase294u_xml_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML"\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
                        />\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
                                AdditionalDependencies="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\wxbase29u.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxbase293u_xml_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxbase294u_xml_vc_custom.dll"\r
                                LinkIncremental="1"\r
                                ImportLibrary="..\..\lib\vc_dll\wxbase29u_xml.lib"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxbase293u_xml_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxbase294u_xml_vc_custom.pdb"\r
                                TargetMachine="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
index 3f2bd2847ac2b27e6382ee54713001e13de27486..d5deb5f06ce16ce5cd979046a602f05892f8991e 100644 (file)
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswuddll\wxprec_xrcdll.pch"\r
                                ObjectFile="vc_mswuddll\xrc\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw293ud_xrc_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw294ud_xrc_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw293ud_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw294ud_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC"\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
                        />\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_html.lib ..\..\lib\vc_dll\wxmsw29ud_adv.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib ..\..\lib\vc_dll\wxbase29ud.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmsw293ud_xrc_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmsw294ud_xrc_vc_custom.dll"\r
                                LinkIncremental="2"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_xrc.lib"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293ud_xrc_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw294ud_xrc_vc_custom.pdb"\r
                                TargetMachine="1"\r
                        />\r
                        <Tool\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswudll\wxprec_xrcdll.pch"\r
                                ObjectFile="vc_mswudll\xrc\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw293u_xrc_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw294u_xrc_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw293u_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC"\r
+                               PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw294u_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC"\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
                        />\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_html.lib ..\..\lib\vc_dll\wxmsw29u_adv.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u_xml.lib ..\..\lib\vc_dll\wxbase29u.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmsw293u_xrc_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmsw294u_xrc_vc_custom.dll"\r
                                LinkIncremental="1"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmsw29u_xrc.lib"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293u_xrc_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw294u_xrc_vc_custom.pdb"\r
                                TargetMachine="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswunivuddll\wxprec_xrcdll.pch"\r
                                ObjectFile="vc_mswunivuddll\xrc\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv293ud_xrc_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv294ud_xrc_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv293ud_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv294ud_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC"\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
                        />\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_html.lib ..\..\lib\vc_dll\wxmswuniv29ud_adv.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib ..\..\lib\vc_dll\wxbase29ud.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmswuniv293ud_xrc_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmswuniv294ud_xrc_vc_custom.dll"\r
                                LinkIncremental="2"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_xrc.lib"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293ud_xrc_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv294ud_xrc_vc_custom.pdb"\r
                                TargetMachine="1"\r
                        />\r
                        <Tool\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswunivudll\wxprec_xrcdll.pch"\r
                                ObjectFile="vc_mswunivudll\xrc\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv293u_xrc_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv294u_xrc_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv293u_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv294u_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC"\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
                        />\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_html.lib ..\..\lib\vc_dll\wxmswuniv29u_adv.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u_xml.lib ..\..\lib\vc_dll\wxbase29u.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmswuniv293u_xrc_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxmswuniv294u_xrc_vc_custom.dll"\r
                                LinkIncremental="1"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_xrc.lib"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293u_xrc_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv294u_xrc_vc_custom.pdb"\r
                                TargetMachine="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
index efb0ff9f5ffefe84d7588e4d79567a74eeb8e784..879c0643af51e258943c5fa9199bc9a41015c246 100644 (file)
@@ -47,18 +47,18 @@ RSC=rc.exe
 # PROP Output_Dir "..\..\lib\vc_dll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\webview"\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_webviewdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv293u_webview_vc_custom.pdb /opt:ref /opt:icf /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 "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_WEBVIEW" /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_webviewdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv293u_webview_vc_custom.pdb /opt:ref /opt:icf /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 "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_WEBVIEW" /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_webviewdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv294u_webview_vc_custom.pdb /opt:ref /opt:icf /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 "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_WEBVIEW" /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_webviewdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv294u_webview_vc_custom.pdb /opt:ref /opt:icf /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 "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_WEBVIEW" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_WEBVIEW" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_WEBVIEW" /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv293u_webview_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_WEBVIEW\r
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv293u_webview_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_WEBVIEW\r
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv294u_webview_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_WEBVIEW\r
+# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv294u_webview_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_WEBVIEW\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_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv293u_webview_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_webview.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv293u_webview_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_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv293u_webview_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_webview.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv293u_webview_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_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv294u_webview_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_webview.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv294u_webview_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_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv294u_webview_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_webview.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv294u_webview_vc_custom.pdb"\r
 \r
 !ELSEIF  "$(CFG)" == "webview - 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\webview"\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_webviewdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv293ud_webview_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_WEBVIEW" /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_webviewdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv293ud_webview_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_WEBVIEW" /c\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_webviewdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv294ud_webview_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_WEBVIEW" /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_webviewdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv294ud_webview_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_WEBVIEW" /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_WEBVIEW" /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_WEBVIEW" /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=wxmswuniv293ud_webview_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_WEBVIEW\r
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv293ud_webview_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_WEBVIEW\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=wxmswuniv294ud_webview_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_WEBVIEW\r
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv294ud_webview_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_WEBVIEW\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_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv293ud_webview_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_webview.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv293ud_webview_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_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv293ud_webview_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_webview.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv293ud_webview_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_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv294ud_webview_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_webview.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv294ud_webview_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_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv294ud_webview_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_webview.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv294ud_webview_vc_custom.pdb"\r
 \r
 !ELSEIF  "$(CFG)" == "webview - Win32 DLL Release"\r
 \r
@@ -97,18 +97,18 @@ LINK32=link.exe
 # PROP Output_Dir "..\..\lib\vc_dll"\r
 # PROP Intermediate_Dir "vc_mswudll\webview"\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_webviewdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw293u_webview_vc_custom.pdb /opt:ref /opt:icf /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 "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_WEBVIEW" /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_webviewdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw293u_webview_vc_custom.pdb /opt:ref /opt:icf /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 "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_WEBVIEW" /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_webviewdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw294u_webview_vc_custom.pdb /opt:ref /opt:icf /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 "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_WEBVIEW" /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_webviewdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw294u_webview_vc_custom.pdb /opt:ref /opt:icf /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 "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_WEBVIEW" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_WEBVIEW" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_WEBVIEW" /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw293u_webview_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_WEBVIEW\r
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw293u_webview_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_WEBVIEW\r
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw294u_webview_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_WEBVIEW\r
+# ADD RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw294u_webview_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_WEBVIEW\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_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw293u_webview_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_webview.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw293u_webview_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_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw293u_webview_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_webview.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw293u_webview_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_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw294u_webview_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_webview.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw294u_webview_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_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw294u_webview_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_webview.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw294u_webview_vc_custom.pdb"\r
 \r
 !ELSEIF  "$(CFG)" == "webview - Win32 DLL Debug"\r
 \r
@@ -122,18 +122,18 @@ LINK32=link.exe
 # PROP Output_Dir "..\..\lib\vc_dll"\r
 # PROP Intermediate_Dir "vc_mswuddll\webview"\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_webviewdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw293ud_webview_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_WEBVIEW" /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_webviewdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw293ud_webview_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_WEBVIEW" /c\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_webviewdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw294ud_webview_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_WEBVIEW" /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_webviewdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw294ud_webview_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_WEBVIEW" /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_WEBVIEW" /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_WEBVIEW" /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=wxmsw293ud_webview_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_WEBVIEW\r
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw293ud_webview_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_WEBVIEW\r
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw294ud_webview_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_WEBVIEW\r
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw294ud_webview_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_WEBVIEW\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_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw293ud_webview_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_webview.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw293ud_webview_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_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw293ud_webview_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_webview.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw293ud_webview_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_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw294ud_webview_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_webview.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw294ud_webview_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_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw294ud_webview_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_webview.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw294ud_webview_vc_custom.pdb"\r
 \r
 !ELSEIF  "$(CFG)" == "webview - Win32 Universal Release"\r
 \r
index 0dac4b922fc6480aa4e141ace40333d9bc03f805..0616d987013ed3ed50c9b9d38e22432599f36b01 100644 (file)
@@ -47,18 +47,18 @@ RSC=rc.exe
 # PROP Output_Dir "..\..\lib\vc_dll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\xml"\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_xmldll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase293u_xml_vc_custom.pdb /opt:ref /opt:icf /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 "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /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_xmldll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase293u_xml_vc_custom.pdb /opt:ref /opt:icf /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 "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /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_xmldll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase294u_xml_vc_custom.pdb /opt:ref /opt:icf /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 "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /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_xmldll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase294u_xml_vc_custom.pdb /opt:ref /opt:icf /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 "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase293u_xml_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_XML\r
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase293u_xml_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_XML\r
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase294u_xml_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_XML\r
+# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase294u_xml_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_XML\r
 BSC32=bscmake.exe\r
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase293u_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29u_xml.lib" /debug /pdb:"..\..\lib\vc_dll\wxbase293u_xml_vc_custom.pdb"\r
-# ADD LINK32 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\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase293u_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29u_xml.lib" /debug /pdb:"..\..\lib\vc_dll\wxbase293u_xml_vc_custom.pdb"\r
+# ADD BASE LINK32 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\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase294u_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29u_xml.lib" /debug /pdb:"..\..\lib\vc_dll\wxbase294u_xml_vc_custom.pdb"\r
+# ADD LINK32 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\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase294u_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29u_xml.lib" /debug /pdb:"..\..\lib\vc_dll\wxbase294u_xml_vc_custom.pdb"\r
 \r
 !ELSEIF  "$(CFG)" == "xml - 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\xml"\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_xmldll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase293ud_xml_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 wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /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_xmldll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase293ud_xml_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 wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c\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_xmldll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase294ud_xml_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 wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /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_xmldll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase294ud_xml_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 wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /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=wxbase293ud_xml_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_XML\r
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase293ud_xml_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_XML\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=wxbase294ud_xml_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_XML\r
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase294ud_xml_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_XML\r
 BSC32=bscmake.exe\r
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase293ud_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29ud_xml.lib" /debug /pdb:"..\..\lib\vc_dll\wxbase293ud_xml_vc_custom.pdb"\r
-# ADD LINK32 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\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase293ud_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29ud_xml.lib" /debug /pdb:"..\..\lib\vc_dll\wxbase293ud_xml_vc_custom.pdb"\r
+# ADD BASE LINK32 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\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase294ud_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29ud_xml.lib" /debug /pdb:"..\..\lib\vc_dll\wxbase294ud_xml_vc_custom.pdb"\r
+# ADD LINK32 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\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase294ud_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29ud_xml.lib" /debug /pdb:"..\..\lib\vc_dll\wxbase294ud_xml_vc_custom.pdb"\r
 \r
 !ELSEIF  "$(CFG)" == "xml - Win32 DLL Release"\r
 \r
@@ -97,18 +97,18 @@ LINK32=link.exe
 # PROP Output_Dir "..\..\lib\vc_dll"\r
 # PROP Intermediate_Dir "vc_mswudll\xml"\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_xmldll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase293u_xml_vc_custom.pdb /opt:ref /opt:icf /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 "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /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_xmldll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase293u_xml_vc_custom.pdb /opt:ref /opt:icf /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 "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /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_xmldll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase294u_xml_vc_custom.pdb /opt:ref /opt:icf /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 "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /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_xmldll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase294u_xml_vc_custom.pdb /opt:ref /opt:icf /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 "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase293u_xml_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_XML\r
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase293u_xml_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_XML\r
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase294u_xml_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_XML\r
+# ADD RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase294u_xml_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_XML\r
 BSC32=bscmake.exe\r
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase293u_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29u_xml.lib" /debug /pdb:"..\..\lib\vc_dll\wxbase293u_xml_vc_custom.pdb"\r
-# ADD LINK32 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\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase293u_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29u_xml.lib" /debug /pdb:"..\..\lib\vc_dll\wxbase293u_xml_vc_custom.pdb"\r
+# ADD BASE LINK32 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\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase294u_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29u_xml.lib" /debug /pdb:"..\..\lib\vc_dll\wxbase294u_xml_vc_custom.pdb"\r
+# ADD LINK32 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\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase294u_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29u_xml.lib" /debug /pdb:"..\..\lib\vc_dll\wxbase294u_xml_vc_custom.pdb"\r
 \r
 !ELSEIF  "$(CFG)" == "xml - Win32 DLL Debug"\r
 \r
@@ -122,18 +122,18 @@ LINK32=link.exe
 # PROP Output_Dir "..\..\lib\vc_dll"\r
 # PROP Intermediate_Dir "vc_mswuddll\xml"\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_xmldll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase293ud_xml_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 wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /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_xmldll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase293ud_xml_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 wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c\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_xmldll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase294ud_xml_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 wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /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_xmldll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase294ud_xml_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 wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /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=wxbase293ud_xml_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_XML\r
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase293ud_xml_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_XML\r
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase294ud_xml_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_XML\r
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase294ud_xml_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_XML\r
 BSC32=bscmake.exe\r
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase293ud_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29ud_xml.lib" /debug /pdb:"..\..\lib\vc_dll\wxbase293ud_xml_vc_custom.pdb"\r
-# ADD LINK32 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\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase293ud_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29ud_xml.lib" /debug /pdb:"..\..\lib\vc_dll\wxbase293ud_xml_vc_custom.pdb"\r
+# ADD BASE LINK32 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\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase294ud_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29ud_xml.lib" /debug /pdb:"..\..\lib\vc_dll\wxbase294ud_xml_vc_custom.pdb"\r
+# ADD LINK32 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\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase294ud_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29ud_xml.lib" /debug /pdb:"..\..\lib\vc_dll\wxbase294ud_xml_vc_custom.pdb"\r
 \r
 !ELSEIF  "$(CFG)" == "xml - Win32 Universal Release"\r
 \r
index a0c0fcbb00377a744c958a37fecd50bf3807836a..18bf7b2b2323b11dd22178ac3020204ba2b8b919 100644 (file)
@@ -47,18 +47,18 @@ RSC=rc.exe
 # PROP Output_Dir "..\..\lib\vc_dll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\xrc"\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_xrcdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv293u_xrc_vc_custom.pdb /opt:ref /opt:icf /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 "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /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_xrcdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv293u_xrc_vc_custom.pdb /opt:ref /opt:icf /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 "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /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_xrcdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv294u_xrc_vc_custom.pdb /opt:ref /opt:icf /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 "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /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_xrcdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv294u_xrc_vc_custom.pdb /opt:ref /opt:icf /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 "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv293u_xrc_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_XRC\r
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv293u_xrc_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_XRC\r
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv294u_xrc_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_XRC\r
+# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv294u_xrc_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_XRC\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_html.lib ..\..\lib\vc_dll\wxmswuniv29u_adv.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u_xml.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv293u_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_xrc.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv293u_xrc_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_html.lib ..\..\lib\vc_dll\wxmswuniv29u_adv.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u_xml.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv293u_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_xrc.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv293u_xrc_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_html.lib ..\..\lib\vc_dll\wxmswuniv29u_adv.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u_xml.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv294u_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_xrc.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv294u_xrc_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_html.lib ..\..\lib\vc_dll\wxmswuniv29u_adv.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u_xml.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv294u_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_xrc.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv294u_xrc_vc_custom.pdb"\r
 \r
 !ELSEIF  "$(CFG)" == "xrc - 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\xrc"\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_xrcdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv293ud_xrc_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_XRC" /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_xrcdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv293ud_xrc_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_XRC" /c\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_xrcdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv294ud_xrc_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_XRC" /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_xrcdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv294ud_xrc_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_XRC" /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_XRC" /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_XRC" /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=wxmswuniv293ud_xrc_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_XRC\r
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv293ud_xrc_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_XRC\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=wxmswuniv294ud_xrc_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_XRC\r
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv294ud_xrc_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_XRC\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_html.lib ..\..\lib\vc_dll\wxmswuniv29ud_adv.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv293ud_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_xrc.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv293ud_xrc_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_html.lib ..\..\lib\vc_dll\wxmswuniv29ud_adv.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv293ud_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_xrc.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv293ud_xrc_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_html.lib ..\..\lib\vc_dll\wxmswuniv29ud_adv.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv294ud_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_xrc.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv294ud_xrc_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_html.lib ..\..\lib\vc_dll\wxmswuniv29ud_adv.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv294ud_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_xrc.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv294ud_xrc_vc_custom.pdb"\r
 \r
 !ELSEIF  "$(CFG)" == "xrc - Win32 DLL Release"\r
 \r
@@ -97,18 +97,18 @@ LINK32=link.exe
 # PROP Output_Dir "..\..\lib\vc_dll"\r
 # PROP Intermediate_Dir "vc_mswudll\xrc"\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_xrcdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw293u_xrc_vc_custom.pdb /opt:ref /opt:icf /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 "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /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_xrcdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw293u_xrc_vc_custom.pdb /opt:ref /opt:icf /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 "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /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_xrcdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw294u_xrc_vc_custom.pdb /opt:ref /opt:icf /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 "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /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_xrcdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw294u_xrc_vc_custom.pdb /opt:ref /opt:icf /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 "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw293u_xrc_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_XRC\r
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw293u_xrc_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_XRC\r
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw294u_xrc_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_XRC\r
+# ADD RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw294u_xrc_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_XRC\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_html.lib ..\..\lib\vc_dll\wxmsw29u_adv.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u_xml.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw293u_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_xrc.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw293u_xrc_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_html.lib ..\..\lib\vc_dll\wxmsw29u_adv.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u_xml.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw293u_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_xrc.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw293u_xrc_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_html.lib ..\..\lib\vc_dll\wxmsw29u_adv.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u_xml.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw294u_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_xrc.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw294u_xrc_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_html.lib ..\..\lib\vc_dll\wxmsw29u_adv.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u_xml.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw294u_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_xrc.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw294u_xrc_vc_custom.pdb"\r
 \r
 !ELSEIF  "$(CFG)" == "xrc - Win32 DLL Debug"\r
 \r
@@ -122,18 +122,18 @@ LINK32=link.exe
 # PROP Output_Dir "..\..\lib\vc_dll"\r
 # PROP Intermediate_Dir "vc_mswuddll\xrc"\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_xrcdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw293ud_xrc_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_XRC" /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_xrcdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw293ud_xrc_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_XRC" /c\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_xrcdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw294ud_xrc_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_XRC" /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_xrcdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw294ud_xrc_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_XRC" /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_XRC" /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_XRC" /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=wxmsw293ud_xrc_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_XRC\r
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw293ud_xrc_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_XRC\r
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw294ud_xrc_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_XRC\r
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw294ud_xrc_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_XRC\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_html.lib ..\..\lib\vc_dll\wxmsw29ud_adv.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw293ud_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_xrc.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw293ud_xrc_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_html.lib ..\..\lib\vc_dll\wxmsw29ud_adv.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw293ud_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_xrc.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw293ud_xrc_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_html.lib ..\..\lib\vc_dll\wxmsw29ud_adv.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw294ud_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_xrc.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw294ud_xrc_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_html.lib ..\..\lib\vc_dll\wxmsw29ud_adv.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw294ud_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_xrc.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw294ud_xrc_vc_custom.pdb"\r
 \r
 !ELSEIF  "$(CFG)" == "xrc - Win32 Universal Release"\r
 \r
index 9c65152d2ecde5d9b5e3f4be7e112568838e8bcc..91c764b9df8359df34d814968032b75b1ad48936 100644 (file)
@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.9
-WX_VERSION = $(WX_RELEASE).3
+WX_VERSION = $(WX_RELEASE).4
 LIBDIRNAME = $(wx_top_builddir)/lib
 BOMBS_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
index 9a29d211a3735700cf94b8f658d76a6f14194ced..47409c5c98d6c70c425e74caa476913eeaf7e46a 100644 (file)
@@ -43,7 +43,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.9
-WX_VERSION = $(WX_RELEASE).3
+WX_VERSION = $(WX_RELEASE).4
 LIBDIRNAME = $(wx_top_builddir)/lib
 FORTY_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
index 95154d6fee92b604111f885433c9f9b66d79d2fd..c5db0888b4fe345baff830131b15ae1b7d10a59e 100644 (file)
@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.9
-WX_VERSION = $(WX_RELEASE).3
+WX_VERSION = $(WX_RELEASE).4
 LIBDIRNAME = $(wx_top_builddir)/lib
 FRACTAL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
index 2528b57bd8d9cd0e470f80774691ebca61d52355..c8d8ed6a499eab1b2617b06fc9d2297236147568 100644 (file)
@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.9
-WX_VERSION = $(WX_RELEASE).3
+WX_VERSION = $(WX_RELEASE).4
 LIBDIRNAME = $(wx_top_builddir)/lib
 LIFE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
index aa85cffc32434ef8c008476e86e36e925592b354..3d313ff5c85aac784d13f9cec742b0c45d33784c 100644 (file)
@@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.9
-WX_VERSION = $(WX_RELEASE).3
+WX_VERSION = $(WX_RELEASE).4
 LIBDIRNAME = $(wx_top_builddir)/lib
 WXPOEM_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
index 27ddac52a2009811dc478a68adcc3179df52ee4c..5bb28c4357c71cb02c89da01c06c203c866dadfb 100644 (file)
@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.9
-WX_VERSION = $(WX_RELEASE).3
+WX_VERSION = $(WX_RELEASE).4
 LIBDIRNAME = $(wx_top_builddir)/lib
 ACCESSTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
index f3e5f0ae195910fb97699ae700c1aac1d823aca5..34b29eed4da6de7fa42d25f8e13622103526d891 100644 (file)
@@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.9
-WX_VERSION = $(WX_RELEASE).3
+WX_VERSION = $(WX_RELEASE).4
 LIBDIRNAME = $(wx_top_builddir)/lib
 ANITEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
index beb9382f339003eddbf4b1964b7291c480e36e27..a9a31cdc5fdae9d23a08deee16fb94455148556a 100644 (file)
@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.9
-WX_VERSION = $(WX_RELEASE).3
+WX_VERSION = $(WX_RELEASE).4
 LIBDIRNAME = $(wx_top_builddir)/lib
 ARTTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
index b06a9b9aece1cca214e7ca6e5a0a85996d30e959..c08ec5e6319c0e15ee41ba2ad2c94c5973535911 100644 (file)
@@ -43,7 +43,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.9
-WX_VERSION = $(WX_RELEASE).3
+WX_VERSION = $(WX_RELEASE).4
 LIBDIRNAME = $(wx_top_builddir)/lib
 AUIDEMO_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
index 9662fff541f1e5b0dc5094396e657ad2cd537bea..dbff4e97b155154dface83fb6fb9e416412f755f 100644 (file)
@@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.9
-WX_VERSION = $(WX_RELEASE).3
+WX_VERSION = $(WX_RELEASE).4
 LIBDIRNAME = $(wx_top_builddir)/lib
 CALENDAR_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
index 76c7433ce6cf978e84320f56fe2c97797c6c5c6c..fa8293d750ea446a498a03af7a48a5e69d59f532 100644 (file)
@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.9
-WX_VERSION = $(WX_RELEASE).3
+WX_VERSION = $(WX_RELEASE).4
 LIBDIRNAME = $(wx_top_builddir)/lib
 CARET_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
index 1bdfe9623ab76481aac77bbe0cd5be757271df72..faf7ea29d8a12b56fc8219ebb3df1fc1f6a958ec 100644 (file)
@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.9
-WX_VERSION = $(WX_RELEASE).3
+WX_VERSION = $(WX_RELEASE).4
 LIBDIRNAME = $(wx_top_builddir)/lib
 CLIPBOARD_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
index 3ebc65dc14c1c77028d3d55e13db56e5ca23491e..c9eaef213496959dc95a01a2dfc9da0a24ad733a 100644 (file)
@@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.9
-WX_VERSION = $(WX_RELEASE).3
+WX_VERSION = $(WX_RELEASE).4
 LIBDIRNAME = $(wx_top_builddir)/lib
 COLLPANE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
index 58f1d82140fc5937ac97796226bcc3fc293df013..46a13bf88217b05e3d814f191a88f130d770a08d 100644 (file)
@@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.9
-WX_VERSION = $(WX_RELEASE).3
+WX_VERSION = $(WX_RELEASE).4
 LIBDIRNAME = $(wx_top_builddir)/lib
 COMBO_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
index f829d1063b8e76466e73f532c2e025026f4308b1..2bc83d14ff6ed8d0f89f583184876f410ea16156 100644 (file)
@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.9
-WX_VERSION = $(WX_RELEASE).3
+WX_VERSION = $(WX_RELEASE).4
 LIBDIRNAME = $(wx_top_builddir)/lib
 CONFTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
index f5b8e398763aecea8d9ff803296f2d23ff5962b9..b9ed4301e5ae53cfc31bf06a7bd5f2ef51859aaf 100644 (file)
@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.9
-WX_VERSION = $(WX_RELEASE).3
+WX_VERSION = $(WX_RELEASE).4
 LIBDIRNAME = $(wx_top_builddir)/lib
 CONTROLS_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
index a3d9b2240a3a002ee422b1024f577496c9d5d02f..172b7a216d6741c89d52233458b129020f29bac4 100644 (file)
@@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.9
-WX_VERSION = $(WX_RELEASE).3
+WX_VERSION = $(WX_RELEASE).4
 LIBDIRNAME = $(wx_top_builddir)/lib
 DATAVIEW_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
index 08744e0bd43c503a2fefd9ad2c12a2299dbd0baf..a915f7d2f1f4883b68f4a51f53d7baadeaaf49fa 100644 (file)
@@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.9
-WX_VERSION = $(WX_RELEASE).3
+WX_VERSION = $(WX_RELEASE).4
 LIBDIRNAME = $(wx_top_builddir)/lib
 DEBUGRPT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
index 83bc2527f20fc0fcabb13d008d408a7b58bcd429..64113431cf8bd986baa7ba88ffba72ec149132a3 100644 (file)
@@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.9
-WX_VERSION = $(WX_RELEASE).3
+WX_VERSION = $(WX_RELEASE).4
 LIBDIRNAME = $(wx_top_builddir)/lib
 DIALOGS_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
index a2d651b985d689957962bc51d739d53c03f9049d..a1ac86413c75524de0c9e4b91356f0e6fa0e9442 100644 (file)
@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.9
-WX_VERSION = $(WX_RELEASE).3
+WX_VERSION = $(WX_RELEASE).4
 LIBDIRNAME = $(wx_top_builddir)/lib
 NETTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
index 8e69145ec6595a554ff31f54f542b911c72fad90..8ba1803993ac87d78bd52765afce94a70a6b181c 100644 (file)
@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.9
-WX_VERSION = $(WX_RELEASE).3
+WX_VERSION = $(WX_RELEASE).4
 LIBDIRNAME = $(wx_top_builddir)/lib
 DISPLAY_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
index 30fa08870fe551ac4d7b00411ff706db710f43f1..6845c721ba172b2965adb6a9409f1bbd0bcf50e3 100644 (file)
@@ -46,7 +46,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.9
-WX_VERSION = $(WX_RELEASE).3
+WX_VERSION = $(WX_RELEASE).4
 LIBDIRNAME = $(wx_top_builddir)/lib
 MY_DLL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
index 7ac8a7704c2819f6f2b3bdc17286663373068bde..5f56167400d6534389f3edeed22e37363cb43f5e 100644 (file)
@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.9
-WX_VERSION = $(WX_RELEASE).3
+WX_VERSION = $(WX_RELEASE).4
 LIBDIRNAME = $(wx_top_builddir)/lib
 DND_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
index d16630abf58b7eebea770f153d82b1206d759259..c4a423f471068329cfd88162cd5241e943e69723 100644 (file)
@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.9
-WX_VERSION = $(WX_RELEASE).3
+WX_VERSION = $(WX_RELEASE).4
 LIBDIRNAME = $(wx_top_builddir)/lib
 DOCVIEW_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
index 285aa553e4f4e6bdf458db7d3585cfd0f26db6e0..0831705d3ad0b4d01483c3e0aba2687950a110a2 100644 (file)
@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.9
-WX_VERSION = $(WX_RELEASE).3
+WX_VERSION = $(WX_RELEASE).4
 LIBDIRNAME = $(wx_top_builddir)/lib
 DRAGIMAG_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
index 15b0fa258d0b142dec1a89546cca276c6ee557ee..034fb809f4e34d22f5839f5a8675b1aa4ee9e26a 100644 (file)
@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.9
-WX_VERSION = $(WX_RELEASE).3
+WX_VERSION = $(WX_RELEASE).4
 LIBDIRNAME = $(wx_top_builddir)/lib
 DRAWING_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
index 34e564466aad42472b781b645437855e296fb5fa..2cc3dd5c8f9ceead6678375429a0bebdc21a5b63 100644 (file)
@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.9
-WX_VERSION = $(WX_RELEASE).3
+WX_VERSION = $(WX_RELEASE).4
 LIBDIRNAME = $(wx_top_builddir)/lib
 ERASE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
index 8e0c0de7ebf8ab3b4426bb9db98e8afcd878eae6..2de64c11099ce76c36c5cc36f5b6090e90595993 100644 (file)
@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.9
-WX_VERSION = $(WX_RELEASE).3
+WX_VERSION = $(WX_RELEASE).4
 LIBDIRNAME = $(wx_top_builddir)/lib
 EVENT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
index fdc57d9692b8ac970239563b80de3609dca6667e..98e0a8dc39bfad6b49b0e73484d97f0e70d1c50a 100644 (file)
@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.9
-WX_VERSION = $(WX_RELEASE).3
+WX_VERSION = $(WX_RELEASE).4
 LIBDIRNAME = $(wx_top_builddir)/lib
 EXCEPT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
index 67e414752259b7c362c8882d6c270b9e82d7313d..a2a24d9f7e1a7b516808e55b873976e258f7edd1 100644 (file)
@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.9
-WX_VERSION = $(WX_RELEASE).3
+WX_VERSION = $(WX_RELEASE).4
 LIBDIRNAME = $(wx_top_builddir)/lib
 EXEC_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
index 1cab63ac8d7f2d69c80257717032f34133d515d2..5abae9524b8f6a1dc733af7dad3f42ed3affdf21 100644 (file)
@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.9
-WX_VERSION = $(WX_RELEASE).3
+WX_VERSION = $(WX_RELEASE).4
 LIBDIRNAME = $(wx_top_builddir)/lib
 FONT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
index 03b1ebdf7ab46e9cf61dbfa10ac749fcd854310c..d868810b2dcd15822d81601d899e3f19fd3f9c9e 100644 (file)
@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.9
-WX_VERSION = $(WX_RELEASE).3
+WX_VERSION = $(WX_RELEASE).4
 LIBDIRNAME = $(wx_top_builddir)/lib
 FSWATCHER_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
index f2845d62ccf7c08763fda1dc07b8492ef6ac81cc..31c3843ac36eb6b3c950d7835086e1cec3adeee0 100644 (file)
@@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.9
-WX_VERSION = $(WX_RELEASE).3
+WX_VERSION = $(WX_RELEASE).4
 LIBDIRNAME = $(wx_top_builddir)/lib
 GRID_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
index 1405e7a4aa556f541fa09537cbe62ad71473b6a5..ff6617152e1d2972f2aaabfc0e3515130b89edc4 100644 (file)
@@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.9
-WX_VERSION = $(WX_RELEASE).3
+WX_VERSION = $(WX_RELEASE).4
 LIBDIRNAME = $(wx_top_builddir)/lib
 HELP_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
index 534fbc8d43aec5ae1c992a502035f1f2d4c58aca..defb0ef3322d34ce175dfc47adc46b492c4781ac 100644 (file)
@@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.9
-WX_VERSION = $(WX_RELEASE).3
+WX_VERSION = $(WX_RELEASE).4
 LIBDIRNAME = $(wx_top_builddir)/lib
 HTLBOX_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
index 2898e3530a95604ad7dc7cb2ae7d8c78b7f079fe..eed1f3f86b2c7fcf4e70c38cfb963d77d6e50b48 100644 (file)
@@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.9
-WX_VERSION = $(WX_RELEASE).3
+WX_VERSION = $(WX_RELEASE).4
 LIBDIRNAME = $(wx_top_builddir)/lib
 ABOUT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
index 445deb2a5d3edd1727e7ed095d3435b735b2ecb0..62527ac2b030d7a91889105aa5ae3e3c73295ce3 100644 (file)
@@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.9
-WX_VERSION = $(WX_RELEASE).3
+WX_VERSION = $(WX_RELEASE).4
 LIBDIRNAME = $(wx_top_builddir)/lib
 HTMLHELP_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
index f9eb2976c7272203f9b6230ddfad9926f9dfbf9a..a9ef0b5cf1f74626e10c2027cba5fd0a0cd0e4e3 100644 (file)
@@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.9
-WX_VERSION = $(WX_RELEASE).3
+WX_VERSION = $(WX_RELEASE).4
 LIBDIRNAME = $(wx_top_builddir)/lib
 HELPVIEW_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
index 7d73bb06b2260f5178257addef30dd9c43561c65..fda8846ea3e36d60ca3d1d383c38f0b92f606083 100644 (file)
@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.9
-WX_VERSION = $(WX_RELEASE).3
+WX_VERSION = $(WX_RELEASE).4
 LIBDIRNAME = $(wx_top_builddir)/lib
 HTMLCTRL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
index 05413e8393e7d85e846bad4e0136a318be135f45..b1b17730224f0686e637a40afa76085d7abbcb5a 100644 (file)
@@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.9
-WX_VERSION = $(WX_RELEASE).3
+WX_VERSION = $(WX_RELEASE).4
 LIBDIRNAME = $(wx_top_builddir)/lib
 HTMLPRINTING_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
index 155623a82a37b4fe092fb5038194c6e8eef06b2c..e42cb37296d485a1879b0f215305a8524864b979 100644 (file)
@@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.9
-WX_VERSION = $(WX_RELEASE).3
+WX_VERSION = $(WX_RELEASE).4
 LIBDIRNAME = $(wx_top_builddir)/lib
 TEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
index dd77f238caf27936d52cc2a560652aaacaf373a9..3f5b8f2eab26abf4560071c160c3476bde382db7 100644 (file)
@@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.9
-WX_VERSION = $(WX_RELEASE).3
+WX_VERSION = $(WX_RELEASE).4
 LIBDIRNAME = $(wx_top_builddir)/lib
 VIRTUAL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
index 174d2176507a975d597658a398d9283129532bf4..d6f81a94b47a55bc9db7c438338da51f9599e2b7 100644 (file)
@@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.9
-WX_VERSION = $(WX_RELEASE).3
+WX_VERSION = $(WX_RELEASE).4
 LIBDIRNAME = $(wx_top_builddir)/lib
 WIDGET_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
index a7c75bbbc33be58da30110992fbd6123d2d1eed2..667cbea993e8bee9d9f1b45fce089266f1afb649 100644 (file)
@@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.9
-WX_VERSION = $(WX_RELEASE).3
+WX_VERSION = $(WX_RELEASE).4
 LIBDIRNAME = $(wx_top_builddir)/lib
 ZIP_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
index c32e5bdb4258145d300a0fd81220f28e19e0e909..eb94d0bca8cca065a0898aafd98123c5753b743c 100644 (file)
@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.9
-WX_VERSION = $(WX_RELEASE).3
+WX_VERSION = $(WX_RELEASE).4
 LIBDIRNAME = $(wx_top_builddir)/lib
 IMAGE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
index e537feb8fbdbec00e045d9e2e202e89134c600bd..73fdbe29ff2182e274e9b13eed3e7753428755e1 100644 (file)
@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.9
-WX_VERSION = $(WX_RELEASE).3
+WX_VERSION = $(WX_RELEASE).4
 LIBDIRNAME = $(wx_top_builddir)/lib
 INTERNAT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
index f08aa0800d8904e46a4da2c0247f8da9595b8de0..bda93670cac113ef029dfa26f2b23ba7c5c3ad22 100644 (file)
@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.9
-WX_VERSION = $(WX_RELEASE).3
+WX_VERSION = $(WX_RELEASE).4
 LIBDIRNAME = $(wx_top_builddir)/lib
 IPCCLIENT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
index 1b419c21a48ca17f652c74156bf44f8d5edfeadf..10c9a7f30acdaac289df4c76219903362b4d1948 100644 (file)
@@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.9
-WX_VERSION = $(WX_RELEASE).3
+WX_VERSION = $(WX_RELEASE).4
 LIBDIRNAME = $(wx_top_builddir)/lib
 JOYTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
index 4c7a7daa9d957037c5d2ec372902b047b67a725f..7178ded4b157354174115d957bd83bf864f4269f 100644 (file)
@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.9
-WX_VERSION = $(WX_RELEASE).3
+WX_VERSION = $(WX_RELEASE).4
 LIBDIRNAME = $(wx_top_builddir)/lib
 KEYBOARD_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
index 73bc8332624a822a8cfcabfe4d8e2f8e1e77e584..f7956a0f8aa76336e623fcf605b3505609ae1e55 100644 (file)
@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.9
-WX_VERSION = $(WX_RELEASE).3
+WX_VERSION = $(WX_RELEASE).4
 LIBDIRNAME = $(wx_top_builddir)/lib
 LAYOUT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
index dc984f681122c57fde757333383b8c468d65b41a..5e4d97e5504e6c78266f040773ae3e3f72968b04 100644 (file)
@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.9
-WX_VERSION = $(WX_RELEASE).3
+WX_VERSION = $(WX_RELEASE).4
 LIBDIRNAME = $(wx_top_builddir)/lib
 LISTCTRL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
index 4f031e6f38478f4d84a41c1a293df23c9643014a..ff4da9adfca6e166b06c083200cf771e3cfc333f 100644 (file)
@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.9
-WX_VERSION = $(WX_RELEASE).3
+WX_VERSION = $(WX_RELEASE).4
 LIBDIRNAME = $(wx_top_builddir)/lib
 MDI_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
index 38f68b82c9c5ce38d428e6b53053a3c0d97cc47f..39f9e7edf0526f52f24c4fbac28aea42cdde2892 100644 (file)
@@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.9
-WX_VERSION = $(WX_RELEASE).3
+WX_VERSION = $(WX_RELEASE).4
 LIBDIRNAME = $(wx_top_builddir)/lib
 MEDIAPLAYER_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
index 8fbc44805fa704602638153c6e1ae77f5e062771..67f506e9a04034c9a942386beaf1a672796a9df2 100644 (file)
@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.9
-WX_VERSION = $(WX_RELEASE).3
+WX_VERSION = $(WX_RELEASE).4
 LIBDIRNAME = $(wx_top_builddir)/lib
 MEMCHECK_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
index 54ec0b2f417556d0c8c3e6fb12c10152987d7bb6..9527d902d6a500748a8d3959f564cb9b155116eb 100644 (file)
@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.9
-WX_VERSION = $(WX_RELEASE).3
+WX_VERSION = $(WX_RELEASE).4
 LIBDIRNAME = $(wx_top_builddir)/lib
 MENU_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
index 992d60ba6feca7750f1c36de47c1eacd5f17a411..12feeeb8b2a05ee562f1bbacd71f685a72476de2 100644 (file)
@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.9
-WX_VERSION = $(WX_RELEASE).3
+WX_VERSION = $(WX_RELEASE).4
 LIBDIRNAME = $(wx_top_builddir)/lib
 MINIMAL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
index 82ff3c97e9bbff855a0423b194c517a50503a521..cfc4c6cdfa5dc168ff2245b4f61daf68e4ec9258 100644 (file)
@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.9
-WX_VERSION = $(WX_RELEASE).3
+WX_VERSION = $(WX_RELEASE).4
 LIBDIRNAME = $(wx_top_builddir)/lib
 NATIVDLG_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
index 7823bb81d49c0ac0bd47480b726528899b02fda5..862766f5d3b631f390cc92e5b5c000dfa25f65a2 100644 (file)
@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.9
-WX_VERSION = $(WX_RELEASE).3
+WX_VERSION = $(WX_RELEASE).4
 LIBDIRNAME = $(wx_top_builddir)/lib
 NOTEBOOK_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
index 30ce71ff065cd90e36441fd9b871801359bb3ec2..9c55b0d890121f1f5a641f9d27760f9a30ff1e28 100644 (file)
@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.9
-WX_VERSION = $(WX_RELEASE).3
+WX_VERSION = $(WX_RELEASE).4
 LIBDIRNAME = $(wx_top_builddir)/lib
 OLEAUTO_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
index 90afee3aef1fc23ec452fb8394be8eda61103070..fd20addd151ac5bbb87f117cbe07c1a8d8c2b298 100644 (file)
@@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.9
-WX_VERSION = $(WX_RELEASE).3
+WX_VERSION = $(WX_RELEASE).4
 LIBDIRNAME = $(wx_top_builddir)/lib
 CUBE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
index 86d39aba2ac5986eff93392eae6ee0dc9a2a5c00..173d2bb9ec67154446de60b87ae8dcf261401578 100644 (file)
@@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.9
-WX_VERSION = $(WX_RELEASE).3
+WX_VERSION = $(WX_RELEASE).4
 LIBDIRNAME = $(wx_top_builddir)/lib
 ISOSURF_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
index a58eab0387cd0b03c721f8c3e298f0042ff1da00..09d480f1657bd314027ef6946b5eed86b178b235 100644 (file)
@@ -43,7 +43,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.9
-WX_VERSION = $(WX_RELEASE).3
+WX_VERSION = $(WX_RELEASE).4
 LIBDIRNAME = $(wx_top_builddir)/lib
 PENGUIN_CFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
index 08e84b8af2b7bf532863676c97946572bc7d06a4..2d3c7a980231bd288c2d613b6d1ceb6efe8b9b1d 100644 (file)
@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.9
-WX_VERSION = $(WX_RELEASE).3
+WX_VERSION = $(WX_RELEASE).4
 LIBDIRNAME = $(wx_top_builddir)/lib
 OWNERDRW_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
index 64cc25c8ece12179c51b444bc9003f1b3b620d80..32704a5be41905b4d386f3dcdb955d96da635876 100644 (file)
@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.9
-WX_VERSION = $(WX_RELEASE).3
+WX_VERSION = $(WX_RELEASE).4
 LIBDIRNAME = $(wx_top_builddir)/lib
 POPUP_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
index e3ea09b925c7b12e29d4da7af490a6c4d3cbb46e..77deebcf31b5af384019cb77002bbd6bab777b53 100644 (file)
@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.9
-WX_VERSION = $(WX_RELEASE).3
+WX_VERSION = $(WX_RELEASE).4
 LIBDIRNAME = $(wx_top_builddir)/lib
 POWER_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
index 7ef1186377c85688812b8b403f44e5f9842d6d4d..e07f28037914fcaf04958aa7c0518cf410a78150 100644 (file)
@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.9
-WX_VERSION = $(WX_RELEASE).3
+WX_VERSION = $(WX_RELEASE).4
 LIBDIRNAME = $(wx_top_builddir)/lib
 PRINTING_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
index 4bbcbe51e5861054eff4af504ad6c0f48317d0f8..4fe8136e084893f8337a35b843d225c0e00c78d1 100644 (file)
@@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.9
-WX_VERSION = $(WX_RELEASE).3
+WX_VERSION = $(WX_RELEASE).4
 LIBDIRNAME = $(wx_top_builddir)/lib
 PROPGRID_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
index 21a912f80f5439250db61ed870fb1018615edeb4..70b00caae362ec98c056eccbbb1103a062099ce3 100644 (file)
@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.9
-WX_VERSION = $(WX_RELEASE).3
+WX_VERSION = $(WX_RELEASE).4
 LIBDIRNAME = $(wx_top_builddir)/lib
 REGTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
index 3b4b8289042ea53c46d1437d07cc1d21567c3112..237495430c15144acac9e5d807657eff20209291 100644 (file)
@@ -49,8 +49,8 @@ wx_top_builddir = @wx_top_builddir@
 DESTDIR = 
 WX_RELEASE = 2.9
 WX_RELEASE_NODOT = 29
-WX_VERSION = $(WX_RELEASE).3
-WX_VERSION_NODOT = $(WX_RELEASE_NODOT)3
+WX_VERSION = $(WX_RELEASE).4
+WX_VERSION_NODOT = $(WX_RELEASE_NODOT)4
 LIBDIRNAME = $(wx_top_builddir)/lib
 PLUGINS_INST_DIR = $(libdir)/wx/$(PLUGIN_VERSION0)
 RENDER_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
index fb82f007598211fb509eaacc7de268cbf98f47fa..5ad1012010e8f52b119b61a4c78dafbfe4266ab5 100644 (file)
@@ -22,7 +22,7 @@ BCCDIR = $(MAKEDIR)\..
 ### Variables: ###\r
 \r
 WX_RELEASE_NODOT = 29\r
-WX_VERSION_NODOT = $(WX_RELEASE_NODOT)3\r
+WX_VERSION_NODOT = $(WX_RELEASE_NODOT)4\r
 COMPILER_PREFIX = bcc\r
 OBJS = \\r
        $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
index 536fc619123fc5ff3db06d697e0d9020e212d317..e19c86f44f5b79944a9268b52f8e8393494810f9 100644 (file)
@@ -14,7 +14,7 @@ include ../../build/msw/config.gcc
 \r
 CPPDEPS = -MT$@ -MF$@.d -MD -MP\r
 WX_RELEASE_NODOT = 29\r
-WX_VERSION_NODOT = $(WX_RELEASE_NODOT)3\r
+WX_VERSION_NODOT = $(WX_RELEASE_NODOT)4\r
 COMPILER_PREFIX = gcc\r
 OBJS = \\r
        $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
index 1e757dcdddc492abc1b3fc34c5da8827611f8853..c2a915011ca6e12dc0007e47f1a9d4aa4bc54f6f 100644 (file)
@@ -13,7 +13,7 @@
 ### Variables: ###\r
 \r
 WX_RELEASE_NODOT = 29\r
-WX_VERSION_NODOT = $(WX_RELEASE_NODOT)3\r
+WX_VERSION_NODOT = $(WX_RELEASE_NODOT)4\r
 COMPILER_PREFIX = vc\r
 OBJS = \\r
        $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)\r
index e010ee7c55272a30900aae356abe10043bf5656f..a679b11be4bd3cc7d3afe93c9e99b05e735699ec 100644 (file)
@@ -220,7 +220,7 @@ ____CAIRO_LIBDIR_FILENAMES = libpath $(CAIRO_ROOT)\lib
 ### Variables: ###\r
 \r
 WX_RELEASE_NODOT = 29\r
-WX_VERSION_NODOT = $(WX_RELEASE_NODOT)3\r
+WX_VERSION_NODOT = $(WX_RELEASE_NODOT)4\r
 COMPILER_PREFIX = wat\r
 OBJS = &\r
        $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
index 056bdb05051be988e10085629d20143d04733d87..1e79b936089b4ca61ef7750c96e7ecbee7880d0c 100644 (file)
@@ -43,8 +43,8 @@ RSC=rc.exe
 # PROP Output_Dir "vc_mswunivudll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\renddll"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /Zi /Fdvc_mswunivudll\renddll_mswunivu293_vc.pdb /opt:ref /opt:icf /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXUSINGDLL" /c\r
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /Zi /Fdvc_mswunivudll\renddll_mswunivu293_vc.pdb /opt:ref /opt:icf /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXUSINGDLL" /c\r
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /Zi /Fdvc_mswunivudll\renddll_mswunivu294_vc.pdb /opt:ref /opt:icf /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXUSINGDLL" /c\r
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /Zi /Fdvc_mswunivudll\renddll_mswunivu294_vc.pdb /opt:ref /opt:icf /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXUSINGDLL" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXUSINGDLL" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXUSINGDLL" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /d WXUSINGDLL\r
@@ -53,8 +53,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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 /nologo /dll /machine:i386 /out:"vc_mswunivudll\renddll_mswunivu293_vc.dll" /libpath:".\..\..\lib\vc_dll" /debug /pdb:"vc_mswunivudll\renddll_mswunivu293_vc.pdb"\r
-# ADD LINK32 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 /nologo /dll /machine:i386 /out:"vc_mswunivudll\renddll_mswunivu293_vc.dll" /libpath:".\..\..\lib\vc_dll" /debug /pdb:"vc_mswunivudll\renddll_mswunivu293_vc.pdb"\r
+# ADD BASE LINK32 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 /nologo /dll /machine:i386 /out:"vc_mswunivudll\renddll_mswunivu294_vc.dll" /libpath:".\..\..\lib\vc_dll" /debug /pdb:"vc_mswunivudll\renddll_mswunivu294_vc.pdb"\r
+# ADD LINK32 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 /nologo /dll /machine:i386 /out:"vc_mswunivudll\renddll_mswunivu294_vc.dll" /libpath:".\..\..\lib\vc_dll" /debug /pdb:"vc_mswunivudll\renddll_mswunivu294_vc.pdb"\r
 \r
 !ELSEIF  "$(CFG)" == "renddll - Win32 DLL Universal Debug"\r
 \r
@@ -68,8 +68,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivuddll"\r
 # PROP Intermediate_Dir "vc_mswunivuddll\renddll"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivud" /I ".\..\..\include" /W4 /Zi /Fdvc_mswunivuddll\renddll_mswunivud293_vc.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /c\r
-# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivud" /I ".\..\..\include" /W4 /Zi /Fdvc_mswunivuddll\renddll_mswunivud293_vc.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /c\r
+# ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivud" /I ".\..\..\include" /W4 /Zi /Fdvc_mswunivuddll\renddll_mswunivud294_vc.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /c\r
+# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivud" /I ".\..\..\include" /W4 /Zi /Fdvc_mswunivuddll\renddll_mswunivud294_vc.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivud" /i ".\..\..\include" /d WXUSINGDLL\r
@@ -78,8 +78,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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 /nologo /dll /machine:i386 /out:"vc_mswunivuddll\renddll_mswunivud293_vc.dll" /libpath:".\..\..\lib\vc_dll" /debug /pdb:"vc_mswunivuddll\renddll_mswunivud293_vc.pdb"\r
-# ADD LINK32 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 /nologo /dll /machine:i386 /out:"vc_mswunivuddll\renddll_mswunivud293_vc.dll" /libpath:".\..\..\lib\vc_dll" /debug /pdb:"vc_mswunivuddll\renddll_mswunivud293_vc.pdb"\r
+# ADD BASE LINK32 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 /nologo /dll /machine:i386 /out:"vc_mswunivuddll\renddll_mswunivud294_vc.dll" /libpath:".\..\..\lib\vc_dll" /debug /pdb:"vc_mswunivuddll\renddll_mswunivud294_vc.pdb"\r
+# ADD LINK32 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 /nologo /dll /machine:i386 /out:"vc_mswunivuddll\renddll_mswunivud294_vc.dll" /libpath:".\..\..\lib\vc_dll" /debug /pdb:"vc_mswunivuddll\renddll_mswunivud294_vc.pdb"\r
 \r
 !ELSEIF  "$(CFG)" == "renddll - Win32 DLL Release"\r
 \r
@@ -93,8 +93,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswudll"\r
 # PROP Intermediate_Dir "vc_mswudll\renddll"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /Zi /Fdvc_mswudll\renddll_mswu293_vc.pdb /opt:ref /opt:icf /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXUSINGDLL" /c\r
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /Zi /Fdvc_mswudll\renddll_mswu293_vc.pdb /opt:ref /opt:icf /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXUSINGDLL" /c\r
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /Zi /Fdvc_mswudll\renddll_mswu294_vc.pdb /opt:ref /opt:icf /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXUSINGDLL" /c\r
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /Zi /Fdvc_mswudll\renddll_mswu294_vc.pdb /opt:ref /opt:icf /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXUSINGDLL" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXUSINGDLL" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXUSINGDLL" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /d WXUSINGDLL\r
@@ -103,8 +103,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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 /nologo /dll /machine:i386 /out:"vc_mswudll\renddll_mswu293_vc.dll" /libpath:".\..\..\lib\vc_dll" /debug /pdb:"vc_mswudll\renddll_mswu293_vc.pdb"\r
-# ADD LINK32 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 /nologo /dll /machine:i386 /out:"vc_mswudll\renddll_mswu293_vc.dll" /libpath:".\..\..\lib\vc_dll" /debug /pdb:"vc_mswudll\renddll_mswu293_vc.pdb"\r
+# ADD BASE LINK32 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 /nologo /dll /machine:i386 /out:"vc_mswudll\renddll_mswu294_vc.dll" /libpath:".\..\..\lib\vc_dll" /debug /pdb:"vc_mswudll\renddll_mswu294_vc.pdb"\r
+# ADD LINK32 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 /nologo /dll /machine:i386 /out:"vc_mswudll\renddll_mswu294_vc.dll" /libpath:".\..\..\lib\vc_dll" /debug /pdb:"vc_mswudll\renddll_mswu294_vc.pdb"\r
 \r
 !ELSEIF  "$(CFG)" == "renddll - Win32 DLL Debug"\r
 \r
@@ -118,8 +118,8 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswuddll"\r
 # PROP Intermediate_Dir "vc_mswuddll\renddll"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_dll\mswud" /I ".\..\..\include" /W4 /Zi /Fdvc_mswuddll\renddll_mswud293_vc.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /c\r
-# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_dll\mswud" /I ".\..\..\include" /W4 /Zi /Fdvc_mswuddll\renddll_mswud293_vc.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /c\r
+# ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_dll\mswud" /I ".\..\..\include" /W4 /Zi /Fdvc_mswuddll\renddll_mswud294_vc.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /c\r
+# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_dll\mswud" /I ".\..\..\include" /W4 /Zi /Fdvc_mswuddll\renddll_mswud294_vc.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswud" /i ".\..\..\include" /d WXUSINGDLL\r
@@ -128,8 +128,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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 /nologo /dll /machine:i386 /out:"vc_mswuddll\renddll_mswud293_vc.dll" /libpath:".\..\..\lib\vc_dll" /debug /pdb:"vc_mswuddll\renddll_mswud293_vc.pdb"\r
-# ADD LINK32 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 /nologo /dll /machine:i386 /out:"vc_mswuddll\renddll_mswud293_vc.dll" /libpath:".\..\..\lib\vc_dll" /debug /pdb:"vc_mswuddll\renddll_mswud293_vc.pdb"\r
+# ADD BASE LINK32 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 /nologo /dll /machine:i386 /out:"vc_mswuddll\renddll_mswud294_vc.dll" /libpath:".\..\..\lib\vc_dll" /debug /pdb:"vc_mswuddll\renddll_mswud294_vc.pdb"\r
+# ADD LINK32 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 /nologo /dll /machine:i386 /out:"vc_mswuddll\renddll_mswud294_vc.dll" /libpath:".\..\..\lib\vc_dll" /debug /pdb:"vc_mswuddll\renddll_mswud294_vc.pdb"\r
 \r
 !ENDIF\r
 \r
index e2df685b7e147afaf00c2f6df3e7d49fc75a4cc9..dad61d743b12e162ab1d1ab3e178653765ecfb22 100644 (file)
@@ -36,7 +36,7 @@
                                BufferSecurityCheck="TRUE"\r
                                RuntimeTypeInfo="TRUE"\r
                                ObjectFile="vc_mswuddll\renddll\"\r
-                               ProgramDataBaseFileName="vc_mswuddll\renddll_mswud293_vc.pdb"\r
+                               ProgramDataBaseFileName="vc_mswuddll\renddll_mswud294_vc.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="TRUE"\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29ud_core.lib  wxbase29ud.lib   wxtiffd.lib wxjpegd.lib wxpngd.lib  wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
-                               OutputFile="vc_mswuddll\renddll_mswud293_vc.dll"\r
+                               OutputFile="vc_mswuddll\renddll_mswud294_vc.dll"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="vc_mswuddll\renddll_mswud293_vc.pdb"\r
+                               ProgramDatabaseFile="vc_mswuddll\renddll_mswud294_vc.pdb"\r
                                TargetMachine="1"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
@@ -97,7 +97,7 @@
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="TRUE"\r
                                ObjectFile="vc_mswudll\renddll\"\r
-                               ProgramDataBaseFileName="vc_mswudll\renddll_mswu293_vc.pdb"\r
+                               ProgramDataBaseFileName="vc_mswudll\renddll_mswu294_vc.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="TRUE"\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
-                               OutputFile="vc_mswudll\renddll_mswu293_vc.dll"\r
+                               OutputFile="vc_mswudll\renddll_mswu294_vc.dll"\r
                                LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="vc_mswudll\renddll_mswu293_vc.pdb"\r
+                               ProgramDatabaseFile="vc_mswudll\renddll_mswu294_vc.pdb"\r
                                TargetMachine="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"/>\r
                                BufferSecurityCheck="TRUE"\r
                                RuntimeTypeInfo="TRUE"\r
                                ObjectFile="vc_mswunivuddll\renddll\"\r
-                               ProgramDataBaseFileName="vc_mswunivuddll\renddll_mswunivud293_vc.pdb"\r
+                               ProgramDataBaseFileName="vc_mswunivuddll\renddll_mswunivud294_vc.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="TRUE"\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29ud_core.lib  wxbase29ud.lib   wxtiffd.lib wxjpegd.lib wxpngd.lib  wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
-                               OutputFile="vc_mswunivuddll\renddll_mswunivud293_vc.dll"\r
+                               OutputFile="vc_mswunivuddll\renddll_mswunivud294_vc.dll"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="vc_mswunivuddll\renddll_mswunivud293_vc.pdb"\r
+                               ProgramDatabaseFile="vc_mswunivuddll\renddll_mswunivud294_vc.pdb"\r
                                TargetMachine="1"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="TRUE"\r
                                ObjectFile="vc_mswunivudll\renddll\"\r
-                               ProgramDataBaseFileName="vc_mswunivudll\renddll_mswunivu293_vc.pdb"\r
+                               ProgramDataBaseFileName="vc_mswunivudll\renddll_mswunivu294_vc.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="TRUE"\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
-                               OutputFile="vc_mswunivudll\renddll_mswunivu293_vc.dll"\r
+                               OutputFile="vc_mswunivudll\renddll_mswunivu294_vc.dll"\r
                                LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="vc_mswunivudll\renddll_mswunivu293_vc.pdb"\r
+                               ProgramDatabaseFile="vc_mswunivudll\renddll_mswunivu294_vc.pdb"\r
                                TargetMachine="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"/>\r
index 07d3f26ffd8408670ac357dbfafcdfbcb0d24a05..9ce8903903203f8fd24576e4c1b63a0746898411 100644 (file)
@@ -59,7 +59,7 @@
                                BufferSecurityCheck="true"\r
                                RuntimeTypeInfo="true"\r
                                ObjectFile="vc_mswuddll\renddll\"\r
-                               ProgramDataBaseFileName="vc_mswuddll\renddll_mswud293_vc.pdb"\r
+                               ProgramDataBaseFileName="vc_mswuddll\renddll_mswud294_vc.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                Detect64BitPortabilityProblems="true"\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29ud_core.lib  wxbase29ud.lib   wxtiffd.lib wxjpegd.lib wxpngd.lib  wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
-                               OutputFile="vc_mswuddll\renddll_mswud293_vc.dll"\r
+                               OutputFile="vc_mswuddll\renddll_mswud294_vc.dll"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="vc_mswuddll\renddll_mswud293_vc.pdb"\r
+                               ProgramDatabaseFile="vc_mswuddll\renddll_mswud294_vc.pdb"\r
                                TargetMachine="1"\r
                        />\r
                        <Tool\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="true"\r
                                ObjectFile="vc_mswudll\renddll\"\r
-                               ProgramDataBaseFileName="vc_mswudll\renddll_mswu293_vc.pdb"\r
+                               ProgramDataBaseFileName="vc_mswudll\renddll_mswu294_vc.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                Detect64BitPortabilityProblems="true"\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
-                               OutputFile="vc_mswudll\renddll_mswu293_vc.dll"\r
+                               OutputFile="vc_mswudll\renddll_mswu294_vc.dll"\r
                                LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="vc_mswudll\renddll_mswu293_vc.pdb"\r
+                               ProgramDatabaseFile="vc_mswudll\renddll_mswu294_vc.pdb"\r
                                TargetMachine="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
                                BufferSecurityCheck="true"\r
                                RuntimeTypeInfo="true"\r
                                ObjectFile="vc_mswunivuddll\renddll\"\r
-                               ProgramDataBaseFileName="vc_mswunivuddll\renddll_mswunivud293_vc.pdb"\r
+                               ProgramDataBaseFileName="vc_mswunivuddll\renddll_mswunivud294_vc.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                Detect64BitPortabilityProblems="true"\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29ud_core.lib  wxbase29ud.lib   wxtiffd.lib wxjpegd.lib wxpngd.lib  wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
-                               OutputFile="vc_mswunivuddll\renddll_mswunivud293_vc.dll"\r
+                               OutputFile="vc_mswunivuddll\renddll_mswunivud294_vc.dll"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="vc_mswunivuddll\renddll_mswunivud293_vc.pdb"\r
+                               ProgramDatabaseFile="vc_mswunivuddll\renddll_mswunivud294_vc.pdb"\r
                                TargetMachine="1"\r
                        />\r
                        <Tool\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="true"\r
                                ObjectFile="vc_mswunivudll\renddll\"\r
-                               ProgramDataBaseFileName="vc_mswunivudll\renddll_mswunivu293_vc.pdb"\r
+                               ProgramDataBaseFileName="vc_mswunivudll\renddll_mswunivu294_vc.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                Detect64BitPortabilityProblems="true"\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
-                               OutputFile="vc_mswunivudll\renddll_mswunivu293_vc.dll"\r
+                               OutputFile="vc_mswunivudll\renddll_mswunivu294_vc.dll"\r
                                LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="vc_mswunivudll\renddll_mswunivu293_vc.pdb"\r
+                               ProgramDatabaseFile="vc_mswunivudll\renddll_mswunivu294_vc.pdb"\r
                                TargetMachine="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
index d86af4d06c77403b41557e55f7990e7803dc0a6d..107724a2edeec24c6b27e9b516c42884bb0e5245 100644 (file)
@@ -59,7 +59,7 @@
                                BufferSecurityCheck="true"\r
                                RuntimeTypeInfo="true"\r
                                ObjectFile="vc_mswuddll\renddll\"\r
-                               ProgramDataBaseFileName="vc_mswuddll\renddll_mswud293_vc.pdb"\r
+                               ProgramDataBaseFileName="vc_mswuddll\renddll_mswud294_vc.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29ud_core.lib  wxbase29ud.lib   wxtiffd.lib wxjpegd.lib wxpngd.lib  wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
-                               OutputFile="vc_mswuddll\renddll_mswud293_vc.dll"\r
+                               OutputFile="vc_mswuddll\renddll_mswud294_vc.dll"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="vc_mswuddll\renddll_mswud293_vc.pdb"\r
+                               ProgramDatabaseFile="vc_mswuddll\renddll_mswud294_vc.pdb"\r
                                TargetMachine="1"\r
                        />\r
                        <Tool\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="true"\r
                                ObjectFile="vc_mswudll\renddll\"\r
-                               ProgramDataBaseFileName="vc_mswudll\renddll_mswu293_vc.pdb"\r
+                               ProgramDataBaseFileName="vc_mswudll\renddll_mswu294_vc.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
-                               OutputFile="vc_mswudll\renddll_mswu293_vc.dll"\r
+                               OutputFile="vc_mswudll\renddll_mswu294_vc.dll"\r
                                LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="vc_mswudll\renddll_mswu293_vc.pdb"\r
+                               ProgramDatabaseFile="vc_mswudll\renddll_mswu294_vc.pdb"\r
                                TargetMachine="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
                                BufferSecurityCheck="true"\r
                                RuntimeTypeInfo="true"\r
                                ObjectFile="vc_mswunivuddll\renddll\"\r
-                               ProgramDataBaseFileName="vc_mswunivuddll\renddll_mswunivud293_vc.pdb"\r
+                               ProgramDataBaseFileName="vc_mswunivuddll\renddll_mswunivud294_vc.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29ud_core.lib  wxbase29ud.lib   wxtiffd.lib wxjpegd.lib wxpngd.lib  wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
-                               OutputFile="vc_mswunivuddll\renddll_mswunivud293_vc.dll"\r
+                               OutputFile="vc_mswunivuddll\renddll_mswunivud294_vc.dll"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="vc_mswunivuddll\renddll_mswunivud293_vc.pdb"\r
+                               ProgramDatabaseFile="vc_mswunivuddll\renddll_mswunivud294_vc.pdb"\r
                                TargetMachine="1"\r
                        />\r
                        <Tool\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="true"\r
                                ObjectFile="vc_mswunivudll\renddll\"\r
-                               ProgramDataBaseFileName="vc_mswunivudll\renddll_mswunivu293_vc.pdb"\r
+                               ProgramDataBaseFileName="vc_mswunivudll\renddll_mswunivu294_vc.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
-                               OutputFile="vc_mswunivudll\renddll_mswunivu293_vc.dll"\r
+                               OutputFile="vc_mswunivudll\renddll_mswunivu294_vc.dll"\r
                                LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="vc_mswunivudll\renddll_mswunivu293_vc.pdb"\r
+                               ProgramDatabaseFile="vc_mswunivudll\renddll_mswunivu294_vc.pdb"\r
                                TargetMachine="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
index 720fa71bca233fb69cad35e025dcdd17320c6a82..53ac24312d633fa10e5d38795e9637edd2d1f04f 100644 (file)
@@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.9
-WX_VERSION = $(WX_RELEASE).3
+WX_VERSION = $(WX_RELEASE).4
 LIBDIRNAME = $(wx_top_builddir)/lib
 RIBBON_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
index 9d4fc91fa82947d893e5e1b95291cea7778c3606..8d131e82fadd572ced1c6429a7e0c0d87faa00e7 100644 (file)
@@ -43,7 +43,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.9
-WX_VERSION = $(WX_RELEASE).3
+WX_VERSION = $(WX_RELEASE).4
 LIBDIRNAME = $(wx_top_builddir)/lib
 RICHTEXT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
index 6f30fdd43de74bd9cf46a8e80eaf80438a9af59c..963a8674bf35b60b2256a4aded425f0a0e8f3a36 100644 (file)
@@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.9
-WX_VERSION = $(WX_RELEASE).3
+WX_VERSION = $(WX_RELEASE).4
 LIBDIRNAME = $(wx_top_builddir)/lib
 SASHTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
index 0ef03bdee00f3f4013e52c7f5ae735e61a46ef47..f0b4540c858deca30277b9b339f5f36b826f4ca3 100644 (file)
@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.9
-WX_VERSION = $(WX_RELEASE).3
+WX_VERSION = $(WX_RELEASE).4
 LIBDIRNAME = $(wx_top_builddir)/lib
 SCROLL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
index a8342ef0073c48b8fe515c60b888b5be76bb56ef..9b333d281c5c0c6d0487d4b9bf00f483e6d66e65 100644 (file)
@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.9
-WX_VERSION = $(WX_RELEASE).3
+WX_VERSION = $(WX_RELEASE).4
 LIBDIRNAME = $(wx_top_builddir)/lib
 SHAPED_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
index 6f4cd007da18550ae1770efa23c99bd6da8a05ce..e84b091f2981435c700c53c60f09d53a55bf46c2 100644 (file)
@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.9
-WX_VERSION = $(WX_RELEASE).3
+WX_VERSION = $(WX_RELEASE).4
 LIBDIRNAME = $(wx_top_builddir)/lib
 CLIENT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
index 7ad01f52e7ca067bb3759bafe65f864ae29d5b37..e53a0b04dd03d6a9752f11ff5f92e9b6e282c7c0 100644 (file)
@@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.9
-WX_VERSION = $(WX_RELEASE).3
+WX_VERSION = $(WX_RELEASE).4
 LIBDIRNAME = $(wx_top_builddir)/lib
 SOUND_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
index bc1f24360324fb54625bb3d2b3104c2b05ec8999..65ae772f78a0cc2178d56f547c6db989006b29a0 100644 (file)
@@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.9
-WX_VERSION = $(WX_RELEASE).3
+WX_VERSION = $(WX_RELEASE).4
 LIBDIRNAME = $(wx_top_builddir)/lib
 SPLASH_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
index 4fc7226ed4fa156a08ad1ab5d7b23d89e0a22d64..872aa1438771c093eac782a21823dceab9265f46 100644 (file)
@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.9
-WX_VERSION = $(WX_RELEASE).3
+WX_VERSION = $(WX_RELEASE).4
 LIBDIRNAME = $(wx_top_builddir)/lib
 SPLITTER_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
index 790a356ed6d64f5760dfe7c1d8eb6505f3962367..a6b22c2359a28be388f5bd9b73cdd9e0c3f466d0 100644 (file)
@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.9
-WX_VERSION = $(WX_RELEASE).3
+WX_VERSION = $(WX_RELEASE).4
 LIBDIRNAME = $(wx_top_builddir)/lib
 STATBAR_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
index afa4faba5e3befdcbab8168a533b858c1a506c0c..4122e6abcd3835d585761500ac6780e869683bf3 100644 (file)
@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.9
-WX_VERSION = $(WX_RELEASE).3
+WX_VERSION = $(WX_RELEASE).4
 LIBDIRNAME = $(wx_top_builddir)/lib
 STCTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
index 8c8c7e7061dc34af56b370ea68ad62232bbc44a9..3953049cceea5b274f03228c0e8742082de89f0b 100644 (file)
@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.9
-WX_VERSION = $(WX_RELEASE).3
+WX_VERSION = $(WX_RELEASE).4
 LIBDIRNAME = $(wx_top_builddir)/lib
 SVGTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
index 1087c4b7f2f0943c368f38b55fe3add25ac4792b..9da73aab5c95e27fd11b5a211e9eee30b6bd6f76 100644 (file)
@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.9
-WX_VERSION = $(WX_RELEASE).3
+WX_VERSION = $(WX_RELEASE).4
 LIBDIRNAME = $(wx_top_builddir)/lib
 TABORDER_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
index 8b32a3395a186d8c25a10228d39cca456a3c8aaf..cdd16b6a7648e4ce1306d0666c6f18d8157e239e 100644 (file)
@@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.9
-WX_VERSION = $(WX_RELEASE).3
+WX_VERSION = $(WX_RELEASE).4
 LIBDIRNAME = $(wx_top_builddir)/lib
 TASKBAR_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
index 5e3754baa368e51b0db3652bd226ec601410f358..dc0c746e971395c3285d14cd13998cc1c15f3f4e 100644 (file)
@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.9
-WX_VERSION = $(WX_RELEASE).3
+WX_VERSION = $(WX_RELEASE).4
 LIBDIRNAME = $(wx_top_builddir)/lib
 TEXT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
index f8a38499c8a00297b6591d411a026374cbe0ff84..dd70f9cdb63cb44fa1b12154ca1bcdcf55830e3e 100644 (file)
@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.9
-WX_VERSION = $(WX_RELEASE).3
+WX_VERSION = $(WX_RELEASE).4
 LIBDIRNAME = $(wx_top_builddir)/lib
 THREAD_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
index fe26e82fbf49bb009724e11d9f6e5d951902d132..b86115e161221378553627e3ff7848c0fe35e16f 100644 (file)
@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.9
-WX_VERSION = $(WX_RELEASE).3
+WX_VERSION = $(WX_RELEASE).4
 LIBDIRNAME = $(wx_top_builddir)/lib
 TOOLBAR_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
index 47114bba5b7b132452adb8b154140857c5da15a9..cf43a0ed688419e147099ce11bfd89e101ba2cec 100644 (file)
@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.9
-WX_VERSION = $(WX_RELEASE).3
+WX_VERSION = $(WX_RELEASE).4
 LIBDIRNAME = $(wx_top_builddir)/lib
 TREECTRL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
index 837e377853df1426bb3bae12618b91f56e4e09fa..f84403c6db974cc4e415d0b9588c713cfa993b32 100644 (file)
@@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.9
-WX_VERSION = $(WX_RELEASE).3
+WX_VERSION = $(WX_RELEASE).4
 LIBDIRNAME = $(wx_top_builddir)/lib
 TREELIST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
index 7707b7d6e9eea6a121e88276fbc6abb81394dfb7..cbdf76c3af6b56ebab7f401e629c3ba27d0a4efd 100644 (file)
-# =========================================================================
-#     This makefile was generated by
-#     Bakefile 0.2.9 (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)
-TREELIST_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
-       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
-       $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
-       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
-       $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include \
-       $(____CAIRO_INCLUDEDIR_FILENAMES_p) -I. $(__DLLFLAG_p) -I.\..\..\samples \
-       -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
-TREELIST_OBJECTS =  \
-       $(OBJS)\treelist_treelist.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 "$(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 "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
-!endif
-!if "$(DEBUG_FLAG)" == "0"
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
-!endif
-!if "$(DEBUG_FLAG)" == "0"
-__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0
-!endif
-!if "$(BUILD)" == "release"
-__NDEBUG_DEFINE_p = -DNDEBUG
-!endif
-!if "$(BUILD)" == "release"
-__NDEBUG_DEFINE_p_1 = -dNDEBUG
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p = -DwxNO_RTTI
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p_1 = -dwxNO_RTTI
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p = -DwxNO_THREADS
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p_1 = -dwxNO_THREADS
-!endif
-!if "$(UNICODE)" == "0"
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p = -D_UNICODE
-!endif
-!if "$(UNICODE)" == "0"
-__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p_1 = -d_UNICODE
-!endif
-!if "$(MSLU)" == "1"
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
-!endif
-!if "$(MSLU)" == "1"
-__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1
-!endif
-!if "$(USE_CAIRO)" == "1"
-____CAIRO_INCLUDEDIR_FILENAMES_p = -I$(CAIRO_ROOT)\include\cairo
-!endif
-!if "$(USE_CAIRO)" == "1"
-____CAIRO_INCLUDEDIR_FILENAMES_1_p = -i$(CAIRO_ROOT)\include\cairo
-!endif
-!if "$(SHARED)" == "1"
-__DLLFLAG_p = -DWXUSINGDLL
-!endif
-!if "$(SHARED)" == "1"
-__DLLFLAG_p_1 = -dWXUSINGDLL
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_ADV_p = \
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_CORE_p = \
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
-!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 "$(USE_GUI)" == "1"
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
-!endif
-!if "$(MSLU)" == "1"
-__UNICOWS_LIB_p = unicows.lib
-!endif
-!if "$(USE_CAIRO)" == "1"
-__CAIRO_LIB_p = cairo.lib
-!endif
-!if "$(USE_CAIRO)" == "1"
-____CAIRO_LIBDIR_FILENAMES_p = -L$(CAIRO_ROOT)\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: $(OBJS)\treelist.exe
-
-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)\treelist.exe del $(OBJS)\treelist.exe
-       -if exist $(OBJS)\treelist.tds del $(OBJS)\treelist.tds
-       -if exist $(OBJS)\treelist.ilc del $(OBJS)\treelist.ilc
-       -if exist $(OBJS)\treelist.ild del $(OBJS)\treelist.ild
-       -if exist $(OBJS)\treelist.ilf del $(OBJS)\treelist.ilf
-       -if exist $(OBJS)\treelist.ils del $(OBJS)\treelist.ils
-
-$(OBJS)\treelist.exe: $(TREELIST_OBJECTS)  $(OBJS)\treelist_sample.res
-       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
-       c0w32.obj $(TREELIST_OBJECTS),$@,, $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\treelist_sample.res
-|
-
-$(OBJS)\treelist_sample.res: .\..\..\samples\sample.rc
-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\..\samples\sample.rc
-
-$(OBJS)\treelist_treelist.obj: .\treelist.cpp
-       $(CXX) -q -c -P -o$@ $(TREELIST_CXXFLAGS) .\treelist.cpp
+# =========================================================================\r
+#     This makefile was generated by\r
+#     Bakefile 0.2.9 (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
+TREELIST_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
+       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
+       $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \\r
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \\r
+       $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include \\r
+       $(____CAIRO_INCLUDEDIR_FILENAMES_p) -I. $(__DLLFLAG_p) -I.\..\..\samples \\r
+       -DNOPCH $(CPPFLAGS) $(CXXFLAGS)\r
+TREELIST_OBJECTS =  \\r
+       $(OBJS)\treelist_treelist.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 "$(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 "$(WXUNIV)" == "1"\r
+__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__\r
+!endif\r
+!if "$(DEBUG_FLAG)" == "0"\r
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
+!endif\r
+!if "$(DEBUG_FLAG)" == "0"\r
+__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0\r
+!endif\r
+!if "$(BUILD)" == "release"\r
+__NDEBUG_DEFINE_p = -DNDEBUG\r
+!endif\r
+!if "$(BUILD)" == "release"\r
+__NDEBUG_DEFINE_p_1 = -dNDEBUG\r
+!endif\r
+!if "$(USE_EXCEPTIONS)" == "0"\r
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
+!endif\r
+!if "$(USE_EXCEPTIONS)" == "0"\r
+__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS\r
+!endif\r
+!if "$(USE_RTTI)" == "0"\r
+__RTTI_DEFINE_p = -DwxNO_RTTI\r
+!endif\r
+!if "$(USE_RTTI)" == "0"\r
+__RTTI_DEFINE_p_1 = -dwxNO_RTTI\r
+!endif\r
+!if "$(USE_THREADS)" == "0"\r
+__THREAD_DEFINE_p = -DwxNO_THREADS\r
+!endif\r
+!if "$(USE_THREADS)" == "0"\r
+__THREAD_DEFINE_p_1 = -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 "$(UNICODE)" == "0"\r
+__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0\r
+!endif\r
+!if "$(UNICODE)" == "1"\r
+__UNICODE_DEFINE_p_1 = -d_UNICODE\r
+!endif\r
+!if "$(MSLU)" == "1"\r
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
+!endif\r
+!if "$(MSLU)" == "1"\r
+__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1\r
+!endif\r
+!if "$(USE_CAIRO)" == "1"\r
+____CAIRO_INCLUDEDIR_FILENAMES_p = -I$(CAIRO_ROOT)\include\cairo\r
+!endif\r
+!if "$(USE_CAIRO)" == "1"\r
+____CAIRO_INCLUDEDIR_FILENAMES_1_p = -i$(CAIRO_ROOT)\include\cairo\r
+!endif\r
+!if "$(SHARED)" == "1"\r
+__DLLFLAG_p = -DWXUSINGDLL\r
+!endif\r
+!if "$(SHARED)" == "1"\r
+__DLLFLAG_p_1 = -dWXUSINGDLL\r
+!endif\r
+!if "$(MONOLITHIC)" == "0"\r
+__WXLIB_ADV_p = \\r
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib\r
+!endif\r
+!if "$(MONOLITHIC)" == "0"\r
+__WXLIB_CORE_p = \\r
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\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 "$(USE_GUI)" == "1"\r
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
+!endif\r
+!if "$(USE_GUI)" == "1"\r
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
+!endif\r
+!if "$(USE_GUI)" == "1"\r
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
+!endif\r
+!if "$(MSLU)" == "1"\r
+__UNICOWS_LIB_p = unicows.lib\r
+!endif\r
+!if "$(USE_CAIRO)" == "1"\r
+__CAIRO_LIB_p = cairo.lib\r
+!endif\r
+!if "$(USE_CAIRO)" == "1"\r
+____CAIRO_LIBDIR_FILENAMES_p = -L$(CAIRO_ROOT)\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: $(OBJS)\treelist.exe\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)\treelist.exe del $(OBJS)\treelist.exe\r
+       -if exist $(OBJS)\treelist.tds del $(OBJS)\treelist.tds\r
+       -if exist $(OBJS)\treelist.ilc del $(OBJS)\treelist.ilc\r
+       -if exist $(OBJS)\treelist.ild del $(OBJS)\treelist.ild\r
+       -if exist $(OBJS)\treelist.ilf del $(OBJS)\treelist.ilf\r
+       -if exist $(OBJS)\treelist.ils del $(OBJS)\treelist.ils\r
+\r
+$(OBJS)\treelist.exe: $(TREELIST_OBJECTS)  $(OBJS)\treelist_sample.res\r
+       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|\r
+       c0w32.obj $(TREELIST_OBJECTS),$@,, $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\treelist_sample.res\r
+|\r
+\r
+$(OBJS)\treelist_sample.res: .\..\..\samples\sample.rc\r
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\..\samples\sample.rc\r
+\r
+$(OBJS)\treelist_treelist.obj: .\treelist.cpp\r
+       $(CXX) -q -c -P -o$@ $(TREELIST_CXXFLAGS) .\treelist.cpp\r
+\r
index c930d9827dd003fcdfa3fa70d4012452ca92daf5..af5b4a17053ea21e0f9695bbc05b669b8a4cbb0d 100644 (file)
-# =========================================================================
-#     This makefile was generated by
-#     Bakefile 0.2.9 (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)
-TREELIST_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
-       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
-       $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
-       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
-       $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include \
-       $(____CAIRO_INCLUDEDIR_FILENAMES_p) -W -Wall -I. $(__DLLFLAG_p) \
-       -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \
-       -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
-TREELIST_OBJECTS =  \
-       $(OBJS)\treelist_sample_rc.o \
-       $(OBJS)\treelist_treelist.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 ($(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 ($(WXUNIV),1)
-__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
-endif
-ifeq ($(DEBUG_FLAG),0)
-__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
-endif
-ifeq ($(DEBUG_FLAG),0)
-__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
-endif
-ifeq ($(BUILD),release)
-__NDEBUG_DEFINE_p = -DNDEBUG
-endif
-ifeq ($(BUILD),release)
-__NDEBUG_DEFINE_p_1 = --define NDEBUG
-endif
-ifeq ($(USE_EXCEPTIONS),0)
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
-endif
-ifeq ($(USE_EXCEPTIONS),0)
-__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
-endif
-ifeq ($(USE_RTTI),0)
-__RTTI_DEFINE_p = -DwxNO_RTTI
-endif
-ifeq ($(USE_RTTI),0)
-__RTTI_DEFINE_p_1 = --define wxNO_RTTI
-endif
-ifeq ($(USE_THREADS),0)
-__THREAD_DEFINE_p = -DwxNO_THREADS
-endif
-ifeq ($(USE_THREADS),0)
-__THREAD_DEFINE_p_1 = --define wxNO_THREADS
-endif
-ifeq ($(UNICODE),0)
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
-endif
-ifeq ($(UNICODE),1)
-__UNICODE_DEFINE_p = -D_UNICODE
-endif
-ifeq ($(UNICODE),0)
-__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0
-endif
-ifeq ($(UNICODE),1)
-__UNICODE_DEFINE_p_1 = --define _UNICODE
-endif
-ifeq ($(MSLU),1)
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
-endif
-ifeq ($(MSLU),1)
-__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1
-endif
-ifeq ($(USE_CAIRO),1)
-____CAIRO_INCLUDEDIR_FILENAMES_p = -I$(CAIRO_ROOT)\include\cairo
-endif
-ifeq ($(USE_CAIRO),1)
-__CAIRO_INCLUDEDIR_p = --include-dir $(CAIRO_ROOT)/include/cairo
-endif
-ifeq ($(SHARED),1)
-__DLLFLAG_p = -DWXUSINGDLL
-endif
-ifeq ($(SHARED),1)
-__DLLFLAG_p_1 = --define WXUSINGDLL
-endif
-ifeq ($(MONOLITHIC),0)
-__WXLIB_ADV_p = \
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv
-endif
-ifeq ($(MONOLITHIC),0)
-__WXLIB_CORE_p = \
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
-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 ($(USE_GUI),1)
-__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
-endif
-ifeq ($(USE_GUI),1)
-__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
-endif
-ifeq ($(USE_GUI),1)
-__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
-endif
-ifeq ($(MSLU),1)
-__UNICOWS_LIB_p = -lunicows
-endif
-ifeq ($(USE_CAIRO),1)
-__CAIRO_LIB_p = -lcairo
-endif
-ifeq ($(USE_CAIRO),1)
-____CAIRO_LIBDIR_FILENAMES_p = -L$(CAIRO_ROOT)\lib
-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: $(OBJS)\treelist.exe
-
-clean:
-       -if exist $(OBJS)\*.o del $(OBJS)\*.o
-       -if exist $(OBJS)\*.d del $(OBJS)\*.d
-       -if exist $(OBJS)\treelist.exe del $(OBJS)\treelist.exe
-
-$(OBJS)\treelist.exe: $(TREELIST_OBJECTS) $(OBJS)\treelist_sample_rc.o
-       $(CXX) -o $@ $(TREELIST_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
-
-$(OBJS)\treelist_sample_rc.o: ./../../samples/sample.rc
-       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
-
-$(OBJS)\treelist_treelist.o: ./treelist.cpp
-       $(CXX) -c -o $@ $(TREELIST_CXXFLAGS) $(CPPDEPS) $<
-
-.PHONY: all clean
-
-
-SHELL := $(COMSPEC)
-
-# Dependencies tracking:
--include $(OBJS)/*.d
+# =========================================================================\r
+#     This makefile was generated by\r
+#     Bakefile 0.2.9 (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
+TREELIST_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \\r
+       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
+       $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \\r
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \\r
+       $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include \\r
+       $(____CAIRO_INCLUDEDIR_FILENAMES_p) -W -Wall -I. $(__DLLFLAG_p) \\r
+       -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \\r
+       -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
+TREELIST_OBJECTS =  \\r
+       $(OBJS)\treelist_sample_rc.o \\r
+       $(OBJS)\treelist_treelist.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 ($(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 ($(WXUNIV),1)\r
+__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__\r
+endif\r
+ifeq ($(DEBUG_FLAG),0)\r
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
+endif\r
+ifeq ($(DEBUG_FLAG),0)\r
+__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0\r
+endif\r
+ifeq ($(BUILD),release)\r
+__NDEBUG_DEFINE_p = -DNDEBUG\r
+endif\r
+ifeq ($(BUILD),release)\r
+__NDEBUG_DEFINE_p_1 = --define NDEBUG\r
+endif\r
+ifeq ($(USE_EXCEPTIONS),0)\r
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
+endif\r
+ifeq ($(USE_EXCEPTIONS),0)\r
+__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS\r
+endif\r
+ifeq ($(USE_RTTI),0)\r
+__RTTI_DEFINE_p = -DwxNO_RTTI\r
+endif\r
+ifeq ($(USE_RTTI),0)\r
+__RTTI_DEFINE_p_1 = --define wxNO_RTTI\r
+endif\r
+ifeq ($(USE_THREADS),0)\r
+__THREAD_DEFINE_p = -DwxNO_THREADS\r
+endif\r
+ifeq ($(USE_THREADS),0)\r
+__THREAD_DEFINE_p_1 = --define wxNO_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 ($(UNICODE),0)\r
+__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0\r
+endif\r
+ifeq ($(UNICODE),1)\r
+__UNICODE_DEFINE_p_1 = --define _UNICODE\r
+endif\r
+ifeq ($(MSLU),1)\r
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
+endif\r
+ifeq ($(MSLU),1)\r
+__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1\r
+endif\r
+ifeq ($(USE_CAIRO),1)\r
+____CAIRO_INCLUDEDIR_FILENAMES_p = -I$(CAIRO_ROOT)\include\cairo\r
+endif\r
+ifeq ($(USE_CAIRO),1)\r
+__CAIRO_INCLUDEDIR_p = --include-dir $(CAIRO_ROOT)/include/cairo\r
+endif\r
+ifeq ($(SHARED),1)\r
+__DLLFLAG_p = -DWXUSINGDLL\r
+endif\r
+ifeq ($(SHARED),1)\r
+__DLLFLAG_p_1 = --define WXUSINGDLL\r
+endif\r
+ifeq ($(MONOLITHIC),0)\r
+__WXLIB_ADV_p = \\r
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv\r
+endif\r
+ifeq ($(MONOLITHIC),0)\r
+__WXLIB_CORE_p = \\r
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core\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 ($(USE_GUI),1)\r
+__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
+endif\r
+ifeq ($(USE_GUI),1)\r
+__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)\r
+endif\r
+ifeq ($(USE_GUI),1)\r
+__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)\r
+endif\r
+ifeq ($(MSLU),1)\r
+__UNICOWS_LIB_p = -lunicows\r
+endif\r
+ifeq ($(USE_CAIRO),1)\r
+__CAIRO_LIB_p = -lcairo\r
+endif\r
+ifeq ($(USE_CAIRO),1)\r
+____CAIRO_LIBDIR_FILENAMES_p = -L$(CAIRO_ROOT)\lib\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: $(OBJS)\treelist.exe\r
+\r
+clean: \r
+       -if exist $(OBJS)\*.o del $(OBJS)\*.o\r
+       -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
+       -if exist $(OBJS)\treelist.exe del $(OBJS)\treelist.exe\r
+\r
+$(OBJS)\treelist.exe: $(TREELIST_OBJECTS) $(OBJS)\treelist_sample_rc.o\r
+       $(CXX) -o $@ $(TREELIST_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet\r
+\r
+$(OBJS)\treelist_sample_rc.o: ./../../samples/sample.rc\r
+       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH\r
+\r
+$(OBJS)\treelist_treelist.o: ./treelist.cpp\r
+       $(CXX) -c -o $@ $(TREELIST_CXXFLAGS) $(CPPDEPS) $<\r
+\r
+.PHONY: all clean\r
+\r
+\r
+SHELL := $(COMSPEC)\r
+\r
+# Dependencies tracking:\r
+-include $(OBJS)/*.d\r
index 33866c3e531e1ac393be636312e521c6cbe7a794..b6e2a219de36c67c51c196f9243eaa5a12c42182 100644 (file)
-# =========================================================================
-#     This makefile was generated by
-#     Bakefile 0.2.9 (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)
-TREELIST_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
-       $(__DEBUGINFO_0) /Fd$(OBJS)\treelist.pdb $(____DEBUGRUNTIME_3_p) \
-       $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \
-       $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
-       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
-       $(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include \
-       $(____CAIRO_INCLUDEDIR_FILENAMES_p) /W4 /I. $(__DLLFLAG_p) /D_WINDOWS \
-       /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) \
-       $(CPPFLAGS) $(CXXFLAGS)
-TREELIST_OBJECTS =  \
-       $(OBJS)\treelist_treelist.obj
-TREELIST_RESOURCES =  \
-       $(OBJS)\treelist_sample.res
-
-### 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:X64
-!endif
-!if "$(TARGET_CPU)" == "IA64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
-!if "$(TARGET_CPU)" == "amd64"
-LINK_TARGET_CPU = /MACHINE:X64
-!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 "$(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_INFO)" == "default"
-__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_2 =
-!endif
-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO_2 =
-!endif
-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_3_p = /D_DEBUG
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_3_p =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_3_p =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_3_p = /D_DEBUG
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_3_p_1 = /d _DEBUG
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_3_p_1 =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_3_p_1 =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_3_p_1 = /d _DEBUG
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_4 = d
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_4 =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_4 =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_4 = d
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_5 =
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_5 = /opt:ref /opt:icf
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_5 = /opt:ref /opt:icf
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_5 =
-!endif
-!if "$(BUILD)" == "debug"
-__OPTIMIZEFLAG_6 = /Od
-!endif
-!if "$(BUILD)" == "release"
-__OPTIMIZEFLAG_6 = /O2
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREADSFLAG_9 = L
-!endif
-!if "$(USE_THREADS)" == "1"
-__THREADSFLAG_9 = T
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_10 = D
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_10 = $(__THREADSFLAG_9)
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTIFLAG_11 =
-!endif
-!if "$(USE_RTTI)" == "1"
-__RTTIFLAG_11 = /GR
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONSFLAG_12 =
-!endif
-!if "$(USE_EXCEPTIONS)" == "1"
-__EXCEPTIONSFLAG_12 = /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 "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
-!endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
-!endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__
-!endif
-!if "$(DEBUG_FLAG)" == "0"
-__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0
-!endif
-!if "$(DEBUG_FLAG)" == "0"
-__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-__NDEBUG_DEFINE_p = /DNDEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__NDEBUG_DEFINE_p = /DNDEBUG
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-__NDEBUG_DEFINE_p_1 = /d NDEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__NDEBUG_DEFINE_p_1 = /d NDEBUG
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p = /DwxNO_RTTI
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p_1 = /d wxNO_RTTI
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p = /DwxNO_THREADS
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p_1 = /d wxNO_THREADS
-!endif
-!if "$(UNICODE)" == "0"
-__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p = /D_UNICODE
-!endif
-!if "$(UNICODE)" == "0"
-__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p_1 = /d _UNICODE
-!endif
-!if "$(MSLU)" == "1"
-__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
-!endif
-!if "$(MSLU)" == "1"
-__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1
-!endif
-!if "$(USE_CAIRO)" == "1"
-____CAIRO_INCLUDEDIR_FILENAMES_p = /I$(CAIRO_ROOT)\include\cairo
-!endif
-!if "$(USE_CAIRO)" == "1"
-____CAIRO_INCLUDEDIR_FILENAMES_1_p = /i $(CAIRO_ROOT)\include\cairo
-!endif
-!if "$(SHARED)" == "1"
-__DLLFLAG_p = /DWXUSINGDLL
-!endif
-!if "$(SHARED)" == "1"
-__DLLFLAG_p_1 = /d WXUSINGDLL
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_ADV_p = \
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_CORE_p = \
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
-!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 "$(USE_GUI)" == "1"
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
-!endif
-!if "$(MSLU)" == "1"
-__UNICOWS_LIB_p = unicows.lib
-!endif
-!if "$(USE_CAIRO)" == "1"
-__CAIRO_LIB_p = cairo.lib
-!endif
-!if "$(USE_CAIRO)" == "1"
-____CAIRO_LIBDIR_FILENAMES_p = /LIBPATH:$(CAIRO_ROOT)\lib
-!endif
-
-
-all: $(OBJS)
-$(OBJS):
-       -if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all: $(OBJS)\treelist.exe
-
-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)\treelist.exe del $(OBJS)\treelist.exe
-       -if exist $(OBJS)\treelist.ilk del $(OBJS)\treelist.ilk
-       -if exist $(OBJS)\treelist.pdb del $(OBJS)\treelist.pdb
-
-$(OBJS)\treelist.exe: $(TREELIST_OBJECTS) $(OBJS)\treelist_sample.res
-       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\treelist.pdb" $(__DEBUGINFO_2)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<
-       $(TREELIST_OBJECTS) $(TREELIST_RESOURCES)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_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
-<<
-
-$(OBJS)\treelist_sample.res: .\..\..\samples\sample.rc
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc
-
-$(OBJS)\treelist_treelist.obj: .\treelist.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(TREELIST_CXXFLAGS) .\treelist.cpp
+# =========================================================================\r
+#     This makefile was generated by\r
+#     Bakefile 0.2.9 (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
+TREELIST_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \\r
+       $(__DEBUGINFO_0) /Fd$(OBJS)\treelist.pdb $(____DEBUGRUNTIME_3_p) \\r
+       $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
+       $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \\r
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \\r
+       $(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include \\r
+       $(____CAIRO_INCLUDEDIR_FILENAMES_p) /W4 /I. $(__DLLFLAG_p) /D_WINDOWS \\r
+       /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) \\r
+       $(CPPFLAGS) $(CXXFLAGS)\r
+TREELIST_OBJECTS =  \\r
+       $(OBJS)\treelist_treelist.obj\r
+TREELIST_RESOURCES =  \\r
+       $(OBJS)\treelist_sample.res\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:X64\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:X64\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 "$(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_INFO)" == "default"\r
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)\r
+!endif\r
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
+__DEBUGINFO_2 = \r
+!endif\r
+!if "$(DEBUG_INFO)" == "0"\r
+__DEBUGINFO_2 = \r
+!endif\r
+!if "$(DEBUG_INFO)" == "1"\r
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)\r
+!endif\r
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
+____DEBUGRUNTIME_3_p = /D_DEBUG\r
+!endif\r
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
+____DEBUGRUNTIME_3_p = \r
+!endif\r
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
+____DEBUGRUNTIME_3_p = \r
+!endif\r
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
+____DEBUGRUNTIME_3_p = /D_DEBUG\r
+!endif\r
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG\r
+!endif\r
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
+____DEBUGRUNTIME_3_p_1 = \r
+!endif\r
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
+____DEBUGRUNTIME_3_p_1 = \r
+!endif\r
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG\r
+!endif\r
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
+__DEBUGRUNTIME_4 = d\r
+!endif\r
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
+__DEBUGRUNTIME_4 = \r
+!endif\r
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
+__DEBUGRUNTIME_4 = \r
+!endif\r
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
+__DEBUGRUNTIME_4 = d\r
+!endif\r
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
+__DEBUGRUNTIME_5 = \r
+!endif\r
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf\r
+!endif\r
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf\r
+!endif\r
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
+__DEBUGRUNTIME_5 = \r
+!endif\r
+!if "$(BUILD)" == "debug"\r
+__OPTIMIZEFLAG_6 = /Od\r
+!endif\r
+!if "$(BUILD)" == "release"\r
+__OPTIMIZEFLAG_6 = /O2\r
+!endif\r
+!if "$(USE_THREADS)" == "0"\r
+__THREADSFLAG_9 = L\r
+!endif\r
+!if "$(USE_THREADS)" == "1"\r
+__THREADSFLAG_9 = T\r
+!endif\r
+!if "$(RUNTIME_LIBS)" == "dynamic"\r
+__RUNTIME_LIBS_10 = D\r
+!endif\r
+!if "$(RUNTIME_LIBS)" == "static"\r
+__RUNTIME_LIBS_10 = $(__THREADSFLAG_9)\r
+!endif\r
+!if "$(USE_RTTI)" == "0"\r
+__RTTIFLAG_11 = \r
+!endif\r
+!if "$(USE_RTTI)" == "1"\r
+__RTTIFLAG_11 = /GR\r
+!endif\r
+!if "$(USE_EXCEPTIONS)" == "0"\r
+__EXCEPTIONSFLAG_12 = \r
+!endif\r
+!if "$(USE_EXCEPTIONS)" == "1"\r
+__EXCEPTIONSFLAG_12 = /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 "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
+!endif\r
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
+!endif\r
+!if "$(WXUNIV)" == "1"\r
+__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__\r
+!endif\r
+!if "$(WXUNIV)" == "1"\r
+__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__\r
+!endif\r
+!if "$(DEBUG_FLAG)" == "0"\r
+__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0\r
+!endif\r
+!if "$(DEBUG_FLAG)" == "0"\r
+__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0\r
+!endif\r
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
+__NDEBUG_DEFINE_p = /DNDEBUG\r
+!endif\r
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
+__NDEBUG_DEFINE_p = /DNDEBUG\r
+!endif\r
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
+__NDEBUG_DEFINE_p_1 = /d NDEBUG\r
+!endif\r
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
+__NDEBUG_DEFINE_p_1 = /d NDEBUG\r
+!endif\r
+!if "$(USE_EXCEPTIONS)" == "0"\r
+__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS\r
+!endif\r
+!if "$(USE_EXCEPTIONS)" == "0"\r
+__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS\r
+!endif\r
+!if "$(USE_RTTI)" == "0"\r
+__RTTI_DEFINE_p = /DwxNO_RTTI\r
+!endif\r
+!if "$(USE_RTTI)" == "0"\r
+__RTTI_DEFINE_p_1 = /d wxNO_RTTI\r
+!endif\r
+!if "$(USE_THREADS)" == "0"\r
+__THREAD_DEFINE_p = /DwxNO_THREADS\r
+!endif\r
+!if "$(USE_THREADS)" == "0"\r
+__THREAD_DEFINE_p_1 = /d wxNO_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 "$(UNICODE)" == "0"\r
+__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0\r
+!endif\r
+!if "$(UNICODE)" == "1"\r
+__UNICODE_DEFINE_p_1 = /d _UNICODE\r
+!endif\r
+!if "$(MSLU)" == "1"\r
+__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1\r
+!endif\r
+!if "$(MSLU)" == "1"\r
+__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1\r
+!endif\r
+!if "$(USE_CAIRO)" == "1"\r
+____CAIRO_INCLUDEDIR_FILENAMES_p = /I$(CAIRO_ROOT)\include\cairo\r
+!endif\r
+!if "$(USE_CAIRO)" == "1"\r
+____CAIRO_INCLUDEDIR_FILENAMES_1_p = /i $(CAIRO_ROOT)\include\cairo\r
+!endif\r
+!if "$(SHARED)" == "1"\r
+__DLLFLAG_p = /DWXUSINGDLL\r
+!endif\r
+!if "$(SHARED)" == "1"\r
+__DLLFLAG_p_1 = /d WXUSINGDLL\r
+!endif\r
+!if "$(MONOLITHIC)" == "0"\r
+__WXLIB_ADV_p = \\r
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib\r
+!endif\r
+!if "$(MONOLITHIC)" == "0"\r
+__WXLIB_CORE_p = \\r
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\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 "$(USE_GUI)" == "1"\r
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
+!endif\r
+!if "$(USE_GUI)" == "1"\r
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
+!endif\r
+!if "$(USE_GUI)" == "1"\r
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
+!endif\r
+!if "$(MSLU)" == "1"\r
+__UNICOWS_LIB_p = unicows.lib\r
+!endif\r
+!if "$(USE_CAIRO)" == "1"\r
+__CAIRO_LIB_p = cairo.lib\r
+!endif\r
+!if "$(USE_CAIRO)" == "1"\r
+____CAIRO_LIBDIR_FILENAMES_p = /LIBPATH:$(CAIRO_ROOT)\lib\r
+!endif\r
+\r
+\r
+all: $(OBJS)\r
+$(OBJS):\r
+       -if not exist $(OBJS) mkdir $(OBJS)\r
+\r
+### Targets: ###\r
+\r
+all: $(OBJS)\treelist.exe\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)\treelist.exe del $(OBJS)\treelist.exe\r
+       -if exist $(OBJS)\treelist.ilk del $(OBJS)\treelist.ilk\r
+       -if exist $(OBJS)\treelist.pdb del $(OBJS)\treelist.pdb\r
+\r
+$(OBJS)\treelist.exe: $(TREELIST_OBJECTS) $(OBJS)\treelist_sample.res\r
+       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\treelist.pdb" $(__DEBUGINFO_2)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<\r
+       $(TREELIST_OBJECTS) $(TREELIST_RESOURCES)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_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
+\r
+$(OBJS)\treelist_sample.res: .\..\..\samples\sample.rc\r
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc\r
+\r
+$(OBJS)\treelist_treelist.obj: .\treelist.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(TREELIST_CXXFLAGS) .\treelist.cpp\r
+\r
index 3efad3b09eb90032c78b2a7f0e9b14750378c2b2..c902b84a74562b0534738088cc630e2b8f7f840c 100644 (file)
-# =========================================================================
-#     This makefile was generated by
-#     Bakefile 0.2.9 (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
-__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
-__WXLIB_ADV_p =
-!ifeq MONOLITHIC 0
-__WXLIB_ADV_p = &
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
-!endif
-__WXLIB_CORE_p =
-!ifeq MONOLITHIC 0
-__WXLIB_CORE_p = &
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
-!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
-__LIB_TIFF_p =
-!ifeq USE_GUI 1
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
-!endif
-__LIB_JPEG_p =
-!ifeq USE_GUI 1
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
-!endif
-__LIB_PNG_p =
-!ifeq USE_GUI 1
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
-!endif
-__CAIRO_LIB_p =
-!ifeq USE_CAIRO 1
-__CAIRO_LIB_p = cairo.lib
-!endif
-____CAIRO_LIBDIR_FILENAMES_p =
-!ifeq USE_CAIRO 1
-____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib
-!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
-__NDEBUG_DEFINE_p =
-!ifeq BUILD release
-__NDEBUG_DEFINE_p = -dNDEBUG
-!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
-____CAIRO_INCLUDEDIR_FILENAMES =
-!ifeq USE_CAIRO 1
-____CAIRO_INCLUDEDIR_FILENAMES = -i=$(CAIRO_ROOT)\include\cairo
-!endif
-__DLLFLAG_p =
-!ifeq SHARED 1
-__DLLFLAG_p = -dWXUSINGDLL
-!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)
-TREELIST_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
-       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
-       $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) &
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) &
-       -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx -wcd=549 -wcd=656 &
-       -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH &
-       $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS)
-TREELIST_OBJECTS =  &
-       $(OBJS)\treelist_treelist.obj
-
-
-all : $(OBJS)
-$(OBJS) :
-       -if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all : .SYMBOLIC $(OBJS)\treelist.exe
-
-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)\treelist.exe del $(OBJS)\treelist.exe
-
-$(OBJS)\treelist.exe :  $(TREELIST_OBJECTS) $(OBJS)\treelist_sample.res
-       @%create $(OBJS)\treelist.lbc
-       @%append $(OBJS)\treelist.lbc option quiet
-       @%append $(OBJS)\treelist.lbc name $^@
-       @%append $(OBJS)\treelist.lbc option caseexact
-       @%append $(OBJS)\treelist.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)
-       @for %i in ($(TREELIST_OBJECTS)) do @%append $(OBJS)\treelist.lbc file %i
-       @for %i in ( $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__CAIRO_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)\treelist.lbc library %i
-       @%append $(OBJS)\treelist.lbc option resource=$(OBJS)\treelist_sample.res
-       @for %i in () do @%append $(OBJS)\treelist.lbc option stack=%i
-       wlink @$(OBJS)\treelist.lbc
-
-$(OBJS)\treelist_sample.res :  .AUTODEPEND .\..\..\samples\sample.rc
-       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
-
-$(OBJS)\treelist_treelist.obj :  .AUTODEPEND .\treelist.cpp
-       $(CXX) -bt=nt -zq -fo=$^@ $(TREELIST_CXXFLAGS) $<
+# =========================================================================\r
+#     This makefile was generated by\r
+#     Bakefile 0.2.9 (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
+__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
+__WXLIB_ADV_p =\r
+!ifeq MONOLITHIC 0\r
+__WXLIB_ADV_p = &\r
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib\r
+!endif\r
+__WXLIB_CORE_p =\r
+!ifeq MONOLITHIC 0\r
+__WXLIB_CORE_p = &\r
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\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
+__LIB_TIFF_p =\r
+!ifeq USE_GUI 1\r
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
+!endif\r
+__LIB_JPEG_p =\r
+!ifeq USE_GUI 1\r
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
+!endif\r
+__LIB_PNG_p =\r
+!ifeq USE_GUI 1\r
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
+!endif\r
+__CAIRO_LIB_p =\r
+!ifeq USE_CAIRO 1\r
+__CAIRO_LIB_p = cairo.lib\r
+!endif\r
+____CAIRO_LIBDIR_FILENAMES_p =\r
+!ifeq USE_CAIRO 1\r
+____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib\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
+__NDEBUG_DEFINE_p =\r
+!ifeq BUILD release\r
+__NDEBUG_DEFINE_p = -dNDEBUG\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
+____CAIRO_INCLUDEDIR_FILENAMES =\r
+!ifeq USE_CAIRO 1\r
+____CAIRO_INCLUDEDIR_FILENAMES = -i=$(CAIRO_ROOT)\include\cairo\r
+!endif\r
+__DLLFLAG_p =\r
+!ifeq SHARED 1\r
+__DLLFLAG_p = -dWXUSINGDLL\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
+TREELIST_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &\r
+       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
+       $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) &\r
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) &\r
+       -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx -wcd=549 -wcd=656 &\r
+       -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH &\r
+       $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS)\r
+TREELIST_OBJECTS =  &\r
+       $(OBJS)\treelist_treelist.obj\r
+\r
+\r
+all : $(OBJS)\r
+$(OBJS) :\r
+       -if not exist $(OBJS) mkdir $(OBJS)\r
+\r
+### Targets: ###\r
+\r
+all : .SYMBOLIC $(OBJS)\treelist.exe\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)\treelist.exe del $(OBJS)\treelist.exe\r
+\r
+$(OBJS)\treelist.exe :  $(TREELIST_OBJECTS) $(OBJS)\treelist_sample.res\r
+       @%create $(OBJS)\treelist.lbc\r
+       @%append $(OBJS)\treelist.lbc option quiet\r
+       @%append $(OBJS)\treelist.lbc name $^@\r
+       @%append $(OBJS)\treelist.lbc option caseexact\r
+       @%append $(OBJS)\treelist.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)\r
+       @for %i in ($(TREELIST_OBJECTS)) do @%append $(OBJS)\treelist.lbc file %i\r
+       @for %i in ( $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__CAIRO_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)\treelist.lbc library %i\r
+       @%append $(OBJS)\treelist.lbc option resource=$(OBJS)\treelist_sample.res\r
+       @for %i in () do @%append $(OBJS)\treelist.lbc option stack=%i\r
+       wlink @$(OBJS)\treelist.lbc\r
+\r
+$(OBJS)\treelist_sample.res :  .AUTODEPEND .\..\..\samples\sample.rc\r
+       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<\r
+\r
+$(OBJS)\treelist_treelist.obj :  .AUTODEPEND .\treelist.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(TREELIST_CXXFLAGS) $<\r
+\r
index 5ad3421cf013db58f8a56db0eefa5eb968621bcc..7dbe2dfbd557ad068a54206101d4fc358c6df53f 100644 (file)
@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.9
-WX_VERSION = $(WX_RELEASE).3
+WX_VERSION = $(WX_RELEASE).4
 LIBDIRNAME = $(wx_top_builddir)/lib
 TYPETEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
index 6f01a1965045b9233df58805629ef7824137af5f..c9c72efcc85dca28ffd178d1ebb2ca7e29b71042 100644 (file)
@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.9
-WX_VERSION = $(WX_RELEASE).3
+WX_VERSION = $(WX_RELEASE).4
 LIBDIRNAME = $(wx_top_builddir)/lib
 UIACTION_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
index 772dac5c0c11008ddbbec9728b3de192661e2a70..e298babf486814561255c9739cdc2273c4e5055f 100644 (file)
@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.9
-WX_VERSION = $(WX_RELEASE).3
+WX_VERSION = $(WX_RELEASE).4
 LIBDIRNAME = $(wx_top_builddir)/lib
 VALIDATE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
index ce1566176f03055c967b0342b6cc8fb227d855fb..b7e672b91e74fcd89f4e2385e8fc6fb96fa7deaa 100644 (file)
@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.9
-WX_VERSION = $(WX_RELEASE).3
+WX_VERSION = $(WX_RELEASE).4
 LIBDIRNAME = $(wx_top_builddir)/lib
 VSTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
index 537b957a6cb5759125ef4de2ec790d2cabc2d339..78ff425cf24a50343705bcdf3c18adc09dddfa7c 100644 (file)
@@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.9
-WX_VERSION = $(WX_RELEASE).3
+WX_VERSION = $(WX_RELEASE).4
 LIBDIRNAME = $(wx_top_builddir)/lib
 WEBVIEW_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
index 5d45dfeb0321aa26911d0db61bb5cea0e0fc5b26..ca8179438934ab56ed401bd769eb5d21dc4815e3 100644 (file)
@@ -166,7 +166,7 @@ __DLLFLAG_p = -DWXUSINGDLL
 !if "$(SHARED)" == "1"\r
 __DLLFLAG_p_1 = -dWXUSINGDLL\r
 !endif\r
-!if "$(MONOLITHIC)" == "0" && "$(USE_WEBVIEW)" == "1"
+!if "$(MONOLITHIC)" == "0" && "$(USE_WEBVIEW)" == "1"\r
 __WXLIB_WEBVIEW_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview.lib\r
 !endif\r
index 3071fa5efcdcda25b4edf6b6ba01accd519ec213..a6330229d737b6683f3858100ceeb6dc2b186cbd 100644 (file)
@@ -152,11 +152,11 @@ ifeq ($(SHARED),1)
 __DLLFLAG_p_1 = --define WXUSINGDLL\r
 endif\r
 ifeq ($(MONOLITHIC),0)\r
-ifeq ($(USE_WEBVIEW),1)
+ifeq ($(USE_WEBVIEW),1)\r
 __WXLIB_WEBVIEW_p = \\r
        -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview\r
 endif\r
-endif
+endif\r
 ifeq ($(MONOLITHIC),0)\r
 __WXLIB_STC_p = \\r
        -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc\r
index 5cf13328ec3450faa39f390046be2aa73afd703f..dbc8fbb98ddce3c381d6d036d95c5785c3cf5b99 100644 (file)
-# =========================================================================
-#     This makefile was generated by
-#     Bakefile 0.2.9 (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)
-WEBVIEW_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
-       $(__DEBUGINFO_0) /Fd$(OBJS)\webview.pdb $(____DEBUGRUNTIME_3_p) \
-       $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \
-       $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
-       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
-       $(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include \
-       $(____CAIRO_INCLUDEDIR_FILENAMES_p) /W4 /I. $(__DLLFLAG_p) /D_WINDOWS \
-       /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) \
-       $(CPPFLAGS) $(CXXFLAGS)
-WEBVIEW_OBJECTS =  \
-       $(OBJS)\webview_webview.obj
-WEBVIEW_RESOURCES =  \
-       $(OBJS)\webview_sample.res
-
-### 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:X64
-!endif
-!if "$(TARGET_CPU)" == "IA64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
-!if "$(TARGET_CPU)" == "amd64"
-LINK_TARGET_CPU = /MACHINE:X64
-!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 "$(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_INFO)" == "default"
-__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_2 =
-!endif
-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO_2 =
-!endif
-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_3_p = /D_DEBUG
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_3_p =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_3_p =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_3_p = /D_DEBUG
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_3_p_1 = /d _DEBUG
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_3_p_1 =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_3_p_1 =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_3_p_1 = /d _DEBUG
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_4 = d
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_4 =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_4 =
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_4 = d
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_5 =
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_5 = /opt:ref /opt:icf
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_5 = /opt:ref /opt:icf
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_5 =
-!endif
-!if "$(BUILD)" == "debug"
-__OPTIMIZEFLAG_6 = /Od
-!endif
-!if "$(BUILD)" == "release"
-__OPTIMIZEFLAG_6 = /O2
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREADSFLAG_9 = L
-!endif
-!if "$(USE_THREADS)" == "1"
-__THREADSFLAG_9 = T
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_10 = D
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_10 = $(__THREADSFLAG_9)
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTIFLAG_11 =
-!endif
-!if "$(USE_RTTI)" == "1"
-__RTTIFLAG_11 = /GR
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONSFLAG_12 =
-!endif
-!if "$(USE_EXCEPTIONS)" == "1"
-__EXCEPTIONSFLAG_12 = /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 "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
-!endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
-!endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__
-!endif
-!if "$(DEBUG_FLAG)" == "0"
-__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0
-!endif
-!if "$(DEBUG_FLAG)" == "0"
-__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-__NDEBUG_DEFINE_p = /DNDEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__NDEBUG_DEFINE_p = /DNDEBUG
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-__NDEBUG_DEFINE_p_1 = /d NDEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__NDEBUG_DEFINE_p_1 = /d NDEBUG
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p = /DwxNO_RTTI
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p_1 = /d wxNO_RTTI
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p = /DwxNO_THREADS
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p_1 = /d wxNO_THREADS
-!endif
-!if "$(UNICODE)" == "0"
-__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p = /D_UNICODE
-!endif
-!if "$(UNICODE)" == "0"
-__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p_1 = /d _UNICODE
-!endif
-!if "$(MSLU)" == "1"
-__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
-!endif
-!if "$(MSLU)" == "1"
-__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1
-!endif
-!if "$(USE_CAIRO)" == "1"
-____CAIRO_INCLUDEDIR_FILENAMES_p = /I$(CAIRO_ROOT)\include\cairo
-!endif
-!if "$(USE_CAIRO)" == "1"
-____CAIRO_INCLUDEDIR_FILENAMES_1_p = /i $(CAIRO_ROOT)\include\cairo
-!endif
-!if "$(SHARED)" == "1"
-__DLLFLAG_p = /DWXUSINGDLL
-!endif
-!if "$(SHARED)" == "1"
-__DLLFLAG_p_1 = /d WXUSINGDLL
-!endif
-!if "$(MONOLITHIC)" == "0" && "$(USE_WEBVIEW)" == "1"
-__WXLIB_WEBVIEW_p = \
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview.lib
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_STC_p = \
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.lib
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_ADV_p = \
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_CORE_p = \
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
-!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 "$(USE_GUI)" == "1"
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
-!endif
-!if "$(MSLU)" == "1"
-__UNICOWS_LIB_p = unicows.lib
-!endif
-!if "$(USE_CAIRO)" == "1"
-__CAIRO_LIB_p = cairo.lib
-!endif
-!if "$(USE_CAIRO)" == "1"
-____CAIRO_LIBDIR_FILENAMES_p = /LIBPATH:$(CAIRO_ROOT)\lib
-!endif
-
-
-all: $(OBJS)
-$(OBJS):
-       -if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all: $(OBJS)\webview.exe
-
-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)\webview.exe del $(OBJS)\webview.exe
-       -if exist $(OBJS)\webview.ilk del $(OBJS)\webview.ilk
-       -if exist $(OBJS)\webview.pdb del $(OBJS)\webview.pdb
-
-$(OBJS)\webview.exe: $(WEBVIEW_OBJECTS) $(OBJS)\webview_sample.res
-       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\webview.pdb" $(__DEBUGINFO_2)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<
-       $(WEBVIEW_OBJECTS) $(WEBVIEW_RESOURCES)  $(__WXLIB_WEBVIEW_p)  $(__WXLIB_STC_p)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  wxscintilla$(WXDEBUGFLAG).lib $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_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
-<<
-
-$(OBJS)\webview_webview.obj: .\webview.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(WEBVIEW_CXXFLAGS) .\webview.cpp
-
-$(OBJS)\webview_sample.res: .\..\sample.rc
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\sample.rc
+# =========================================================================\r
+#     This makefile was generated by\r
+#     Bakefile 0.2.9 (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
+WEBVIEW_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \\r
+       $(__DEBUGINFO_0) /Fd$(OBJS)\webview.pdb $(____DEBUGRUNTIME_3_p) \\r
+       $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
+       $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \\r
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \\r
+       $(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include \\r
+       $(____CAIRO_INCLUDEDIR_FILENAMES_p) /W4 /I. $(__DLLFLAG_p) /D_WINDOWS \\r
+       /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) \\r
+       $(CPPFLAGS) $(CXXFLAGS)\r
+WEBVIEW_OBJECTS =  \\r
+       $(OBJS)\webview_webview.obj\r
+WEBVIEW_RESOURCES =  \\r
+       $(OBJS)\webview_sample.res\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:X64\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:X64\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 "$(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_INFO)" == "default"\r
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)\r
+!endif\r
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"\r
+__DEBUGINFO_2 = \r
+!endif\r
+!if "$(DEBUG_INFO)" == "0"\r
+__DEBUGINFO_2 = \r
+!endif\r
+!if "$(DEBUG_INFO)" == "1"\r
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)\r
+!endif\r
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
+____DEBUGRUNTIME_3_p = /D_DEBUG\r
+!endif\r
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
+____DEBUGRUNTIME_3_p = \r
+!endif\r
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
+____DEBUGRUNTIME_3_p = \r
+!endif\r
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
+____DEBUGRUNTIME_3_p = /D_DEBUG\r
+!endif\r
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG\r
+!endif\r
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
+____DEBUGRUNTIME_3_p_1 = \r
+!endif\r
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
+____DEBUGRUNTIME_3_p_1 = \r
+!endif\r
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG\r
+!endif\r
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
+__DEBUGRUNTIME_4 = d\r
+!endif\r
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
+__DEBUGRUNTIME_4 = \r
+!endif\r
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
+__DEBUGRUNTIME_4 = \r
+!endif\r
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
+__DEBUGRUNTIME_4 = d\r
+!endif\r
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
+__DEBUGRUNTIME_5 = \r
+!endif\r
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf\r
+!endif\r
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf\r
+!endif\r
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"\r
+__DEBUGRUNTIME_5 = \r
+!endif\r
+!if "$(BUILD)" == "debug"\r
+__OPTIMIZEFLAG_6 = /Od\r
+!endif\r
+!if "$(BUILD)" == "release"\r
+__OPTIMIZEFLAG_6 = /O2\r
+!endif\r
+!if "$(USE_THREADS)" == "0"\r
+__THREADSFLAG_9 = L\r
+!endif\r
+!if "$(USE_THREADS)" == "1"\r
+__THREADSFLAG_9 = T\r
+!endif\r
+!if "$(RUNTIME_LIBS)" == "dynamic"\r
+__RUNTIME_LIBS_10 = D\r
+!endif\r
+!if "$(RUNTIME_LIBS)" == "static"\r
+__RUNTIME_LIBS_10 = $(__THREADSFLAG_9)\r
+!endif\r
+!if "$(USE_RTTI)" == "0"\r
+__RTTIFLAG_11 = \r
+!endif\r
+!if "$(USE_RTTI)" == "1"\r
+__RTTIFLAG_11 = /GR\r
+!endif\r
+!if "$(USE_EXCEPTIONS)" == "0"\r
+__EXCEPTIONSFLAG_12 = \r
+!endif\r
+!if "$(USE_EXCEPTIONS)" == "1"\r
+__EXCEPTIONSFLAG_12 = /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 "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"\r
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
+!endif\r
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"\r
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__\r
+!endif\r
+!if "$(WXUNIV)" == "1"\r
+__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__\r
+!endif\r
+!if "$(WXUNIV)" == "1"\r
+__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__\r
+!endif\r
+!if "$(DEBUG_FLAG)" == "0"\r
+__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0\r
+!endif\r
+!if "$(DEBUG_FLAG)" == "0"\r
+__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0\r
+!endif\r
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
+__NDEBUG_DEFINE_p = /DNDEBUG\r
+!endif\r
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
+__NDEBUG_DEFINE_p = /DNDEBUG\r
+!endif\r
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
+__NDEBUG_DEFINE_p_1 = /d NDEBUG\r
+!endif\r
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
+__NDEBUG_DEFINE_p_1 = /d NDEBUG\r
+!endif\r
+!if "$(USE_EXCEPTIONS)" == "0"\r
+__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS\r
+!endif\r
+!if "$(USE_EXCEPTIONS)" == "0"\r
+__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS\r
+!endif\r
+!if "$(USE_RTTI)" == "0"\r
+__RTTI_DEFINE_p = /DwxNO_RTTI\r
+!endif\r
+!if "$(USE_RTTI)" == "0"\r
+__RTTI_DEFINE_p_1 = /d wxNO_RTTI\r
+!endif\r
+!if "$(USE_THREADS)" == "0"\r
+__THREAD_DEFINE_p = /DwxNO_THREADS\r
+!endif\r
+!if "$(USE_THREADS)" == "0"\r
+__THREAD_DEFINE_p_1 = /d wxNO_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 "$(UNICODE)" == "0"\r
+__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0\r
+!endif\r
+!if "$(UNICODE)" == "1"\r
+__UNICODE_DEFINE_p_1 = /d _UNICODE\r
+!endif\r
+!if "$(MSLU)" == "1"\r
+__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1\r
+!endif\r
+!if "$(MSLU)" == "1"\r
+__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1\r
+!endif\r
+!if "$(USE_CAIRO)" == "1"\r
+____CAIRO_INCLUDEDIR_FILENAMES_p = /I$(CAIRO_ROOT)\include\cairo\r
+!endif\r
+!if "$(USE_CAIRO)" == "1"\r
+____CAIRO_INCLUDEDIR_FILENAMES_1_p = /i $(CAIRO_ROOT)\include\cairo\r
+!endif\r
+!if "$(SHARED)" == "1"\r
+__DLLFLAG_p = /DWXUSINGDLL\r
+!endif\r
+!if "$(SHARED)" == "1"\r
+__DLLFLAG_p_1 = /d WXUSINGDLL\r
+!endif\r
+!if "$(MONOLITHIC)" == "0" && "$(USE_WEBVIEW)" == "1"\r
+__WXLIB_WEBVIEW_p = \\r
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview.lib\r
+!endif\r
+!if "$(MONOLITHIC)" == "0"\r
+__WXLIB_STC_p = \\r
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.lib\r
+!endif\r
+!if "$(MONOLITHIC)" == "0"\r
+__WXLIB_ADV_p = \\r
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib\r
+!endif\r
+!if "$(MONOLITHIC)" == "0"\r
+__WXLIB_CORE_p = \\r
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\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 "$(USE_GUI)" == "1"\r
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
+!endif\r
+!if "$(USE_GUI)" == "1"\r
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
+!endif\r
+!if "$(USE_GUI)" == "1"\r
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
+!endif\r
+!if "$(MSLU)" == "1"\r
+__UNICOWS_LIB_p = unicows.lib\r
+!endif\r
+!if "$(USE_CAIRO)" == "1"\r
+__CAIRO_LIB_p = cairo.lib\r
+!endif\r
+!if "$(USE_CAIRO)" == "1"\r
+____CAIRO_LIBDIR_FILENAMES_p = /LIBPATH:$(CAIRO_ROOT)\lib\r
+!endif\r
+\r
+\r
+all: $(OBJS)\r
+$(OBJS):\r
+       -if not exist $(OBJS) mkdir $(OBJS)\r
+\r
+### Targets: ###\r
+\r
+all: $(OBJS)\webview.exe\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)\webview.exe del $(OBJS)\webview.exe\r
+       -if exist $(OBJS)\webview.ilk del $(OBJS)\webview.ilk\r
+       -if exist $(OBJS)\webview.pdb del $(OBJS)\webview.pdb\r
+\r
+$(OBJS)\webview.exe: $(WEBVIEW_OBJECTS) $(OBJS)\webview_sample.res\r
+       link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\webview.pdb" $(__DEBUGINFO_2)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<\r
+       $(WEBVIEW_OBJECTS) $(WEBVIEW_RESOURCES)  $(__WXLIB_WEBVIEW_p)  $(__WXLIB_STC_p)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  wxscintilla$(WXDEBUGFLAG).lib $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_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
+\r
+$(OBJS)\webview_webview.obj: .\webview.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(WEBVIEW_CXXFLAGS) .\webview.cpp\r
+\r
+$(OBJS)\webview_sample.res: .\..\sample.rc\r
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\sample.rc\r
+\r
index 444fbc2346e798beed4ccb87e1038a7e3c31e4f2..02a480e97f75d2c06dd7e9dfa8c66d25c4fd5dc2 100644 (file)
@@ -139,11 +139,11 @@ __EXCEPTIONSFLAG_8 = -xs
 !endif\r
 __WXLIB_WEBVIEW_p =\r
 !ifeq MONOLITHIC 0\r
-!ifeq USE_WEBVIEW 1
+!ifeq USE_WEBVIEW 1\r
 __WXLIB_WEBVIEW_p = &\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview.lib\r
 !endif\r
-!endif
+!endif\r
 __WXLIB_STC_p =\r
 !ifeq MONOLITHIC 0\r
 __WXLIB_STC_p = &\r
index 40b0d45ec092c22b6847e939ab9ab7e101fa7ce3..49c80dba3ed45cf6dc966cda74ac9b4562aeb132 100644 (file)
@@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.9
-WX_VERSION = $(WX_RELEASE).3
+WX_VERSION = $(WX_RELEASE).4
 LIBDIRNAME = $(wx_top_builddir)/lib
 WIDGETS_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
index 059fea9adc91de929a9ccaca47e731eebebd315e..2927822c03c68e52942476c96c3647cd6335d84a 100644 (file)
@@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.9
-WX_VERSION = $(WX_RELEASE).3
+WX_VERSION = $(WX_RELEASE).4
 LIBDIRNAME = $(wx_top_builddir)/lib
 WIZARD_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
index 55d12c80327a5be0fc673f11b232d04acf1085a8..4618690a5a1f4692a0b8362f511e33b15acee8b7 100644 (file)
@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.9
-WX_VERSION = $(WX_RELEASE).3
+WX_VERSION = $(WX_RELEASE).4
 LIBDIRNAME = $(wx_top_builddir)/lib
 WRAPSIZER_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
index 9855f6aa9b428957bc0742d8818db5f377aef551..37865ea82e0556efdfd003067d097b1593b603f8 100644 (file)
@@ -43,7 +43,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.9
-WX_VERSION = $(WX_RELEASE).3
+WX_VERSION = $(WX_RELEASE).4
 LIBDIRNAME = $(wx_top_builddir)/lib
 XRCDEMO_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
index fce255c64cee3bd3cb1859b45b8fb161cb2ad179..98b2e38818d03b19956cd6ff6fb562503bb711d2 100644 (file)
@@ -256,7 +256,7 @@ $(OBJS)\xrcdemo.exe: $(XRCDEMO_OBJECTS)  $(OBJS)\xrcdemo_sample.res
 \r
 data: \r
        if not exist $(OBJS)\rc mkdir $(OBJS)\rc\r
-       for %f in (artprov.xpm artprov.xrc basicdlg.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc toolbar.xrc uncenter.xpm objref.xrc objrefdlg.xpm uncenter.xrc update.gif variable.xpm variable.xrc throbber.gif stop.xpm wxbanner.gif) do if not exist $(OBJS)\rc\%f copy .\rc\%f $(OBJS)\rc
+       for %f in (artprov.xpm artprov.xrc basicdlg.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc toolbar.xrc uncenter.xpm objref.xrc objrefdlg.xpm uncenter.xrc update.gif variable.xpm variable.xrc throbber.gif stop.xpm wxbanner.gif) do if not exist $(OBJS)\rc\%f copy .\rc\%f $(OBJS)\rc\r
 \r
 $(OBJS)\xrcdemo_sample.res: .\..\..\samples\sample.rc\r
        brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\..\samples\sample.rc\r
index 5da3226c0a03b42a6a52e5120a7b817bb7e547e8..8459b4b80ca42062aa663338bf7541053375852e 100644 (file)
@@ -243,7 +243,7 @@ $(OBJS)\xrcdemo.exe: $(XRCDEMO_OBJECTS) $(OBJS)\xrcdemo_sample_rc.o
 \r
 data: \r
        if not exist $(OBJS)\rc mkdir $(OBJS)\rc\r
-       for %%f in (artprov.xpm artprov.xrc basicdlg.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc toolbar.xrc uncenter.xpm objref.xrc objrefdlg.xpm uncenter.xrc update.gif variable.xpm variable.xrc throbber.gif stop.xpm wxbanner.gif) do if not exist $(OBJS)\rc\%%f copy .\rc\%%f $(OBJS)\rc
+       for %%f in (artprov.xpm artprov.xrc basicdlg.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc toolbar.xrc uncenter.xpm objref.xrc objrefdlg.xpm uncenter.xrc update.gif variable.xpm variable.xrc throbber.gif stop.xpm wxbanner.gif) do if not exist $(OBJS)\rc\%%f copy .\rc\%%f $(OBJS)\rc\r
 \r
 $(OBJS)\xrcdemo_sample_rc.o: ./../../samples/sample.rc\r
        windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH\r
index 3ca05cfbeb2cdae599c132bfe750875cb1888d4c..fde3fd3c77a620ed8a40783216b4ccd5f2e524c3 100644 (file)
@@ -366,7 +366,7 @@ $(OBJS)\xrcdemo.exe: $(XRCDEMO_OBJECTS) $(OBJS)\xrcdemo_sample.res
 \r
 data: \r
        if not exist $(OBJS)\rc mkdir $(OBJS)\rc\r
-       for %f in (artprov.xpm artprov.xrc basicdlg.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc toolbar.xrc uncenter.xpm objref.xrc objrefdlg.xpm uncenter.xrc update.gif variable.xpm variable.xrc throbber.gif stop.xpm wxbanner.gif) do if not exist $(OBJS)\rc\%f copy .\rc\%f $(OBJS)\rc
+       for %f in (artprov.xpm artprov.xrc basicdlg.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc toolbar.xrc uncenter.xpm objref.xrc objrefdlg.xpm uncenter.xrc update.gif variable.xpm variable.xrc throbber.gif stop.xpm wxbanner.gif) do if not exist $(OBJS)\rc\%f copy .\rc\%f $(OBJS)\rc\r
 \r
 $(OBJS)\xrcdemo_sample.res: .\..\..\samples\sample.rc\r
        rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc\r
index 9bcee4fd9fb09c8ddf110a422060103400c99953..d9ab7b2cdd9b2ef705536072169a21e03ecb5347 100644 (file)
@@ -286,7 +286,7 @@ $(OBJS)\xrcdemo.exe :  $(XRCDEMO_OBJECTS) $(OBJS)\xrcdemo_sample.res
 \r
 data : .SYMBOLIC \r
        if not exist $(OBJS)\rc mkdir $(OBJS)\rc\r
-       for %f in (artprov.xpm artprov.xrc basicdlg.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc toolbar.xrc uncenter.xpm objref.xrc objrefdlg.xpm uncenter.xrc update.gif variable.xpm variable.xrc throbber.gif stop.xpm wxbanner.gif) do if not exist $(OBJS)\rc\%f copy .\rc\%f $(OBJS)\rc
+       for %f in (artprov.xpm artprov.xrc basicdlg.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc toolbar.xrc uncenter.xpm objref.xrc objrefdlg.xpm uncenter.xrc update.gif variable.xpm variable.xrc throbber.gif stop.xpm wxbanner.gif) do if not exist $(OBJS)\rc\%f copy .\rc\%f $(OBJS)\rc\r
 \r
 $(OBJS)\xrcdemo_sample.res :  .AUTODEPEND .\..\..\samples\sample.rc\r
        wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<\r
index a9755ab7933a79907a19285d64546ce568a327a4..8eaacecdf9f8598cfcb5e1a721373595d114af02 100644 (file)
@@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.9
-WX_VERSION = $(WX_RELEASE).3
+WX_VERSION = $(WX_RELEASE).4
 LIBDIRNAME = $(wx_top_builddir)/lib
 XTI_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
index 04692b35f5fe12ca827e0d156cfc34831bdc48f5..489bd2e3ae2f1d7e827e016bc79820a0a0f3dfa0 100644 (file)
@@ -46,7 +46,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.9
-WX_VERSION = $(WX_RELEASE).3
+WX_VERSION = $(WX_RELEASE).4
 LIBDIRNAME = $(wx_top_builddir)/lib
 TEST_CXXFLAGS = $(__test_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
index 23f4811fbda08c0fbcd94396c84359dd20f9b3d6..e4ae0a34c073605a922c21aad00426d92fae52bb 100644 (file)
@@ -136,7 +136,7 @@ TEST_GUI_OBJECTS =  \
        $(OBJS)\test_gui_rect.obj \\r
        $(OBJS)\test_gui_size.obj \\r
        $(OBJS)\test_gui_point.obj \\r
-       $(OBJS)\test_gui_region.obj \
+       $(OBJS)\test_gui_region.obj \\r
        $(OBJS)\test_gui_bitmap.obj \\r
        $(OBJS)\test_gui_colour.obj \\r
        $(OBJS)\test_gui_ellipsization.obj \\r
@@ -283,7 +283,7 @@ ____CAIRO_INCLUDEDIR_FILENAMES_3_p = -i$(CAIRO_ROOT)\include\cairo
 !if "$(SHARED)" == "1"\r
 __DLLFLAG_p_3 = -dWXUSINGDLL\r
 !endif\r
-!if "$(MONOLITHIC)" == "0" && "$(USE_WEBVIEW)" == "1"
+!if "$(MONOLITHIC)" == "0" && "$(USE_WEBVIEW)" == "1"\r
 __WXLIB_WEBVIEW_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview.lib\r
 !endif\r
@@ -455,7 +455,7 @@ $(OBJS)\test.exe: $(OBJS)\test_dummy.obj  $(TEST_OBJECTS)
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\test_gui.exe: $(OBJS)\test_gui_dummy.obj  $(TEST_GUI_OBJECTS)  $(OBJS)\test_gui_sample.res\r
        ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) $(CPPUNIT_LIBS) -ap $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @&&|\r
-       c0x32.obj $(TEST_GUI_OBJECTS),$@,, $(__WXLIB_WEBVIEW_p) $(__WXLIB_RICHTEXT_p)  $(__WXLIB_MEDIA_p)  $(__WXLIB_XRC_p)  $(__WXLIB_XML_p)  $(__WXLIB_ADV_p)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_0).lib,, $(OBJS)\test_gui_sample.res
+       c0x32.obj $(TEST_GUI_OBJECTS),$@,, $(__WXLIB_WEBVIEW_p) $(__WXLIB_RICHTEXT_p)  $(__WXLIB_MEDIA_p)  $(__WXLIB_XRC_p)  $(__WXLIB_XML_p)  $(__WXLIB_ADV_p)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_0).lib,, $(OBJS)\test_gui_sample.res\r
 |\r
 !endif\r
 \r
@@ -747,9 +747,9 @@ $(OBJS)\test_gui_size.obj: .\geometry\size.cpp
 $(OBJS)\test_gui_point.obj: .\geometry\point.cpp\r
        $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\geometry\point.cpp\r
 \r
-$(OBJS)\test_gui_region.obj: .\geometry\region.cpp
-       $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\geometry\region.cpp
-
+$(OBJS)\test_gui_region.obj: .\geometry\region.cpp\r
+       $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\geometry\region.cpp\r
+\r
 $(OBJS)\test_gui_bitmap.obj: .\graphics\bitmap.cpp\r
        $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\graphics\bitmap.cpp\r
 \r
index 96286f2c8872ebb0974a921520fa31d202bc10b4..f501b45d05d632a6192fbec0d72b44bf85cbe0e7 100644 (file)
@@ -129,7 +129,7 @@ TEST_GUI_OBJECTS =  \
        $(OBJS)\test_gui_rect.o \\r
        $(OBJS)\test_gui_size.o \\r
        $(OBJS)\test_gui_point.o \\r
-       $(OBJS)\test_gui_region.o \
+       $(OBJS)\test_gui_region.o \\r
        $(OBJS)\test_gui_bitmap.o \\r
        $(OBJS)\test_gui_colour.o \\r
        $(OBJS)\test_gui_ellipsization.o \\r
@@ -280,11 +280,11 @@ ifeq ($(SHARED),1)
 __DLLFLAG_p_3 = --define WXUSINGDLL\r
 endif\r
 ifeq ($(MONOLITHIC),0)\r
-ifeq ($(USE_WEBVIEW),1)
+ifeq ($(USE_WEBVIEW),1)\r
 __WXLIB_WEBVIEW_p = \\r
        -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview\r
 endif\r
-endif
+endif\r
 ifeq ($(MONOLITHIC),0)\r
 __WXLIB_RICHTEXT_p = \\r
        -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext\r
@@ -439,7 +439,7 @@ $(OBJS)\test.exe: $(TEST_OBJECTS)
 \r
 ifeq ($(USE_GUI),1)\r
 $(OBJS)\test_gui.exe: $(TEST_GUI_OBJECTS) $(OBJS)\test_gui_sample_rc.o\r
-       $(CXX) -o $@ $(TEST_GUI_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) $(CPPUNIT_LIBS)  $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)  $(__WXLIB_WEBVIEW_p) $(__WXLIB_RICHTEXT_p)  $(__WXLIB_MEDIA_p)  $(__WXLIB_XRC_p)  $(__WXLIB_XML_p)  $(__WXLIB_ADV_p)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+       $(CXX) -o $@ $(TEST_GUI_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) $(CPPUNIT_LIBS)  $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)  $(__WXLIB_WEBVIEW_p) $(__WXLIB_RICHTEXT_p)  $(__WXLIB_MEDIA_p)  $(__WXLIB_XRC_p)  $(__WXLIB_XML_p)  $(__WXLIB_ADV_p)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet\r
 endif\r
 \r
 data: \r
@@ -730,9 +730,9 @@ $(OBJS)\test_gui_size.o: ./geometry/size.cpp
 $(OBJS)\test_gui_point.o: ./geometry/point.cpp\r
        $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<\r
 \r
-$(OBJS)\test_gui_region.o: ./geometry/region.cpp
-       $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-
+$(OBJS)\test_gui_region.o: ./geometry/region.cpp\r
+       $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<\r
+\r
 $(OBJS)\test_gui_bitmap.o: ./graphics/bitmap.cpp\r
        $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<\r
 \r
index 9f75605a2eea984d5690c1e5ff4282befa118761..ecfb2d9e0cf82b46a90a61ed85a7242e3d12f5b4 100644 (file)
@@ -131,7 +131,7 @@ TEST_GUI_OBJECTS =  \
        $(OBJS)\test_gui_rect.obj \\r
        $(OBJS)\test_gui_size.obj \\r
        $(OBJS)\test_gui_point.obj \\r
-       $(OBJS)\test_gui_region.obj \
+       $(OBJS)\test_gui_region.obj \\r
        $(OBJS)\test_gui_bitmap.obj \\r
        $(OBJS)\test_gui_colour.obj \\r
        $(OBJS)\test_gui_ellipsization.obj \\r
@@ -364,7 +364,7 @@ ____CAIRO_INCLUDEDIR_FILENAMES_3_p = /i $(CAIRO_ROOT)\include\cairo
 !if "$(SHARED)" == "1"\r
 __DLLFLAG_p_3 = /d WXUSINGDLL\r
 !endif\r
-!if "$(MONOLITHIC)" == "0" && "$(USE_WEBVIEW)" == "1"
+!if "$(MONOLITHIC)" == "0" && "$(USE_WEBVIEW)" == "1"\r
 __WXLIB_WEBVIEW_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview.lib\r
 !endif\r
@@ -581,7 +581,7 @@ $(OBJS)\test.exe: $(OBJS)\test_dummy.obj  $(TEST_OBJECTS)
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\test_gui.exe: $(OBJS)\test_gui_dummy.obj  $(TEST_GUI_OBJECTS) $(OBJS)\test_gui_sample.res\r
        link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\test_gui.pdb" $(__DEBUGINFO_19)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(CPPUNIT_LIBS) /SUBSYSTEM:CONSOLE $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<<\r
-       $(TEST_GUI_OBJECTS) $(TEST_GUI_RESOURCES)  $(__WXLIB_WEBVIEW_p) $(__WXLIB_RICHTEXT_p)  $(__WXLIB_MEDIA_p)  $(__WXLIB_XRC_p)  $(__WXLIB_XML_p)  $(__WXLIB_ADV_p)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_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
+       $(TEST_GUI_OBJECTS) $(TEST_GUI_RESOURCES)  $(__WXLIB_WEBVIEW_p) $(__WXLIB_RICHTEXT_p)  $(__WXLIB_MEDIA_p)  $(__WXLIB_XRC_p)  $(__WXLIB_XML_p)  $(__WXLIB_ADV_p)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_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
@@ -873,9 +873,9 @@ $(OBJS)\test_gui_size.obj: .\geometry\size.cpp
 $(OBJS)\test_gui_point.obj: .\geometry\point.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\geometry\point.cpp\r
 \r
-$(OBJS)\test_gui_region.obj: .\geometry\region.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\geometry\region.cpp
-
+$(OBJS)\test_gui_region.obj: .\geometry\region.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\geometry\region.cpp\r
+\r
 $(OBJS)\test_gui_bitmap.obj: .\graphics\bitmap.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\graphics\bitmap.cpp\r
 \r
index 42b3e410f0c5373b5e7dba343bf6307aba00bf2f..690d2dcc36ce52adce5ca6513a3b1e6f0712c49f 100644 (file)
@@ -78,11 +78,11 @@ __test_gui___depname = $(OBJS)\test_gui.exe
 !endif\r
 __WXLIB_WEBVIEW_p =\r
 !ifeq MONOLITHIC 0\r
-!ifeq USE_WEBVIEW 1
+!ifeq USE_WEBVIEW 1\r
 __WXLIB_WEBVIEW_p = &\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview.lib\r
 !endif\r
-!endif
+!endif\r
 __WXLIB_RICHTEXT_p =\r
 !ifeq MONOLITHIC 0\r
 __WXLIB_RICHTEXT_p = &\r
@@ -382,7 +382,7 @@ TEST_GUI_OBJECTS =  &
        $(OBJS)\test_gui_rect.obj &\r
        $(OBJS)\test_gui_size.obj &\r
        $(OBJS)\test_gui_point.obj &\r
-       $(OBJS)\test_gui_region.obj &
+       $(OBJS)\test_gui_region.obj &\r
        $(OBJS)\test_gui_bitmap.obj &\r
        $(OBJS)\test_gui_colour.obj &\r
        $(OBJS)\test_gui_ellipsization.obj &\r
@@ -496,7 +496,7 @@ $(OBJS)\test_gui.exe :  $(TEST_GUI_OBJECTS) $(OBJS)\test_gui_sample.res
        @%append $(OBJS)\test_gui.lbc option caseexact\r
        @%append $(OBJS)\test_gui.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) $(CPPUNIT_LIBS) system nt ref 'main_' $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)\r
        @for %i in ($(TEST_GUI_OBJECTS)) do @%append $(OBJS)\test_gui.lbc file %i\r
-       @for %i in ( $(__WXLIB_WEBVIEW_p) $(__WXLIB_RICHTEXT_p)  $(__WXLIB_MEDIA_p)  $(__WXLIB_XRC_p)  $(__WXLIB_XML_p)  $(__WXLIB_ADV_p)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__CAIRO_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)\test_gui.lbc library %i
+       @for %i in ( $(__WXLIB_WEBVIEW_p) $(__WXLIB_RICHTEXT_p)  $(__WXLIB_MEDIA_p)  $(__WXLIB_XRC_p)  $(__WXLIB_XML_p)  $(__WXLIB_ADV_p)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__CAIRO_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)\test_gui.lbc library %i\r
        @%append $(OBJS)\test_gui.lbc option resource=$(OBJS)\test_gui_sample.res\r
        @for %i in () do @%append $(OBJS)\test_gui.lbc option stack=%i\r
        wlink @$(OBJS)\test_gui.lbc\r
@@ -790,9 +790,9 @@ $(OBJS)\test_gui_size.obj :  .AUTODEPEND .\geometry\size.cpp
 $(OBJS)\test_gui_point.obj :  .AUTODEPEND .\geometry\point.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
 \r
-$(OBJS)\test_gui_region.obj :  .AUTODEPEND .\geometry\region.cpp
-       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
-
+$(OBJS)\test_gui_region.obj :  .AUTODEPEND .\geometry\region.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
+\r
 $(OBJS)\test_gui_bitmap.obj :  .AUTODEPEND .\graphics\bitmap.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
 \r
index e8729ec1cef41dc37c94c23022495ee8c1d5fec4..67c3188f7641b8e78fb1b86207317a843cc6ce9f 100644 (file)
@@ -461,10 +461,10 @@ SOURCE=.\geometry\rect.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\geometry\region.cpp
-# End Source File
-# Begin Source File
-
+SOURCE=.\geometry\region.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\controls\richtextctrltest.cpp\r
 # End Source File\r
 # Begin Source File\r
index 2e78bd0de1707b2e2251117959b12765db5b4e93..1a5249e3775aa2d8ff5f45ed3c997ff13d00ac68 100644 (file)
@@ -49,7 +49,7 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
-                               AdditionalDependencies="wxmsw29ud_webview.lib wxmsw29ud_richtext.lib  wxmsw29ud_media.lib  wxmsw29ud_xrc.lib  wxbase29ud_xml.lib  wxmsw29ud_adv.lib  wxmsw29ud_html.lib  wxmsw29ud_core.lib  wxbase29ud_net.lib  wxbase29ud.lib   wxtiffd.lib wxjpegd.lib wxpngd.lib  wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
+                               AdditionalDependencies="wxmsw29ud_webview.lib wxmsw29ud_richtext.lib  wxmsw29ud_media.lib  wxmsw29ud_xrc.lib  wxbase29ud_xml.lib  wxmsw29ud_adv.lib  wxmsw29ud_html.lib  wxmsw29ud_core.lib  wxbase29ud_net.lib  wxbase29ud.lib   wxtiffd.lib wxjpegd.lib wxpngd.lib  wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswud\test_gui.exe"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="TRUE"\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
-                               AdditionalDependencies="wxmsw29u_webview.lib wxmsw29u_richtext.lib  wxmsw29u_media.lib  wxmsw29u_xrc.lib  wxbase29u_xml.lib  wxmsw29u_adv.lib  wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
+                               AdditionalDependencies="wxmsw29u_webview.lib wxmsw29u_richtext.lib  wxmsw29u_media.lib  wxmsw29u_xrc.lib  wxbase29u_xml.lib  wxmsw29u_adv.lib  wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\test_gui.exe"\r
                                LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
-                               AdditionalDependencies="wxmswuniv29ud_webview.lib wxmswuniv29ud_richtext.lib  wxmswuniv29ud_media.lib  wxmswuniv29ud_xrc.lib  wxbase29ud_xml.lib  wxmswuniv29ud_adv.lib  wxmswuniv29ud_html.lib  wxmswuniv29ud_core.lib  wxbase29ud_net.lib  wxbase29ud.lib   wxtiffd.lib wxjpegd.lib wxpngd.lib  wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
+                               AdditionalDependencies="wxmswuniv29ud_webview.lib wxmswuniv29ud_richtext.lib  wxmswuniv29ud_media.lib  wxmswuniv29ud_xrc.lib  wxbase29ud_xml.lib  wxmswuniv29ud_adv.lib  wxmswuniv29ud_html.lib  wxmswuniv29ud_core.lib  wxbase29ud_net.lib  wxbase29ud.lib   wxtiffd.lib wxjpegd.lib wxpngd.lib  wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivud\test_gui.exe"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="TRUE"\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
-                               AdditionalDependencies="wxmswuniv29u_webview.lib wxmswuniv29u_richtext.lib  wxmswuniv29u_media.lib  wxmswuniv29u_xrc.lib  wxbase29u_xml.lib  wxmswuniv29u_adv.lib  wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
+                               AdditionalDependencies="wxmswuniv29u_webview.lib wxmswuniv29u_richtext.lib  wxmswuniv29u_media.lib  wxmswuniv29u_xrc.lib  wxbase29u_xml.lib  wxmswuniv29u_adv.lib  wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\test_gui.exe"\r
                                LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
-                               AdditionalDependencies="wxmsw29ud_webview.lib wxmsw29ud_richtext.lib  wxmsw29ud_media.lib  wxmsw29ud_xrc.lib  wxbase29ud_xml.lib  wxmsw29ud_adv.lib  wxmsw29ud_html.lib  wxmsw29ud_core.lib  wxbase29ud_net.lib  wxbase29ud.lib   wxtiffd.lib wxjpegd.lib wxpngd.lib  wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
+                               AdditionalDependencies="wxmsw29ud_webview.lib wxmsw29ud_richtext.lib  wxmsw29ud_media.lib  wxmsw29ud_xrc.lib  wxbase29ud_xml.lib  wxmsw29ud_adv.lib  wxmsw29ud_html.lib  wxmsw29ud_core.lib  wxbase29ud_net.lib  wxbase29ud.lib   wxtiffd.lib wxjpegd.lib wxpngd.lib  wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswuddll\test_gui.exe"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="TRUE"\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
-                               AdditionalDependencies="wxmsw29u_webview.lib wxmsw29u_richtext.lib  wxmsw29u_media.lib  wxmsw29u_xrc.lib  wxbase29u_xml.lib  wxmsw29u_adv.lib  wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
+                               AdditionalDependencies="wxmsw29u_webview.lib wxmsw29u_richtext.lib  wxmsw29u_media.lib  wxmsw29u_xrc.lib  wxbase29u_xml.lib  wxmsw29u_adv.lib  wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\test_gui.exe"\r
                                LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
-                               AdditionalDependencies="wxmswuniv29ud_webview.lib wxmswuniv29ud_richtext.lib  wxmswuniv29ud_media.lib  wxmswuniv29ud_xrc.lib  wxbase29ud_xml.lib  wxmswuniv29ud_adv.lib  wxmswuniv29ud_html.lib  wxmswuniv29ud_core.lib  wxbase29ud_net.lib  wxbase29ud.lib   wxtiffd.lib wxjpegd.lib wxpngd.lib  wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
+                               AdditionalDependencies="wxmswuniv29ud_webview.lib wxmswuniv29ud_richtext.lib  wxmswuniv29ud_media.lib  wxmswuniv29ud_xrc.lib  wxbase29ud_xml.lib  wxmswuniv29ud_adv.lib  wxmswuniv29ud_html.lib  wxmswuniv29ud_core.lib  wxbase29ud_net.lib  wxbase29ud.lib   wxtiffd.lib wxjpegd.lib wxpngd.lib  wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivuddll\test_gui.exe"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="TRUE"\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
-                               AdditionalDependencies="wxmswuniv29u_webview.lib wxmswuniv29u_richtext.lib  wxmswuniv29u_media.lib  wxmswuniv29u_xrc.lib  wxbase29u_xml.lib  wxmswuniv29u_adv.lib  wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
+                               AdditionalDependencies="wxmswuniv29u_webview.lib wxmswuniv29u_richtext.lib  wxmswuniv29u_media.lib  wxmswuniv29u_xrc.lib  wxbase29u_xml.lib  wxmswuniv29u_adv.lib  wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\test_gui.exe"\r
                                LinkIncremental="1"\r
                                SuppressStartupBanner="TRUE"\r
                                RelativePath=".\geometry\rect.cpp">\r
                        </File>\r
                        <File\r
-                               RelativePath=".\geometry\region.cpp">
-                       </File>
-                       <File
+                               RelativePath=".\geometry\region.cpp">\r
+                       </File>\r
+                       <File\r
                                RelativePath=".\controls\richtextctrltest.cpp">\r
                        </File>\r
                        <File\r
index bbe234d4c1a70dbff76395bb89e57f5c9846fd08..585f847233cf1cf55f0da8ca984a3d971881af46 100644 (file)
@@ -83,7 +83,7 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
-                               AdditionalDependencies="wxmsw29ud_webview.lib wxmsw29ud_richtext.lib  wxmsw29ud_media.lib  wxmsw29ud_xrc.lib  wxbase29ud_xml.lib  wxmsw29ud_adv.lib  wxmsw29ud_html.lib  wxmsw29ud_core.lib  wxbase29ud_net.lib  wxbase29ud.lib   wxtiffd.lib wxjpegd.lib wxpngd.lib  wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
+                               AdditionalDependencies="wxmsw29ud_webview.lib wxmsw29ud_richtext.lib  wxmsw29ud_media.lib  wxmsw29ud_xrc.lib  wxbase29ud_xml.lib  wxmsw29ud_adv.lib  wxmsw29ud_html.lib  wxmsw29ud_core.lib  wxbase29ud_net.lib  wxbase29ud.lib   wxtiffd.lib wxjpegd.lib wxpngd.lib  wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswud\test_gui.exe"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="true"\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
-                               AdditionalDependencies="wxmsw29u_webview.lib wxmsw29u_richtext.lib  wxmsw29u_media.lib  wxmsw29u_xrc.lib  wxbase29u_xml.lib  wxmsw29u_adv.lib  wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
+                               AdditionalDependencies="wxmsw29u_webview.lib wxmsw29u_richtext.lib  wxmsw29u_media.lib  wxmsw29u_xrc.lib  wxbase29u_xml.lib  wxmsw29u_adv.lib  wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\test_gui.exe"\r
                                LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
-                               AdditionalDependencies="wxmswuniv29ud_webview.lib wxmswuniv29ud_richtext.lib  wxmswuniv29ud_media.lib  wxmswuniv29ud_xrc.lib  wxbase29ud_xml.lib  wxmswuniv29ud_adv.lib  wxmswuniv29ud_html.lib  wxmswuniv29ud_core.lib  wxbase29ud_net.lib  wxbase29ud.lib   wxtiffd.lib wxjpegd.lib wxpngd.lib  wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
+                               AdditionalDependencies="wxmswuniv29ud_webview.lib wxmswuniv29ud_richtext.lib  wxmswuniv29ud_media.lib  wxmswuniv29ud_xrc.lib  wxbase29ud_xml.lib  wxmswuniv29ud_adv.lib  wxmswuniv29ud_html.lib  wxmswuniv29ud_core.lib  wxbase29ud_net.lib  wxbase29ud.lib   wxtiffd.lib wxjpegd.lib wxpngd.lib  wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivud\test_gui.exe"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="true"\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
-                               AdditionalDependencies="wxmswuniv29u_webview.lib wxmswuniv29u_richtext.lib  wxmswuniv29u_media.lib  wxmswuniv29u_xrc.lib  wxbase29u_xml.lib  wxmswuniv29u_adv.lib  wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
+                               AdditionalDependencies="wxmswuniv29u_webview.lib wxmswuniv29u_richtext.lib  wxmswuniv29u_media.lib  wxmswuniv29u_xrc.lib  wxbase29u_xml.lib  wxmswuniv29u_adv.lib  wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\test_gui.exe"\r
                                LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
-                               AdditionalDependencies="wxmsw29ud_webview.lib wxmsw29ud_richtext.lib  wxmsw29ud_media.lib  wxmsw29ud_xrc.lib  wxbase29ud_xml.lib  wxmsw29ud_adv.lib  wxmsw29ud_html.lib  wxmsw29ud_core.lib  wxbase29ud_net.lib  wxbase29ud.lib   wxtiffd.lib wxjpegd.lib wxpngd.lib  wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
+                               AdditionalDependencies="wxmsw29ud_webview.lib wxmsw29ud_richtext.lib  wxmsw29ud_media.lib  wxmsw29ud_xrc.lib  wxbase29ud_xml.lib  wxmsw29ud_adv.lib  wxmsw29ud_html.lib  wxmsw29ud_core.lib  wxbase29ud_net.lib  wxbase29ud.lib   wxtiffd.lib wxjpegd.lib wxpngd.lib  wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswuddll\test_gui.exe"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="true"\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
-                               AdditionalDependencies="wxmsw29u_webview.lib wxmsw29u_richtext.lib  wxmsw29u_media.lib  wxmsw29u_xrc.lib  wxbase29u_xml.lib  wxmsw29u_adv.lib  wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
+                               AdditionalDependencies="wxmsw29u_webview.lib wxmsw29u_richtext.lib  wxmsw29u_media.lib  wxmsw29u_xrc.lib  wxbase29u_xml.lib  wxmsw29u_adv.lib  wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\test_gui.exe"\r
                                LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
-                               AdditionalDependencies="wxmswuniv29ud_webview.lib wxmswuniv29ud_richtext.lib  wxmswuniv29ud_media.lib  wxmswuniv29ud_xrc.lib  wxbase29ud_xml.lib  wxmswuniv29ud_adv.lib  wxmswuniv29ud_html.lib  wxmswuniv29ud_core.lib  wxbase29ud_net.lib  wxbase29ud.lib   wxtiffd.lib wxjpegd.lib wxpngd.lib  wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
+                               AdditionalDependencies="wxmswuniv29ud_webview.lib wxmswuniv29ud_richtext.lib  wxmswuniv29ud_media.lib  wxmswuniv29ud_xrc.lib  wxbase29ud_xml.lib  wxmswuniv29ud_adv.lib  wxmswuniv29ud_html.lib  wxmswuniv29ud_core.lib  wxbase29ud_net.lib  wxbase29ud.lib   wxtiffd.lib wxjpegd.lib wxpngd.lib  wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivuddll\test_gui.exe"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="true"\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
-                               AdditionalDependencies="wxmswuniv29u_webview.lib wxmswuniv29u_richtext.lib  wxmswuniv29u_media.lib  wxmswuniv29u_xrc.lib  wxbase29u_xml.lib  wxmswuniv29u_adv.lib  wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
+                               AdditionalDependencies="wxmswuniv29u_webview.lib wxmswuniv29u_richtext.lib  wxmswuniv29u_media.lib  wxmswuniv29u_xrc.lib  wxbase29u_xml.lib  wxmswuniv29u_adv.lib  wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\test_gui.exe"\r
                                LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\geometry\region.cpp"
-                               >
-                       </File>
-                       <File
+                               RelativePath=".\geometry\region.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
                                RelativePath=".\controls\richtextctrltest.cpp"\r
                                >\r
                        </File>\r
index 558de52aff450295cc10fd752ff5a551571e93b6..a5618070e6e3c3d734873f6fc13073fc6756edb2 100644 (file)
@@ -82,7 +82,7 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
-                               AdditionalDependencies="wxmsw29ud_webview.lib wxmsw29ud_richtext.lib  wxmsw29ud_media.lib  wxmsw29ud_xrc.lib  wxbase29ud_xml.lib  wxmsw29ud_adv.lib  wxmsw29ud_html.lib  wxmsw29ud_core.lib  wxbase29ud_net.lib  wxbase29ud.lib   wxtiffd.lib wxjpegd.lib wxpngd.lib  wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
+                               AdditionalDependencies="wxmsw29ud_webview.lib wxmsw29ud_richtext.lib  wxmsw29ud_media.lib  wxmsw29ud_xrc.lib  wxbase29ud_xml.lib  wxmsw29ud_adv.lib  wxmsw29ud_html.lib  wxmsw29ud_core.lib  wxbase29ud_net.lib  wxbase29ud.lib   wxtiffd.lib wxjpegd.lib wxpngd.lib  wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswud\test_gui.exe"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="true"\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
-                               AdditionalDependencies="wxmsw29u_webview.lib wxmsw29u_richtext.lib  wxmsw29u_media.lib  wxmsw29u_xrc.lib  wxbase29u_xml.lib  wxmsw29u_adv.lib  wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
+                               AdditionalDependencies="wxmsw29u_webview.lib wxmsw29u_richtext.lib  wxmsw29u_media.lib  wxmsw29u_xrc.lib  wxbase29u_xml.lib  wxmsw29u_adv.lib  wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswu\test_gui.exe"\r
                                LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
-                               AdditionalDependencies="wxmswuniv29ud_webview.lib wxmswuniv29ud_richtext.lib  wxmswuniv29ud_media.lib  wxmswuniv29ud_xrc.lib  wxbase29ud_xml.lib  wxmswuniv29ud_adv.lib  wxmswuniv29ud_html.lib  wxmswuniv29ud_core.lib  wxbase29ud_net.lib  wxbase29ud.lib   wxtiffd.lib wxjpegd.lib wxpngd.lib  wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
+                               AdditionalDependencies="wxmswuniv29ud_webview.lib wxmswuniv29ud_richtext.lib  wxmswuniv29ud_media.lib  wxmswuniv29ud_xrc.lib  wxbase29ud_xml.lib  wxmswuniv29ud_adv.lib  wxmswuniv29ud_html.lib  wxmswuniv29ud_core.lib  wxbase29ud_net.lib  wxbase29ud.lib   wxtiffd.lib wxjpegd.lib wxpngd.lib  wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivud\test_gui.exe"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="true"\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
-                               AdditionalDependencies="wxmswuniv29u_webview.lib wxmswuniv29u_richtext.lib  wxmswuniv29u_media.lib  wxmswuniv29u_xrc.lib  wxbase29u_xml.lib  wxmswuniv29u_adv.lib  wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
+                               AdditionalDependencies="wxmswuniv29u_webview.lib wxmswuniv29u_richtext.lib  wxmswuniv29u_media.lib  wxmswuniv29u_xrc.lib  wxbase29u_xml.lib  wxmswuniv29u_adv.lib  wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivu\test_gui.exe"\r
                                LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
-                               AdditionalDependencies="wxmsw29ud_webview.lib wxmsw29ud_richtext.lib  wxmsw29ud_media.lib  wxmsw29ud_xrc.lib  wxbase29ud_xml.lib  wxmsw29ud_adv.lib  wxmsw29ud_html.lib  wxmsw29ud_core.lib  wxbase29ud_net.lib  wxbase29ud.lib   wxtiffd.lib wxjpegd.lib wxpngd.lib  wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
+                               AdditionalDependencies="wxmsw29ud_webview.lib wxmsw29ud_richtext.lib  wxmsw29ud_media.lib  wxmsw29ud_xrc.lib  wxbase29ud_xml.lib  wxmsw29ud_adv.lib  wxmsw29ud_html.lib  wxmsw29ud_core.lib  wxbase29ud_net.lib  wxbase29ud.lib   wxtiffd.lib wxjpegd.lib wxpngd.lib  wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswuddll\test_gui.exe"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="true"\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
-                               AdditionalDependencies="wxmsw29u_webview.lib wxmsw29u_richtext.lib  wxmsw29u_media.lib  wxmsw29u_xrc.lib  wxbase29u_xml.lib  wxmsw29u_adv.lib  wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
+                               AdditionalDependencies="wxmsw29u_webview.lib wxmsw29u_richtext.lib  wxmsw29u_media.lib  wxmsw29u_xrc.lib  wxbase29u_xml.lib  wxmsw29u_adv.lib  wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswudll\test_gui.exe"\r
                                LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
-                               AdditionalDependencies="wxmswuniv29ud_webview.lib wxmswuniv29ud_richtext.lib  wxmswuniv29ud_media.lib  wxmswuniv29ud_xrc.lib  wxbase29ud_xml.lib  wxmswuniv29ud_adv.lib  wxmswuniv29ud_html.lib  wxmswuniv29ud_core.lib  wxbase29ud_net.lib  wxbase29ud.lib   wxtiffd.lib wxjpegd.lib wxpngd.lib  wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
+                               AdditionalDependencies="wxmswuniv29ud_webview.lib wxmswuniv29ud_richtext.lib  wxmswuniv29ud_media.lib  wxmswuniv29ud_xrc.lib  wxbase29ud_xml.lib  wxmswuniv29ud_adv.lib  wxmswuniv29ud_html.lib  wxmswuniv29ud_core.lib  wxbase29ud_net.lib  wxbase29ud.lib   wxtiffd.lib wxjpegd.lib wxpngd.lib  wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivuddll\test_gui.exe"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="true"\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
-                               AdditionalDependencies="wxmswuniv29u_webview.lib wxmswuniv29u_richtext.lib  wxmswuniv29u_media.lib  wxmswuniv29u_xrc.lib  wxbase29u_xml.lib  wxmswuniv29u_adv.lib  wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
+                               AdditionalDependencies="wxmswuniv29u_webview.lib wxmswuniv29u_richtext.lib  wxmswuniv29u_media.lib  wxmswuniv29u_xrc.lib  wxbase29u_xml.lib  wxmswuniv29u_adv.lib  wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r
                                OutputFile="vc_mswunivudll\test_gui.exe"\r
                                LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\geometry\region.cpp"
-                               >
-                       </File>
-                       <File
+                               RelativePath=".\geometry\region.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
                                RelativePath=".\controls\richtextctrltest.cpp"\r
                                >\r
                        </File>\r
index 40fb5818fd10f50de7b960c70c4c0180c3436c68..3f4409396dc2180f4d8220324d16436504d5f7fc 100644 (file)
@@ -45,7 +45,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.9
-WX_VERSION = $(WX_RELEASE).3
+WX_VERSION = $(WX_RELEASE).4
 LIBDIRNAME = $(wx_top_builddir)/lib
 HELPVIEW_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
index 9c0589dd0ce9e552149ad5cd95f107b25a17114b..4c647db9ddef129dad76eb72a770c1dcf23407af 100644 (file)
@@ -48,7 +48,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.9
-WX_VERSION = $(WX_RELEASE).3
+WX_VERSION = $(WX_RELEASE).4
 LIBDIRNAME = $(wx_top_builddir)/lib
 SCREENSHOTGEN_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \