Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'remotes/upstream/master'

Browse Source
This commit is contained in:
Simon Rozman
2019-03-12 20:58:13 +01:00
parent 6ea933e298 993334c48a
commit f065daddb1
946 changed files with 23758 additions and 6618 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@@ -476,4 +476,4 @@
/utils/hhp2cached/*Carbon?Release*
# /utils/wxrc/
/utils/wxrc/*.sln
/utils/wxrc/wxrc_vc[789].sln

2
CMakeLists.txt
View File

@@ -20,7 +20,7 @@ endif()
if(APPLE AND NOT CMAKE_OSX_DEPLOYMENT_TARGET)
# If no deployment target has been set default to the minimum supported
# OS X version (this has to be set before the first project() call)
set(CMAKE_OSX_DEPLOYMENT_TARGET 10.7 CACHE STRING "OS X Deployment Target")
set(CMAKE_OSX_DEPLOYMENT_TARGET 10.9 CACHE STRING "OS X Deployment Target")
endif()
project(wxWidgets)

89
Makefile.in
View File

@@ -74,8 +74,8 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR =
WX_RELEASE = 3.1
WX_RELEASE_NODOT = 31
WX_VERSION = $(WX_RELEASE).2
WX_VERSION_NODOT = $(WX_RELEASE_NODOT)2
WX_VERSION = $(WX_RELEASE).3
WX_VERSION_NODOT = $(WX_RELEASE_NODOT)3
LIBDIRNAME = $(wx_top_builddir)/lib
WXREGEX_CFLAGS = -DNDEBUG -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(____SHARED) \
$(CPPFLAGS) $(CFLAGS)
@@ -1667,12 +1667,14 @@ WEBVIEWLIB_CXXFLAGS = $(__webviewlib_PCH_INC) -D__WX$(TOOLKIT)__ \
$(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
$(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_BUILD_p) \
$(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \
$(__INC_REGEX_p) $(__INC_EXPAT_p) $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
$(__INC_REGEX_p) $(__INC_EXPAT_p) $(__webviewdll_ext_dir_define_p) \
$(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
WEBVIEWLIB_OBJCXXFLAGS = $(__webviewlib_PCH_INC) -D__WX$(TOOLKIT)__ \
$(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
$(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_BUILD_p) \
$(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \
$(__INC_REGEX_p) $(__INC_EXPAT_p) $(CPPFLAGS) $(OBJCXXFLAGS)
$(__INC_REGEX_p) $(__INC_EXPAT_p) $(__webviewdll_ext_dir_define_p) \
$(CPPFLAGS) $(OBJCXXFLAGS)
WEBVIEWLIB_OBJECTS = \
$(__WEBVIEW_SRC_PLATFORM_OBJECTS_3) \
webviewlib_webview.o \
@@ -4579,7 +4581,8 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS = \
monodll_datavgen.o \
monodll_editlbox.o \
monodll_laywin.o \
monodll_calctrlg.o
monodll_calctrlg.o \
monodll_rowheightcache.o
@COND_USE_GUI_1_WXUNIV_0@__CORE_SRC_OBJECTS = $(COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS)
COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS = \
$(__LOWLEVEL_SRC_OBJECTS_1) \
@@ -4839,7 +4842,8 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS = \
monodll_datavgen.o \
monodll_editlbox.o \
monodll_laywin.o \
monodll_calctrlg.o
monodll_calctrlg.o \
monodll_rowheightcache.o
@COND_USE_GUI_1_WXUNIV_1@__CORE_SRC_OBJECTS = $(COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS)
COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS = \
monodll_fontmgrcmn.o \
@@ -5743,7 +5747,8 @@ COND_PLATFORM_WIN32_1___QT_PLATFORM_SRC_OBJECTS = \
monodll_uuid.o \
monodll_safearray.o \
monodll_msw_sound.o \
monodll_automtn.o
monodll_automtn.o \
monodll_qt_graphics.o
@COND_PLATFORM_WIN32_1@__QT_PLATFORM_SRC_OBJECTS = $(COND_PLATFORM_WIN32_1___QT_PLATFORM_SRC_OBJECTS)
COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_1 = \
monodll_fontmgrcmn.o \
@@ -6555,7 +6560,8 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_1 = \
monolib_datavgen.o \
monolib_editlbox.o \
monolib_laywin.o \
monolib_calctrlg.o
monolib_calctrlg.o \
monolib_rowheightcache.o
@COND_USE_GUI_1_WXUNIV_0@__CORE_SRC_OBJECTS_1 = $(COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_1)
COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1 = \
$(__LOWLEVEL_SRC_OBJECTS_3) \
@@ -6815,7 +6821,8 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1 = \
monolib_datavgen.o \
monolib_editlbox.o \
monolib_laywin.o \
monolib_calctrlg.o
monolib_calctrlg.o \
monolib_rowheightcache.o
@COND_USE_GUI_1_WXUNIV_1@__CORE_SRC_OBJECTS_1 = $(COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1)
COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_2 = \
monolib_fontmgrcmn.o \
@@ -7719,7 +7726,8 @@ COND_PLATFORM_WIN32_1___QT_PLATFORM_SRC_OBJECTS_1 = \
monolib_uuid.o \
monolib_safearray.o \
monolib_msw_sound.o \
monolib_automtn.o
monolib_automtn.o \
monolib_qt_graphics.o
@COND_PLATFORM_WIN32_1@__QT_PLATFORM_SRC_OBJECTS_1 = $(COND_PLATFORM_WIN32_1___QT_PLATFORM_SRC_OBJECTS_1)
COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_3 = \
monolib_fontmgrcmn.o \
@@ -8678,7 +8686,8 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_2 = \
coredll_datavgen.o \
coredll_editlbox.o \
coredll_laywin.o \
coredll_calctrlg.o
coredll_calctrlg.o \
coredll_rowheightcache.o
@COND_USE_GUI_1_WXUNIV_0@__CORE_SRC_OBJECTS_2 = $(COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_2)
COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2 = \
$(__LOWLEVEL_SRC_OBJECTS_5) \
@@ -8938,7 +8947,8 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2 = \
coredll_datavgen.o \
coredll_editlbox.o \
coredll_laywin.o \
coredll_calctrlg.o
coredll_calctrlg.o \
coredll_rowheightcache.o
@COND_USE_GUI_1_WXUNIV_1@__CORE_SRC_OBJECTS_2 = $(COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2)
COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_4 = \
coredll_fontmgrcmn.o \
@@ -9842,7 +9852,8 @@ COND_PLATFORM_WIN32_1___QT_PLATFORM_SRC_OBJECTS_2 = \
coredll_uuid.o \
coredll_safearray.o \
coredll_msw_sound.o \
coredll_automtn.o
coredll_automtn.o \
coredll_qt_graphics.o
@COND_PLATFORM_WIN32_1@__QT_PLATFORM_SRC_OBJECTS_2 = $(COND_PLATFORM_WIN32_1___QT_PLATFORM_SRC_OBJECTS_2)
COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_5 = \
coredll_fontmgrcmn.o \
@@ -10396,7 +10407,8 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_3 = \
corelib_datavgen.o \
corelib_editlbox.o \
corelib_laywin.o \
corelib_calctrlg.o
corelib_calctrlg.o \
corelib_rowheightcache.o
@COND_USE_GUI_1_WXUNIV_0@__CORE_SRC_OBJECTS_3 = $(COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_3)
COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_3 = \
$(__LOWLEVEL_SRC_OBJECTS_7) \
@@ -10656,7 +10668,8 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_3 = \
corelib_datavgen.o \
corelib_editlbox.o \
corelib_laywin.o \
corelib_calctrlg.o
corelib_calctrlg.o \
corelib_rowheightcache.o
@COND_USE_GUI_1_WXUNIV_1@__CORE_SRC_OBJECTS_3 = $(COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_3)
COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_6 = \
corelib_fontmgrcmn.o \
@@ -11560,7 +11573,8 @@ COND_PLATFORM_WIN32_1___QT_PLATFORM_SRC_OBJECTS_3 = \
corelib_uuid.o \
corelib_safearray.o \
corelib_msw_sound.o \
corelib_automtn.o
corelib_automtn.o \
corelib_qt_graphics.o
@COND_PLATFORM_WIN32_1@__QT_PLATFORM_SRC_OBJECTS_3 = $(COND_PLATFORM_WIN32_1___QT_PLATFORM_SRC_OBJECTS_3)
COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_7 = \
corelib_fontmgrcmn.o \
@@ -13386,9 +13400,6 @@ COND_PLATFORM_MACOSX_1___OSX_LOWLEVEL_SRC_OBJECTS_17 = \
monolib_core_timer.o \
monolib_utilsexc_cf.o
@COND_PLATFORM_MACOSX_1@__OSX_LOWLEVEL_SRC_OBJECTS_17 = $(COND_PLATFORM_MACOSX_1___OSX_LOWLEVEL_SRC_OBJECTS_17)
@COND_USE_WEBVIEW_WEBKIT2_1@__webviewdll_ext_dir_define_p \
@COND_USE_WEBVIEW_WEBKIT2_1@ = \
@COND_USE_WEBVIEW_WEBKIT2_1@ -DWX_WEB_EXTENSIONS_DIRECTORY=\"$(PLUGINS_INST_DIR)/web-extensions\"
@COND_PLATFORM_MACOSX_1@__PLATFORM_SRC_OBJECTS_8 = coredll_unix_apptraits.o
@COND_PLATFORM_UNIX_1@__PLATFORM_SRC_OBJECTS_8 = coredll_unix_apptraits.o
COND_PLATFORM_MACOSX_1___OSX_COMMON_SRC_OBJECTS_8 = \
@@ -13665,6 +13676,9 @@ COND_PLATFORM_MACOSX_1___OSX_LOWLEVEL_SRC_OBJECTS_1_4 = \
corelib_core_timer.o \
corelib_utilsexc_cf.o
@COND_PLATFORM_MACOSX_1@__OSX_LOWLEVEL_SRC_OBJECTS_1_4 = $(COND_PLATFORM_MACOSX_1___OSX_LOWLEVEL_SRC_OBJECTS_1_4)
@COND_USE_WEBVIEW_WEBKIT2_1@__webviewdll_ext_dir_define_p \
@COND_USE_WEBVIEW_WEBKIT2_1@ = \
@COND_USE_WEBVIEW_WEBKIT2_1@ -DWX_WEB_EXTENSIONS_DIRECTORY=\"$(PLUGINS_INST_DIR)/web-extensions\"
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@__htmldll_library_link_DEP \
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@ = $(__htmldll___depname)
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@__htmldll_library_link_LIBR \
@@ -13678,17 +13692,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).2
@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@dll___targetsuf2 = .2.$(SO_SUFFIX)
@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_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).2.0.0
@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ .$(SO_SUFFIX).3.0.0
@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@dll___targetsuf3 \
@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .2.0.0.$(SO_SUFFIX)
@COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@dll___targetsuf3 = -2.$(SO_SUFFIX)
@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_USE_SOVERSION_0@dll___targetsuf3 = .$(SO_SUFFIX)
@COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1@dll___targetsuf3 = .$(SO_SUFFIX).2
@COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1@dll___targetsuf3 = .$(SO_SUFFIX).3
@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \
@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
@COND_wxUSE_LIBTIFF_builtin@__INC_TIFF_BUILD_p_66 \
@@ -16816,6 +16830,9 @@ monodll_qt_utils.o: $(srcdir)/src/qt/utils.cpp $(MONODLL_ODEP)
monodll_qt_window.o: $(srcdir)/src/qt/window.cpp $(MONODLL_ODEP)
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/qt/window.cpp
monodll_qt_graphics.o: $(srcdir)/src/qt/graphics.cpp $(MONODLL_ODEP)
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/qt/graphics.cpp
monodll_univ_anybutton.o: $(srcdir)/src/univ/anybutton.cpp $(MONODLL_ODEP)
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/anybutton.cpp
@@ -20698,6 +20715,9 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
@COND_USE_GUI_1@monodll_calctrlg.o: $(srcdir)/src/generic/calctrlg.cpp $(MONODLL_ODEP)
@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/calctrlg.cpp
@COND_USE_GUI_1@monodll_rowheightcache.o: $(srcdir)/src/generic/rowheightcache.cpp $(MONODLL_ODEP)
@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/rowheightcache.cpp
@COND_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_osx_cocoa_mediactrl.o: $(srcdir)/src/osx/cocoa/mediactrl.mm $(MONODLL_ODEP)
@COND_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/mediactrl.mm
@@ -22069,6 +22089,9 @@ monolib_qt_utils.o: $(srcdir)/src/qt/utils.cpp $(MONOLIB_ODEP)
monolib_qt_window.o: $(srcdir)/src/qt/window.cpp $(MONOLIB_ODEP)
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/qt/window.cpp
monolib_qt_graphics.o: $(srcdir)/src/qt/graphics.cpp $(MONOLIB_ODEP)
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/qt/graphics.cpp
monolib_univ_anybutton.o: $(srcdir)/src/univ/anybutton.cpp $(MONOLIB_ODEP)
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/anybutton.cpp
@@ -25951,6 +25974,9 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
@COND_USE_GUI_1@monolib_calctrlg.o: $(srcdir)/src/generic/calctrlg.cpp $(MONOLIB_ODEP)
@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/calctrlg.cpp
@COND_USE_GUI_1@monolib_rowheightcache.o: $(srcdir)/src/generic/rowheightcache.cpp $(MONOLIB_ODEP)
@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/rowheightcache.cpp
@COND_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_osx_cocoa_mediactrl.o: $(srcdir)/src/osx/cocoa/mediactrl.mm $(MONOLIB_ODEP)
@COND_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/mediactrl.mm
@@ -27982,6 +28008,9 @@ coredll_qt_utils.o: $(srcdir)/src/qt/utils.cpp $(COREDLL_ODEP)
coredll_qt_window.o: $(srcdir)/src/qt/window.cpp $(COREDLL_ODEP)
$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/qt/window.cpp
coredll_qt_graphics.o: $(srcdir)/src/qt/graphics.cpp $(COREDLL_ODEP)
$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/qt/graphics.cpp
coredll_univ_anybutton.o: $(srcdir)/src/univ/anybutton.cpp $(COREDLL_ODEP)
$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/anybutton.cpp
@@ -31297,6 +31326,9 @@ coredll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(COREDLL_ODEP)
@COND_USE_GUI_1@coredll_calctrlg.o: $(srcdir)/src/generic/calctrlg.cpp $(COREDLL_ODEP)
@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/calctrlg.cpp
@COND_USE_GUI_1@coredll_rowheightcache.o: $(srcdir)/src/generic/rowheightcache.cpp $(COREDLL_ODEP)
@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/rowheightcache.cpp
corelib_event.o: $(srcdir)/src/common/event.cpp $(CORELIB_ODEP)
$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/event.cpp
@@ -32230,6 +32262,9 @@ corelib_qt_utils.o: $(srcdir)/src/qt/utils.cpp $(CORELIB_ODEP)
corelib_qt_window.o: $(srcdir)/src/qt/window.cpp $(CORELIB_ODEP)
$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/qt/window.cpp
corelib_qt_graphics.o: $(srcdir)/src/qt/graphics.cpp $(CORELIB_ODEP)
$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/qt/graphics.cpp
corelib_univ_anybutton.o: $(srcdir)/src/univ/anybutton.cpp $(CORELIB_ODEP)
$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/anybutton.cpp
@@ -35545,6 +35580,9 @@ corelib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(CORELIB_ODEP)
@COND_USE_GUI_1@corelib_calctrlg.o: $(srcdir)/src/generic/calctrlg.cpp $(CORELIB_ODEP)
@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/calctrlg.cpp
@COND_USE_GUI_1@corelib_rowheightcache.o: $(srcdir)/src/generic/rowheightcache.cpp $(CORELIB_ODEP)
@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/rowheightcache.cpp
advdll_version_rc.o: $(srcdir)/src/msw/version.rc $(ADVDLL_ODEP)
$(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_66) $(__INC_TIFF_p_66) $(__INC_JPEG_p_66) $(__INC_PNG_p_65) $(__INC_ZLIB_p_67) $(__INC_REGEX_p_65) $(__INC_EXPAT_p_65) --define WXUSINGDLL --define WXMAKINGDLL_ADV
@@ -36866,7 +36904,6 @@ ALL_DIST: distrib_clean
# but is not used when building wxBase distribution
ALL_GUI_DIST: ALL_DIST
$(CP_P) $(DOCDIR)/readme.txt $(DISTDIR)/README.txt
$(CP_P) $(DOCDIR)/$(TOOLKITDIR)/install.txt $(DISTDIR)/INSTALL.txt
if test -f $(DOCDIR)/$(TOOLKITDIR)/changes.txt ; then \
$(CP_P) $(DOCDIR)/$(TOOLKITDIR)/changes.txt $(DISTDIR)/CHANGES-$(TOOLKIT).txt ; fi
$(CP_P) $(DOCDIR)/$(TOOLKITDIR)/readme.txt $(DISTDIR)/README-$(TOOLKIT).txt

19
README.md
View File

@@ -22,7 +22,7 @@ Platforms
[![AppVeyor](https://img.shields.io/appveyor/ci/wxWidgets/wxWidgets/master.svg?label=Windows)](https://ci.appveyor.com/project/wxWidgets/wxwidgets)
[![Travis](https://img.shields.io/travis/wxWidgets/wxWidgets/master.svg?label=Linux)](https://travis-ci.org/wxWidgets/wxWidgets)
wxWidgets currently supports the following primary platforms:
This version of wxWidgets supports the following primary platforms:
- Windows XP, Vista, 7, 8 and 10 (32/64 bits).
- Most Unix variants using the GTK+ toolkit (version 2.6 or newer or 3.x).
@@ -49,25 +49,32 @@ Building
--------
For building the library, please see platform-specific documentation under
`docs/<port>` directory.
`docs/<port>` directory, e.g. here are the instructions for
[wxGTK](docs/gtk/install.md), [wxMSW](docs/msw/install.md) and
[wxOSX](docs/osx/install.md).
If you're building the sources checked out from Git, and not from a released
versions, please see these additional [Git-specific notes](README-GIT.md).
version, please see these additional [Git-specific notes](README-GIT.md).
Further information
-------------------
If you are looking for support, you can get it from
If you are looking for community support, you can get it from
- [Mailing Lists](https://www.wxwidgets.org/support/mailing-lists/)
- [Discussion Forums](https://forums.wxwidgets.org/)
- [#wxwidgets IRC channel](https://www.wxwidgets.org/support/irc/)
- [Stack Overflow](https://stackoverflow.com/questions/tagged/wxwidgets)
(tag your questions with `wxwidgets`)
- Please report bugs at https://trac.wxwidgets.org/newticket
- And you can report bugs at https://trac.wxwidgets.org/newticket
We would also gladly welcome [your contributions](.github/CONTRIBUTING.md).
[Commercial support](https://www.wxwidgets.org/support/commercial/) is also
available.
Finally, keep in mind that wxWidgets is an open source project collaboratively
developed by its users and your contributions to it are always welcome. Please
check [our guidelines](.github/CONTRIBUTING.md) if you'd like to do it.
Have fun!

2
build/bakefiles/files.bkl
View File

@@ -252,6 +252,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/msw/ole/safearray.cpp
src/msw/sound.cpp
src/msw/ole/automtn.cpp
src/qt/graphics.cpp
</set>
<set var="QT_WIN32_HDR" hints="files">
@@ -1005,6 +1006,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/generic/editlbox.cpp
src/generic/laywin.cpp
src/generic/calctrlg.cpp
src/generic/rowheightcache.cpp
</set>
<set var="GUI_CMN_HDR" hints="files">
wx/affinematrix2dbase.h

1
build/bakefiles/make_dist.mk
View File

@@ -142,7 +142,6 @@ ALL_DIST: distrib_clean
# but is not used when building wxBase distribution
ALL_GUI_DIST: ALL_DIST
$(CP_P) $(DOCDIR)/readme.txt $(DISTDIR)/README.txt
$(CP_P) $(DOCDIR)/$(TOOLKITDIR)/install.txt $(DISTDIR)/INSTALL.txt
if test -f $(DOCDIR)/$(TOOLKITDIR)/changes.txt ; then \
$(CP_P) $(DOCDIR)/$(TOOLKITDIR)/changes.txt $(DISTDIR)/CHANGES-$(TOOLKIT).txt ; fi
$(CP_P) $(DOCDIR)/$(TOOLKITDIR)/readme.txt $(DISTDIR)/README-$(TOOLKIT).txt

1
build/bakefiles/multilib.bkl
View File

@@ -190,6 +190,7 @@
<lib id="webviewlib" template="wx_lib"
cond="SHARED=='0' and USE_GUI=='1' and USE_WEBVIEW=='1' and MONOLITHIC=='0'">
<define>$(webviewdll_ext_dir_define)</define>
<sources>$(WEBVIEW_SRC)</sources>
<msvc-headers>$(WEBVIEW_HDR)</msvc-headers>
</lib>

2
build/bakefiles/version.bkl
View File

@@ -22,7 +22,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">2</set>
<set var="WX_CURRENT">3</set>
<set var="WX_REVISION">0</set>
<set var="WX_AGE">0</set>

139
build/cmake/config.cmake
View File

@@ -27,6 +27,23 @@ macro(wx_configure_script input output)
)
endmacro()
macro(wx_get_dependencies var lib)
set(${var})
if(TARGET ${lib})
get_target_property(deps ${lib} LINK_LIBRARIES)
foreach(dep IN LISTS deps)
if(TARGET ${dep})
get_target_property(dep_name ${dep} OUTPUT_NAME)
set(dep_name "-l${dep_name}")
else()
get_filename_component(dep_name ${dep} NAME)
endif()
wx_string_append(${var} "${dep_name} ")
endforeach()
string(STRIP ${${var}} ${var})
endif()
endmacro()
function(wx_write_config_inplace)
wx_configure_script(
"${CMAKE_CURRENT_SOURCE_DIR}/wx-config-inplace.in"
@@ -42,75 +59,105 @@ endfunction()
function(wx_write_config)
# TODO: set variables
set(includedir "$")
wx_string_append(includedir "{prefix}/include")
set(libdir "$")
wx_string_append(libdir "{exec_prefix}/lib")
set(bindir "$")
wx_string_append(bindir "{exec_prefix}/bin")
if(CMAKE_CROSSCOMPILING)
set(cross_compiling yes)
else()
set(cross_compiling no)
endif()
set(prefix ${CMAKE_INSTALL_PREFIX})
set(exec_prefix $)
wx_string_append(exec_prefix "{prefix}")
set(BUILT_WX_LIBS)
foreach(lib IN LISTS wxLIB_TARGETS)
wx_string_append(BUILT_WX_LIBS " ${lib}")
endforeach()
set(CC ${CMAKE_C_COMPILER})
set(CXX ${CMAKE_CXX_COMPILER})
set(DMALLOC_LIBS)
set(exec_prefix "\${prefix}")
set(includedir "\${prefix}/include")
set(libdir "\${exec_prefix}/lib")
set(bindir "\${exec_prefix}/bin")
find_program(EGREP egrep)
mark_as_advanced(EGREP)
set(EXTRALIBS_GUI)
set(EXTRALIBS_HTML)
set(EXTRALIBS_SDL)
set(EXTRALIBS_STC)
set(EXTRALIBS_WEBVIEW)
set(EXTRALIBS_XML)
set(LDFLAGS_GL)
if(wxBUILD_MONOLITHIC)
set(MONOLITHIC 1)
else()
set(MONOLITHIC 0)
endif()
set(OPENGL_LIBS)
set(RESCOMP)
if(wxBUILD_SHARED)
set(SHARED 1)
else()
set(SHARED 0)
endif()
if(wxUSE_UNICODE)
set(WX_CHARTYPE unicode)
set(lib_unicode_suffix u)
else()
set(WX_CHARTYPE ansi)
set(lib_unicode_suffix)
endif()
if(CMAKE_CROSSCOMPILING)
set(cross_compiling yes)
set(host_alias ${CMAKE_SYSTEM_NAME})
else()
set(cross_compiling no)
endif()
set(BUILT_WX_LIBS)
set(STD_BASE_LIBS)
set(STD_GUI_LIBS)
#TODO: setting TOOLCHAIN_NAME produces change results in config folder
# set(TOOLCHAIN_NAME)
set(STD_BASE_LIBS_ALL xml net base)
set(STD_GUI_LIBS_ALL xrc html qa adv core)
foreach(lib IN ITEMS xrc webview stc richtext ribbon propgrid aui gl media html qa adv core xml net base)
list(FIND wxLIB_TARGETS ${lib} hasLib)
if (hasLib GREATER -1)
wx_string_append(BUILT_WX_LIBS "${lib} ")
list(FIND STD_BASE_LIBS_ALL ${lib} index)
if (index GREATER -1)
wx_string_append(STD_BASE_LIBS "${lib} ")
endif()
list(FIND STD_GUI_LIBS_ALL ${lib} index)
if (index GREATER -1)
wx_string_append(STD_GUI_LIBS "${lib} ")
endif()
endif()
endforeach()
string(STRIP "${BUILT_WX_LIBS}" BUILT_WX_LIBS)
string(STRIP "${STD_BASE_LIBS}" STD_BASE_LIBS)
string(STRIP "${STD_GUI_LIBS}" STD_GUI_LIBS)
set(WX_RELEASE ${wxMAJOR_VERSION}.${wxMINOR_VERSION})
set(WX_VERSION ${wxVERSION})
set(WX_SUBVERSION ${wxVERSION}.0)
set(WX_FLAVOUR)
set(TOOLKIT_DIR ${wxBUILD_TOOLKIT})
set(TOOLKIT_VERSION)
set(WIDGET_SET ${wxBUILD_WIDGETSET})
if(wxUSE_UNICODE)
set(WX_CHARTYPE unicode)
else()
set(WX_CHARTYPE ansi)
set(TOOLCHAIN_NAME "${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}-${WX_RELEASE}")
set(WX_LIBRARY_BASENAME_GUI "wx_${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}")
set(WX_LIBRARY_BASENAME_NOGUI "wx_base${lib_unicode_suffix}")
wx_get_dependencies(WXCONFIG_LIBS base)
wx_get_dependencies(EXTRALIBS_GUI core)
set(EXTRALIBS_SDL) # included in core libs when SDL is enabled
wx_get_dependencies(EXTRALIBS_HTML html)
wx_get_dependencies(EXTRALIBS_STC stc)
wx_get_dependencies(EXTRALIBS_WEBVIEW webview)
wx_get_dependencies(EXTRALIBS_XML xml)
wx_get_dependencies(EXTRALIBS_MEDIA media)
wx_get_dependencies(OPENGL_LIBS gl)
set(DMALLOC_LIBS)
if(wxBUILD_MONOLITHIC)
wx_get_dependencies(WXCONFIG_LIBS mono)
endif()
set(WX_FLAVOUR)
set(WX_LIBRARY_BASENAME_GUI)
set(WX_LIBRARY_BASENAME_NOGUI)
set(WX_RELEASE ${wxMAJOR_VERSION}.${wxMINOR_VERSION})
set(WX_SUBVERSION ${wxVERSION}.0)
set(WX_VERSION ${wxVERSION})
set(CC ${CMAKE_C_COMPILER})
set(CXX ${CMAKE_CXX_COMPILER})
set(WXCONFIG_CFLAGS)
set(WXCONFIG_CPPFLAGS)
set(WXCONFIG_CXXFLAGS)
set(WXCONFIG_LDFLAGS)
if(CMAKE_USE_PTHREADS_INIT)
set(WXCONFIG_CFLAGS "-pthread")
set(WXCONFIG_LDFLAGS "-pthread")
endif()
set(WXCONFIG_CPPFLAGS "-DWXUSINGDLL")
foreach(flag IN LISTS wxTOOLKIT_DEFINITIONS)
wx_string_append(WXCONFIG_CPPFLAGS " -D${flag}")
endforeach()
set(WXCONFIG_CXXFLAGS ${WXCONFIG_CFLAGS})
set(WXCONFIG_LDFLAGS_GUI)
set(WXCONFIG_LIBS)
set(WXCONFIG_RESFLAGS)
set(WXCONFIG_RPATH)
set(WXCONFIG_RPATH "-Wl,-rpath,\$libdir")
set(LDFLAGS_GL)
set(RESCOMP)
wx_configure_script(
"${CMAKE_CURRENT_SOURCE_DIR}/wx-config.in"

2
build/cmake/files.cmake
View File

@@ -175,6 +175,7 @@ set(QT_WIN32_SRC
src/msw/dialup.cpp
src/msw/dib.cpp
src/msw/joystick.cpp
src/qt/graphics.cpp
)
set(QT_WIN32_HDR
@@ -908,6 +909,7 @@ set(GUI_CMN_SRC
src/generic/wizard.cpp
src/generic/editlbox.cpp
src/generic/datavgen.cpp
src/generic/rowheightcache.cpp
)
set(GUI_CMN_HDR

53
build/cmake/functions.cmake
View File

@@ -105,6 +105,14 @@ function(wx_set_common_target_properties target_name)
endif()
# TODO: add warning flags for other compilers
endif()
if(CMAKE_USE_PTHREADS_INIT)
target_compile_options(${target_name} PRIVATE "-pthread")
# clang++.exe: warning: argument unused during compilation: '-pthread' [-Wunused-command-line-argument]
if(NOT (WIN32 AND "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang"))
set_target_properties(${target_name} PROPERTIES LINK_FLAGS "-pthread")
endif()
endif()
endfunction()
# Set common properties on wx library target
@@ -170,7 +178,9 @@ function(wx_set_target_properties target_name is_base)
set_target_properties(${target_name}
PROPERTIES
OUTPUT_NAME wx_${lib_toolkit}${lib_unicode}${lib_suffix}-${lib_version}
OUTPUT_NAME_DEBUG wx_${lib_toolkit}${lib_unicode}d${lib_suffix}-${lib_version}
# NOTE: wx-config can not be used to connect the libraries with the debug suffix.
#OUTPUT_NAME_DEBUG wx_${lib_toolkit}${lib_unicode}d${lib_suffix}-${lib_version}
OUTPUT_NAME_DEBUG wx_${lib_toolkit}${lib_unicode}${lib_suffix}-${lib_version}
)
endif()
if(CYGWIN)
@@ -278,6 +288,9 @@ function(wx_set_target_properties target_name is_base)
wx_set_common_target_properties(${target_name})
endfunction()
# List of libraries added via wx_add_library() to use for wx-config
set(wxLIB_TARGETS)
# Add a wxWidgets library
# wx_add_library(<target_name> [IS_BASE] <src_files>...)
# first parameter is the name of the library
@@ -287,6 +300,9 @@ macro(wx_add_library name)
cmake_parse_arguments(wxADD_LIBRARY "IS_BASE" "" "" ${ARGN})
set(src_files ${wxADD_LIBRARY_UNPARSED_ARGUMENTS})
list(APPEND wxLIB_TARGETS ${name})
set(wxLIB_TARGETS ${wxLIB_TARGETS} PARENT_SCOPE)
if(wxBUILD_MONOLITHIC AND NOT ${name} STREQUAL "mono")
# collect all source files for mono library
set(wxMONO_SRC_FILES ${wxMONO_SRC_FILES} ${src_files} PARENT_SCOPE)
@@ -313,8 +329,6 @@ macro(wx_add_library name)
RUNTIME DESTINATION "lib${wxPLATFORM_LIB_DIR}"
BUNDLE DESTINATION Applications/wxWidgets
)
list(APPEND wxLIB_TARGETS ${name})
endif()
endmacro()
@@ -349,7 +363,6 @@ endmacro()
# Enable precompiled headers for wx libraries
macro(wx_finalize_lib target_name)
set(wxLIB_TARGETS ${wxLIB_TARGETS} PARENT_SCOPE)
if(wxBUILD_PRECOMP)
if(TARGET ${target_name})
wx_target_enable_precomp(${target_name} "${wxSOURCE_DIR}/include/wx/wxprec.h")
@@ -519,16 +532,36 @@ function(wx_add_thirdparty_library var_name lib_name help_str)
endfunction()
function(wx_print_thirdparty_library_summary)
set(nameLength 0)
set(nameValLength 0)
set(var_name)
set(message "Which libraries should wxWidgets use?\n")
foreach(entry IN
LISTS wxTHIRD_PARTY_LIBRARIES
ITEMS wxUSE_STL "Use C++ STL classes")
foreach(entry IN LISTS wxTHIRD_PARTY_LIBRARIES)
if(NOT var_name)
set(var_name ${entry})
else()
wx_string_append(message " ${var_name}: ${${var_name}} (${entry})\n")
string(LENGTH ${var_name} len)
if(len GREATER nameLength)
set(nameLength ${len})
endif()
string(LENGTH ${${var_name}} len)
if(len GREATER nameValLength)
set(nameValLength ${len})
endif()
set(var_name)
endif()
endforeach()
math(EXPR nameLength "${nameLength}+1") # account for :
set(message "Which libraries should wxWidgets use?\n")
foreach(entry IN LISTS wxTHIRD_PARTY_LIBRARIES)
if(NOT var_name)
set(var_name ${entry})
else()
set(namestr "${var_name}: ")
set(nameval "${${var_name}} ")
string(SUBSTRING ${namestr} 0 ${nameLength} namestr)
string(SUBSTRING ${nameval} 0 ${nameValLength} nameval)
wx_string_append(message " ${namestr} ${nameval} (${entry})\n")
set(var_name)
endif()
endforeach()

174
build/cmake/init.cmake
View File

@@ -11,13 +11,22 @@
if(DEFINED wxBUILD_USE_STATIC_RUNTIME AND wxBUILD_USE_STATIC_RUNTIME)
# Set MSVC runtime flags for all configurations
foreach(cfg "" ${CMAKE_CONFIGURATION_TYPES})
set(flag_var CMAKE_CXX_FLAGS)
set(c_flag_var CMAKE_C_FLAGS)
set(cxx_flag_var CMAKE_CXX_FLAGS)
if(cfg)
string(TOUPPER ${cfg} cfg_upper)
wx_string_append(flag_var "_${cfg_upper}")
wx_string_append(c_flag_var "_${cfg_upper}")
wx_string_append(cxx_flag_var "_${cfg_upper}")
endif()
if(${flag_var} MATCHES "/MD")
string(REGEX REPLACE "/MD" "/MT" ${flag_var} "${${flag_var}}")
if(${c_flag_var} MATCHES "/MD")
string(REPLACE "/MD" "/MT" ${c_flag_var} "${${c_flag_var}}")
set(${c_flag_var} ${${c_flag_var}} CACHE STRING
"Flags used by the C compiler during ${cfg_upper} builds." FORCE)
endif()
if(${cxx_flag_var} MATCHES "/MD")
string(REPLACE "/MD" "/MT" ${cxx_flag_var} "${${cxx_flag_var}}")
set(${cxx_flag_var} ${${cxx_flag_var}} CACHE STRING
"Flags used by the CXX compiler during ${cfg_upper} builds." FORCE)
endif()
endforeach()
endif()
@@ -134,9 +143,6 @@ if(NOT wxUSE_EXPAT)
set(wxUSE_XRC OFF)
endif()
set(wxUSE_XML ${wxUSE_XRC})
if(wxUSE_CONFIG)
set(wxUSE_CONFIG_NATIVE ON)
endif()
if(DEFINED wxUSE_OLE AND wxUSE_OLE)
set(wxUSE_OLE_AUTOMATION ON)
@@ -146,24 +152,92 @@ if(wxUSE_OPENGL)
set(wxUSE_GLCANVAS ON)
endif()
if(wxUSE_ARCHIVE_STREAMS AND NOT wxUSE_STREAMS)
message(WARNING "wxArchive requires wxStreams... disabled")
wx_option_force_value(wxUSE_ARCHIVE_STREAMS OFF)
endif()
if(wxUSE_ZIPSTREAM AND (NOT wxUSE_ARCHIVE_STREAMS OR NOT wxUSE_ZLIB))
message(WARNING "wxZip requires wxArchive or wxZlib... disabled")
wx_option_force_value(wxUSE_ZIPSTREAM OFF)
endif()
if(wxUSE_TARSTREAM AND NOT wxUSE_ARCHIVE_STREAMS)
message(WARNING "wxTar requires wxArchive... disabled")
wx_option_force_value(wxUSE_TARSTREAM OFF)
endif()
if(wxUSE_FILESYSTEM AND (NOT wxUSE_STREAMS OR (NOT wxUSE_FILE AND NOT wxUSE_FFILE)))
message(WARNING "wxFileSystem requires wxStreams and wxFile or wxFFile... disabled")
wx_option_force_value(wxUSE_FILESYSTEM OFF)
endif()
if(wxUSE_FS_ARCHIVE AND (NOT wxUSE_FILESYSTEM OR NOT wxUSE_ARCHIVE_STREAMS))
message(WARNING "wxArchiveFSHandler requires wxArchive and wxFileSystem... disabled")
wx_option_force_value(wxUSE_FS_ARCHIVE OFF)
endif()
if(wxUSE_FS_ARCHIVE AND (NOT wxUSE_FILESYSTEM OR NOT wxUSE_ARCHIVE_STREAMS))
message(WARNING "wxArchiveFSHandler requires wxArchive and wxFileSystem... disabled")
wx_option_force_value(wxUSE_FS_ARCHIVE OFF)
endif()
if(wxUSE_FS_ZIP AND NOT wxUSE_FS_ARCHIVE)
message(WARNING "wxZipFSHandler requires wxArchiveFSHandler... disabled")
wx_option_force_value(wxUSE_FS_ZIP OFF)
endif()
if(wxUSE_TEXTFILE AND (NOT wxUSE_FILE OR NOT wxUSE_TEXTBUFFER))
message(WARNING "wxTextFile requires wxFile and wxTextBuffer... disabled")
wx_option_force_value(wxUSE_TEXTFILE OFF)
endif()
if(wxUSE_CONFIG)
if(NOT wxUSE_TEXTFILE)
message(WARNING "wxConfig requires wxTextFile... disabled")
wx_option_force_value(wxUSE_CONFIG OFF)
else()
set(wxUSE_CONFIG_NATIVE ON)
endif()
endif()
if(wxUSE_INTL AND NOT wxUSE_FILE)
message(WARNING "I18n code requires wxFile... disabled")
wx_option_force_value(wxUSE_INTL OFF)
endif()
if(wxUSE_THREADS)
find_package(Threads REQUIRED)
endif()
if(wxUSE_LIBLZMA)
find_package(LibLZMA REQUIRED)
endif()
if(UNIX AND wxUSE_SECRETSTORE)
# The required APIs are always available under MSW and OS X but we must
# have GNOME libsecret under Unix to be able to compile this class.
find_package(Libsecret REQUIRED)
if(NOT LIBSECRET_FOUND)
message(WARNING "libsecret not found, wxSecretStore won't be available")
wx_option_force_value(wxUSE_SECRETSTORE OFF)
find_package(LibLZMA)
if(NOT LIBLZMA_FOUND)
message(WARNING "libLZMA not found, LZMA compression won't be available")
wx_option_force_value(wxUSE_LIBLZMA OFF)
endif()
endif()
if(UNIX)
if(wxUSE_SECRETSTORE AND NOT APPLE)
# The required APIs are always available under MSW and OS X but we must
# have GNOME libsecret under Unix to be able to compile this class.
find_package(Libsecret)
if(NOT LIBSECRET_FOUND)
message(WARNING "libsecret not found, wxSecretStore won't be available")
wx_option_force_value(wxUSE_SECRETSTORE OFF)
endif()
endif()
if(wxUSE_LIBICONV)
find_package(Iconv)
if(NOT ICONV_FOUND)
message(WARNING "iconv not found")
wx_option_force_value(wxUSE_LIBICONV OFF)
endif()
endif()
endif(UNIX)
if(wxUSE_GUI)
if(WXMSW AND wxUSE_METAFILE)
# this one should probably be made separately configurable
@@ -283,9 +357,12 @@ if(wxUSE_GUI)
message(WARNING "GStreamer not found, wxMediaCtrl won't be available")
wx_option_force_value(wxUSE_MEDIACTRL OFF)
endif()
else()
set(wxUSE_GSTREAMER OFF)
set(wxUSE_GSTREAMER_PLAYER OFF)
endif()
if(UNIX AND wxUSE_LIBSDL)
if(wxUSE_SOUND AND wxUSE_LIBSDL AND UNIX AND NOT APPLE)
find_package(SDL2)
if(NOT SDL2_FOUND)
find_package(SDL)
@@ -294,5 +371,66 @@ if(wxUSE_GUI)
message(WARNING "SDL not found, SDL Audio back-end won't be available")
wx_option_force_value(wxUSE_LIBSDL OFF)
endif()
else()
set(wxUSE_LIBSDL OFF)
endif()
if(wxUSE_NOTIFICATION_MESSAGE AND UNIX AND WXGTK2 AND wxUSE_LIBNOTIFY)
find_package(LibNotify)
if(NOT LIBNOTIFY_FOUND)
message(WARNING "Libnotify not found, it won't be used for notifications")
wx_option_force_value(wxUSE_LIBNOTIFY OFF)
elseif((LIBNOTIFY_VERSION GREATER 0.7) OR (LIBNOTIFY_VERSION EQUAL 0.7))
set(wxUSE_LIBNOTIFY_0_7 ON)
endif()
else()
set(wxUSE_LIBNOTIFY OFF)
endif()
if(wxUSE_UIACTIONSIMULATOR AND UNIX AND WXGTK)
if(wxUSE_XTEST)
find_package(XTest)
if(XTEST_FOUND)
list(APPEND wxTOOLKIT_INCLUDE_DIRS ${XTEST_INCLUDE_DIRS})
list(APPEND wxTOOLKIT_LIBRARIES ${XTEST_LIBRARIES})
else()
if(WXGTK3)
# This class can't work without XTest with GTK+ 3
# which uses XInput2 and so ignores XSendEvent().
message(STATUS "XTest not found, wxUIActionSimulator won't be available")
wx_option_force_value(wxUSE_UIACTIONSIMULATOR OFF)
endif()
# The other ports can use XSendEvent(), so don't warn
wx_option_force_value(wxUSE_XTEST OFF)
endif()
else(WXGTK3)
# As per above, wxUIActionSimulator can't be used in this case,
# but there is no need to warn, presumably the user knows what
# he's doing if wxUSE_XTEST was explicitly disabled.
wx_option_force_value(wxUSE_UIACTIONSIMULATOR OFF)
endif()
endif()
if(wxUSE_HTML AND UNIX AND wxUSE_LIBMSPACK)
find_package(MSPACK)
if(NOT MSPACK_FOUND)
message(STATUS "libmspack not found")
wx_option_force_value(wxUSE_LIBMSPACK OFF)
endif()
else()
set(wxUSE_LIBMSPACK OFF)
endif()
if(WXGTK2 AND wxUSE_MIMETYPE AND wxUSE_LIBGNOMEVFS)
find_package(GnomeVFS2)
if(GNOMEVFS2_FOUND)
list(APPEND wxTOOLKIT_INCLUDE_DIRS ${GNOMEVFS2_INCLUDE_DIRS})
list(APPEND wxTOOLKIT_LIBRARIES ${GNOMEVFS2_LIBRARIES})
else()
message(STATUS "libgnomevfs not found, library won't be used to associate MIME type")
wx_option_force_value(wxUSE_LIBGNOMEVFS OFF)
endif()
else()
set(wxUSE_LIBGNOMEVFS OFF)
endif()
endif()

16
build/cmake/install.cmake
View File

@@ -12,13 +12,19 @@ if(NOT wxBUILD_INSTALL)
endif()
install(CODE "message(STATUS \"Installing: Headers...\")")
wx_install(
DIRECTORY "${wxSOURCE_DIR}/include/wx"
DESTINATION "include")
if(MSVC)
if(UNIX)
wx_install(
DIRECTORY "${wxSOURCE_DIR}/include/msvc"
DIRECTORY "${wxSOURCE_DIR}/include/wx"
DESTINATION "include/wx-${wxMAJOR_VERSION}.${wxMINOR_VERSION}")
else()
wx_install(
DIRECTORY "${wxSOURCE_DIR}/include/wx"
DESTINATION "include")
if(MSVC)
wx_install(
DIRECTORY "${wxSOURCE_DIR}/include/msvc"
DESTINATION "include")
endif()
endif()
# setup header and wx-config

2
build/cmake/lib/CMakeLists.txt
View File

@@ -9,7 +9,6 @@
include(../source_groups.cmake)
set(wxLIB_TARGETS)
if(wxBUILD_MONOLITHIC)
# Initialize variables for monolithic build
set(wxMONO_SRC_FILES)
@@ -101,4 +100,3 @@ endif()
# Propagate variable(s) to parent scope
set(wxLIB_TARGETS ${wxLIB_TARGETS} PARENT_SCOPE)
set(wxTHIRD_PARTY_LIBRARIES ${wxTHIRD_PARTY_LIBRARIES} PARENT_SCOPE)

4
build/cmake/lib/base/CMakeLists.txt
View File

@@ -48,8 +48,8 @@ if(UNIX AND wxUSE_SECRETSTORE)
wx_lib_include_directories(base PRIVATE ${LIBSECRET_INCLUDE_DIRS})
wx_lib_link_libraries(base PRIVATE ${LIBSECRET_LIBRARIES})
endif()
if(wxUSE_LIBICONV AND ICONV_FOUND)
wx_lib_include_directories(base PRIVATE ${ICONV_INCLUDE_DIRS})
if(wxUSE_LIBICONV)
wx_lib_include_directories(base PRIVATE ${ICONV_INCLUDE_DIR})
wx_lib_link_libraries(base PRIVATE ${ICONV_LIBRARIES})
endif()
if(wxUSE_THREADS AND CMAKE_THREAD_LIBS_INIT)

6
build/cmake/lib/core/CMakeLists.txt
View File

@@ -77,7 +77,7 @@ if(WXGTK AND wxUSE_PRIVATE_FONTS)
wx_lib_include_directories(core PUBLIC ${FONTCONFIG_INCLUDE_DIR})
wx_lib_link_libraries(core PUBLIC ${FONTCONFIG_LIBRARIES})
endif()
if(UNIX AND wxUSE_LIBSDL)
if(wxUSE_LIBSDL)
if(SDL2_FOUND)
wx_lib_include_directories(core PUBLIC ${SDL2_INCLUDE_DIR})
wx_lib_link_libraries(core PUBLIC ${SDL2_LIBRARY})
@@ -86,5 +86,9 @@ if(UNIX AND wxUSE_LIBSDL)
wx_lib_link_libraries(core PUBLIC ${SDL_LIBRARY})
endif()
endif()
if(wxUSE_LIBNOTIFY)
wx_lib_include_directories(core PUBLIC ${LIBNOTIFY_INCLUDE_DIRS})
wx_lib_link_libraries(core PUBLIC ${LIBNOTIFY_LIBRARIES})
endif()
wx_finalize_lib(core)

7
build/cmake/lib/html/CMakeLists.txt
View File

@@ -11,10 +11,15 @@ include(../../source_groups.cmake)
wx_append_sources(HTML_FILES HTML_CMN)
if(WIN32)
if(WIN32 OR wxUSE_LIBMSPACK)
wx_append_sources(HTML_FILES HTML_MSW)
endif()
wx_add_library(html ${HTML_FILES})
if(wxUSE_LIBMSPACK)
wx_lib_include_directories(html PRIVATE ${MSPACK_INCLUDE_DIRS})
wx_lib_link_libraries(html PRIVATE ${MSPACK_LIBRARIES})
endif()
wx_finalize_lib(html)

4
build/cmake/lib/stc/CMakeLists.txt
View File

@@ -163,6 +163,8 @@ target_include_directories(wxscintilla PRIVATE
target_compile_definitions(wxscintilla PUBLIC
NO_CXX11_REGEX
__WX__
SCI_LEXER
LINK_LEXERS
)
if(wxBUILD_PRECOMP)
@@ -183,6 +185,8 @@ wx_lib_include_directories(stc PRIVATE
${wxSOURCE_DIR}/src/stc/scintilla/src
)
wx_lib_compile_definitions(stc PRIVATE
NO_CXX11_REGEX
__WX__
SCI_LEXER
LINK_LEXERS
)

90
build/cmake/modules/FindGnomeVFS2.cmake Normal file
View File

@@ -0,0 +1,90 @@
# - Try to find GnomeVFS2
# Once done this will define
#
# GNOMEVFS2_FOUND - system has GnomeVFS2
# GNOMEVFS2_INCLUDE_DIRS - the GnomeVFS2 include directory
# GNOMEVFS2_LIBRARIES - Link these to use GnomeVFS2
# GNOMEVFS2_DEFINITIONS - Compiler switches required for using GnomeVFS2
#
# Copyright (c) 2008 Joshua L. Blocher <verbalshadow@gmail.com>
#
# Redistribution and use is allowed according to the terms of the New
# BSD license.
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
#
if (GNOMEVFS2_LIBRARIES AND GNOMEVFS2_INCLUDE_DIRS)
# in cache already
set(GNOMEVFS2_FOUND TRUE)
else (GNOMEVFS2_LIBRARIES AND GNOMEVFS2_INCLUDE_DIRS)
# use pkg-config to get the directories and then use these values
# in the FIND_PATH() and FIND_LIBRARY() calls
if (${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4)
include(UsePkgConfig)
pkgconfig(gnome-vfs-2.0 _GNOMEVFS2_INCLUDEDIR _GNOMEVFS2_LIBDIR _GNOMEVFS2_LDFLAGS _GNOMEVFS2_CFLAGS)
else (${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4)
find_package(PkgConfig)
if (PKG_CONFIG_FOUND)
pkg_check_modules(_GNOMEVFS2 gnome-vfs-2.0)
endif (PKG_CONFIG_FOUND)
endif (${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4)
find_path(GNOMEVFS2_INCLUDE_DIR
NAMES
libgnomevfs/gnome-vfs.h
PATHS
${_GNOMEVFS2_INCLUDEDIR}
/usr/include
/usr/local/include
/opt/local/include
/sw/include
$ENV{DEVLIBS_PATH}//include//
PATH_SUFFIXES
gnome-vfs-2.0
)
find_library(GNOMEVFS-2_LIBRARY
NAMES
gnomevfs-2
PATHS
${_GNOMEVFS2_LIBDIR}
/usr/lib
/usr/local/lib
/opt/local/lib
/sw/lib
)
if (GNOMEVFS-2_LIBRARY)
set(GNOMEVFS-2_FOUND TRUE)
endif (GNOMEVFS-2_LIBRARY)
set(GNOMEVFS2_INCLUDE_DIRS
${GNOMEVFS2_INCLUDE_DIR}
)
if (GNOMEVFS-2_FOUND)
set(GNOMEVFS2_LIBRARIES
${GNOMEVFS2_LIBRARIES}
${GNOMEVFS-2_LIBRARY}
)
endif (GNOMEVFS-2_FOUND)
if (GNOMEVFS2_INCLUDE_DIRS AND GNOMEVFS2_LIBRARIES)
set(GNOMEVFS2_FOUND TRUE)
endif (GNOMEVFS2_INCLUDE_DIRS AND GNOMEVFS2_LIBRARIES)
if (GNOMEVFS2_FOUND)
if (NOT GnomeVFS2_FIND_QUIETLY)
message(STATUS "Found GnomeVFS2: ${GNOMEVFS2_LIBRARIES}")
endif (NOT GnomeVFS2_FIND_QUIETLY)
else (GNOMEVFS2_FOUND)
if (GnomeVFS2_FIND_REQUIRED)
message(FATAL_ERROR "Could not find GnomeVFS2")
endif (GnomeVFS2_FIND_REQUIRED)
endif (GNOMEVFS2_FOUND)
# show the GNOMEVFS2_INCLUDE_DIRS and GNOMEVFS2_LIBRARIES variables only in the advanced view
mark_as_advanced(GNOMEVFS2_INCLUDE_DIRS GNOMEVFS2_LIBRARIES)
endif (GNOMEVFS2_LIBRARIES AND GNOMEVFS2_INCLUDE_DIRS)

2
build/cmake/modules/FindIconv.cmake
View File

@@ -25,6 +25,7 @@ ENDIF(ICONV_INCLUDE_DIR AND ICONV_LIBRARIES)
set(CMAKE_REQUIRED_INCLUDES ${ICONV_INCLUDE_DIR})
set(CMAKE_REQUIRED_LIBRARIES ${ICONV_LIBRARIES})
set(CMAKE_REQUIRED_QUIET ON)
IF(ICONV_FOUND)
check_cxx_source_compiles("
#include <iconv.h>
@@ -41,6 +42,7 @@ IF(ICONV_FOUND)
ENDIF(ICONV_FOUND)
set(CMAKE_REQUIRED_INCLUDES)
set(CMAKE_REQUIRED_LIBRARIES)
set(CMAKE_REQUIRED_QUIET)
IF(ICONV_FOUND)
IF(NOT ICONV_FIND_QUIETLY)

55
build/cmake/modules/FindLibNotify.cmake Normal file
View File

@@ -0,0 +1,55 @@
# - Try to find LibNotify
# This module defines the following variables:
#
# LIBNOTIFY_FOUND - LibNotify was found
# LIBNOTIFY_INCLUDE_DIRS - the LibNotify include directories
# LIBNOTIFY_LIBRARIES - link these to use LibNotify
#
# Copyright (C) 2012 Raphael Kubo da Costa <rakuco@webkit.org>
# Copyright (C) 2014 Collabora Ltd.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
# 1. Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in the
# documentation and/or other materials provided with the distribution.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND ITS CONTRIBUTORS ``AS
# IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR ITS
# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
find_package(PkgConfig)
pkg_check_modules(LIBNOTIFY QUIET libnotify)
find_path(LIBNOTIFY_INCLUDE_DIRS
NAMES notify.h
HINTS ${LIBNOTIFY_INCLUDEDIR}
${LIBNOTIFY_INCLUDE_DIRS}
PATH_SUFFIXES libnotify
)
find_library(LIBNOTIFY_LIBRARIES
NAMES notify
HINTS ${LIBNOTIFY_LIBDIR}
${LIBNOTIFY_LIBRARY_DIRS}
)
include(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibNotify REQUIRED_VARS LIBNOTIFY_INCLUDE_DIRS LIBNOTIFY_LIBRARIES
VERSION_VAR LIBNOTIFY_VERSION)
mark_as_advanced(
LIBNOTIFY_INCLUDE_DIRS
LIBNOTIFY_LIBRARIES
)

40
build/cmake/modules/FindMSPACK.cmake Normal file
View File

@@ -0,0 +1,40 @@
## FindMSPACK.cmake
##
## Copyright (C) 2016 Christian Schenk
##
## This file is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published
## by the Free Software Foundation; either version 2, or (at your
## option) any later version.
##
## This file is distributed in the hope that it will be useful, but
## WITHOUT ANY WARRANTY; without even the implied warranty of
## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
## General Public License for more details.
##
## You should have received a copy of the GNU General Public License
## along with this file; if not, write to the Free Software
## Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
## USA.
find_path(MSPACK_INCLUDE_DIR
NAMES
mspack.h
)
find_library(MSPACK_LIBRARY
NAMES
mspack
)
find_package_handle_standard_args(MSPACK DEFAULT_MSG MSPACK_LIBRARY MSPACK_INCLUDE_DIR)
if(MSPACK_FOUND)
set(MSPACK_INCLUDE_DIRS ${MSPACK_INCLUDE_DIR})
set(MSPACK_LIBRARIES ${MSPACK_LIBRARY})
else()
set(MSPACK_INCLUDE_DIRS)
set(MSPACK_LIBRARIES)
endif()
mark_as_advanced(MSPACK_LIBRARY MSPACK_INCLUDE_DIR)

51
build/cmake/modules/FindXTest.cmake Normal file
View File

@@ -0,0 +1,51 @@
# - Find XTEST
# Find the XTEST libraries
#
# This module defines the following variables:
# XTEST_FOUND - true if XTEST_INCLUDE_DIR & XTEST_LIBRARY are found
# XTEST_LIBRARIES - Set when XTEST_LIBRARY is found
# XTEST_INCLUDE_DIRS - Set when XTEST_INCLUDE_DIR is found
#
# XTEST_INCLUDE_DIR - where to find XTest.h, etc.
# XTEST_LIBRARY - the XTEST library
#
#=============================================================================
# Copyright 2011 O.S. Systems Software Ltda.
# Copyright 2011 Otavio Salvador <otavio@ossystems.com.br>
# Copyright 2011 Marc-Andre Moreau <marcandre.moreau@gmail.com>
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#=============================================================================
find_path(XTEST_INCLUDE_DIR NAMES X11/extensions/XTest.h
PATH_SUFFIXES X11/extensions
PATHS /opt/X11/include
DOC "The XTest include directory"
)
find_library(XTEST_LIBRARY NAMES Xtst
PATHS /opt/X11/lib
DOC "The XTest library"
)
include(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(XTest DEFAULT_MSG XTEST_LIBRARY XTEST_INCLUDE_DIR)
if(XTEST_FOUND)
set( XTEST_LIBRARIES ${XTEST_LIBRARY} )
set( XTEST_INCLUDE_DIRS ${XTEST_INCLUDE_DIR} )
endif()
mark_as_advanced(XTEST_INCLUDE_DIR XTEST_LIBRARY)

13
build/cmake/options.cmake
View File

@@ -46,6 +46,7 @@ endif()
# STL options
wx_option(wxUSE_STL "use standard C++ classes for everything" OFF)
set(wxTHIRD_PARTY_LIBRARIES ${wxTHIRD_PARTY_LIBRARIES} wxUSE_STL "use C++ STL classes")
wx_dependent_option(wxUSE_STD_CONTAINERS "use standard C++ container classes" ON "wxUSE_STL" OFF)
wx_option(wxUSE_UNICODE "compile with Unicode support (NOT RECOMMENDED to be turned off)")
@@ -74,10 +75,17 @@ wx_option(wxUSE_LIBLZMA "use LZMA compression" OFF)
set(wxTHIRD_PARTY_LIBRARIES ${wxTHIRD_PARTY_LIBRARIES} wxUSE_LIBLZMA "use liblzma for LZMA compression")
wx_option(wxUSE_OPENGL "use OpenGL (or Mesa)")
wx_option(wxUSE_LIBSDL "use SDL for audio on Unix")
if(NOT WIN32)
if(UNIX)
wx_option(wxUSE_LIBSDL "use SDL for audio on Unix")
wx_option(wxUSE_LIBICONV "use libiconv (character conversion)")
wx_option(wxUSE_LIBNOTIFY "use libnotify for notifications")
wx_option(wxUSE_XTEST "use XTest extension")
wx_option(wxUSE_LIBMSPACK "use libmspack (CHM help files loading)")
wx_option(wxUSE_LIBGNOMEVFS "use GNOME VFS for associating MIME types")
set(wxTHIRD_PARTY_LIBRARIES ${wxTHIRD_PARTY_LIBRARIES} wxUSE_LIBSDL "use SDL for audio on Unix")
set(wxTHIRD_PARTY_LIBRARIES ${wxTHIRD_PARTY_LIBRARIES} wxUSE_LIBMSPACK "use libmspack (CHM help files loading)")
endif()
# ---------------------------------------------------------------------------
@@ -166,6 +174,7 @@ if(WIN32)
endif()
wx_option(wxUSE_DBGHELP "use dbghelp.dll API" ${wxUSE_DBGHELP_DEFAULT})
wx_option(wxUSE_INICONF "use wxIniConfig")
wx_option(wxUSE_WINSOCK2 "include <winsock2.h> rather than <winsock.h>" OFF)
wx_option(wxUSE_REGKEY "use wxRegKey class")
endif()

2
build/cmake/samples/html.cmake
View File

@@ -37,7 +37,7 @@ wx_add_sample(test
LIBRARIES net html NAME htmltest)
wx_add_sample(virtual DATA start.htm LIBRARIES html)
wx_add_sample(widget DATA start.htm LIBRARIES html)
wx_add_sample(zip DATA pages.zip start.htm LIBRARIES html DEPENDS wxUSE_FSZIP)
wx_add_sample(zip DATA pages.zip start.htm LIBRARIES html DEPENDS wxUSE_FS_ZIP)
set(wxSAMPLE_SUBDIR)
set(wxSAMPLE_FOLDER)

14
build/cmake/setup.cmake
View File

@@ -217,9 +217,8 @@ macro(wx_get_socket_param_type name code)
endmacro()
# the following tests are for Unix(like) systems only
if(NOT WIN32)
if(wxUSE_LIBICONV AND NOT APPLE)
find_package(Iconv REQUIRED)
if(UNIX)
if(wxUSE_LIBICONV)
set(HAVE_ICONV ON)
set(ICONV_CONST " ")
if(ICONV_SECOND_ARGUMENT_IS_CONST)
@@ -419,8 +418,8 @@ if(NOT WIN32)
check_symbol_exists(getservbyname netdb.h HAVE_GETSERVBYNAME)
check_symbol_exists(inet_aton arpa/inet.h HAVE_INET_ATON)
check_symbol_exists(inet_addr arpa/inet.h HAVE_INET_ADDR)
endif() # wxUSE_SOCKETS
endif() # NOT WIN32
endif(wxUSE_SOCKETS)
endif(UNIX)
if(CMAKE_USE_PTHREADS_INIT)
cmake_push_check_state(RESET)
@@ -641,7 +640,10 @@ endif()
if(wxUSE_XLOCALE)
check_include_file(xlocale.h HAVE_XLOCALE_H)
set(CMAKE_EXTRA_INCLUDE_FILES xlocale.h locale.h)
set(CMAKE_EXTRA_INCLUDE_FILES locale.h)
if(HAVE_XLOCALE_H)
list(APPEND CMAKE_EXTRA_INCLUDE_FILES xlocale.h)
endif()
check_type_size(locale_t LOCALE_T)
set(CMAKE_EXTRA_INCLUDE_FILES)
endif()

2
build/cmake/setup.h.in
View File

@@ -714,6 +714,8 @@
#cmakedefine01 wxUSE_INICONF
#cmakedefine01 wxUSE_WINSOCK2
#cmakedefine01 wxUSE_DATEPICKCTRL_GENERIC

3
build/cmake/tests/CMakeLists.txt
View File

@@ -16,6 +16,3 @@ add_subdirectory(drawing)
add_subdirectory(gui)
endif()
# Propagate variable(s) to parent scope
set(wxTHIRD_PARTY_LIBRARIES ${wxTHIRD_PARTY_LIBRARIES} PARENT_SCOPE)

2
build/cmake/utils/CMakeLists.txt
View File

@@ -20,8 +20,8 @@ if(wxUSE_XRC)
set_target_properties(wxrc PROPERTIES FOLDER "Utilities")
wx_install(TARGETS wxrc RUNTIME DESTINATION "bin")
if(UNIX)
wx_install(TARGETS wxrc RUNTIME DESTINATION "bin")
install(CODE "execute_process( \
COMMAND ${CMAKE_COMMAND} -E rename \
${CMAKE_INSTALL_PREFIX}/bin/wxrc \

2
build/files
View File

@@ -199,6 +199,7 @@ QT_WIN32_SRC=
src/msw/dib.cpp
src/msw/joystick.cpp
src/msw/sound.cpp
src/qt/graphics.cpp
QT_WIN32_HDR=
wx/msw/ole/automtn.h
@@ -899,6 +900,7 @@ GUI_CMN_SRC =
src/generic/renderg.cpp
src/generic/richmsgdlgg.cpp
src/generic/richtooltipg.cpp
src/generic/rowheightcache.cpp
src/generic/sashwin.cpp
src/generic/scrlwing.cpp
src/generic/selstore.cpp

48
build/msw/makefile.bcc
View File

@@ -38,7 +38,7 @@ MAKEARGS = -DCC="$(CC)" -DCXX="$(CXX)" -DCFLAGS="$(CFLAGS)" \
-DWX_FLAVOUR="$(WX_FLAVOUR)" -DWX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" \
-DCFG="$(CFG)" -DRUNTIME_LIBS="$(RUNTIME_LIBS)"
WX_RELEASE_NODOT = 31
WX_VERSION_NODOT = $(WX_RELEASE_NODOT)2
WX_VERSION_NODOT = $(WX_RELEASE_NODOT)3
COMPILER_PREFIX = bcc
OBJS = \
$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
@@ -2126,7 +2126,8 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_datavgen.obj \
$(OBJS)\monodll_editlbox.obj \
$(OBJS)\monodll_laywin.obj \
$(OBJS)\monodll_calctrlg.obj
$(OBJS)\monodll_calctrlg.obj \
$(OBJS)\monodll_rowheightcache.obj
!endif
!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
____CORE_SRC_FILENAMES_OBJECTS = \
@@ -2451,7 +2452,8 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_datavgen.obj \
$(OBJS)\monodll_editlbox.obj \
$(OBJS)\monodll_laywin.obj \
$(OBJS)\monodll_calctrlg.obj
$(OBJS)\monodll_calctrlg.obj \
$(OBJS)\monodll_rowheightcache.obj
!endif
!if "$(USE_STC)" == "1"
____MONOLIB_STC_SRC_FILENAMES_OBJECTS = \
@@ -2955,7 +2957,8 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_datavgen.obj \
$(OBJS)\monolib_editlbox.obj \
$(OBJS)\monolib_laywin.obj \
$(OBJS)\monolib_calctrlg.obj
$(OBJS)\monolib_calctrlg.obj \
$(OBJS)\monolib_rowheightcache.obj
!endif
!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
____CORE_SRC_FILENAMES_1_OBJECTS = \
@@ -3280,7 +3283,8 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_datavgen.obj \
$(OBJS)\monolib_editlbox.obj \
$(OBJS)\monolib_laywin.obj \
$(OBJS)\monolib_calctrlg.obj
$(OBJS)\monolib_calctrlg.obj \
$(OBJS)\monolib_rowheightcache.obj
!endif
!if "$(USE_STC)" == "1"
____MONOLIB_STC_SRC_FILENAMES_1_OBJECTS = \
@@ -3659,7 +3663,8 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_datavgen.obj \
$(OBJS)\coredll_editlbox.obj \
$(OBJS)\coredll_laywin.obj \
$(OBJS)\coredll_calctrlg.obj
$(OBJS)\coredll_calctrlg.obj \
$(OBJS)\coredll_rowheightcache.obj
!endif
!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
____CORE_SRC_FILENAMES_2_OBJECTS = \
@@ -3984,7 +3989,8 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_datavgen.obj \
$(OBJS)\coredll_editlbox.obj \
$(OBJS)\coredll_laywin.obj \
$(OBJS)\coredll_calctrlg.obj
$(OBJS)\coredll_calctrlg.obj \
$(OBJS)\coredll_rowheightcache.obj
!endif
!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1"
__corelib___depname = \
@@ -4329,7 +4335,8 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_datavgen.obj \
$(OBJS)\corelib_editlbox.obj \
$(OBJS)\corelib_laywin.obj \
$(OBJS)\corelib_calctrlg.obj
$(OBJS)\corelib_calctrlg.obj \
$(OBJS)\corelib_rowheightcache.obj
!endif
!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
____CORE_SRC_FILENAMES_3_OBJECTS = \
@@ -4654,7 +4661,8 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_datavgen.obj \
$(OBJS)\corelib_editlbox.obj \
$(OBJS)\corelib_laywin.obj \
$(OBJS)\corelib_calctrlg.obj
$(OBJS)\corelib_calctrlg.obj \
$(OBJS)\corelib_rowheightcache.obj
!endif
!if "$(SHARED)" == "1"
____wxcore_namedll_DEP = $(__coredll___depname)
@@ -5563,7 +5571,7 @@ $(SETUPHDIR)\wx\msw\rcdefs.h: $(SETUPHDIR)\wx\msw ..\..\include\wx\msw\genrcdefs
build_cfg_file: $(SETUPHDIR)
@echo WXVER_MAJOR=3 >$(BUILD_CFG_FILE)
@echo WXVER_MINOR=1 >>$(BUILD_CFG_FILE)
@echo WXVER_RELEASE=2 >>$(BUILD_CFG_FILE)
@echo WXVER_RELEASE=3 >>$(BUILD_CFG_FILE)
@echo BUILD=$(BUILD) >>$(BUILD_CFG_FILE)
@echo MONOLITHIC=$(MONOLITHIC) >>$(BUILD_CFG_FILE)
@echo SHARED=$(SHARED) >>$(BUILD_CFG_FILE)
@@ -8937,6 +8945,11 @@ $(OBJS)\monodll_calctrlg.obj: ..\..\src\generic\calctrlg.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\calctrlg.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_rowheightcache.obj: ..\..\src\generic\rowheightcache.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\rowheightcache.cpp
!endif
$(OBJS)\monodll_version.res: ..\..\src\msw\version.rc
brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) -i$(SETUPHDIR) -i..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG) -i$(BCCDIR)\include\windows\sdk -i..\..\src\tiff\libtiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib -i..\..\src\regex -i..\..\src\expat\expat\lib -i..\..\src\stc\scintilla\include -i..\..\src\stc\scintilla\lexlib -i..\..\src\stc\scintilla\src -d__WX__ -dSCI_LEXER -dNO_CXX11_REGEX -dLINK_LEXERS -dwxUSE_BASE=1 -dWXMAKINGDLL ..\..\src\msw\version.rc
@@ -11478,6 +11491,11 @@ $(OBJS)\monolib_calctrlg.obj: ..\..\src\generic\calctrlg.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\calctrlg.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_rowheightcache.obj: ..\..\src\generic\rowheightcache.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\rowheightcache.cpp
!endif
$(OBJS)\basedll_dummy.obj: ..\..\src\common\dummy.cpp
$(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) -H ..\..\src\common\dummy.cpp
@@ -13983,6 +14001,11 @@ $(OBJS)\coredll_calctrlg.obj: ..\..\src\generic\calctrlg.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\calctrlg.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\coredll_rowheightcache.obj: ..\..\src\generic\rowheightcache.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\rowheightcache.cpp
!endif
$(OBJS)\corelib_dummy.obj: ..\..\src\common\dummy.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) -H ..\..\src\common\dummy.cpp
@@ -15711,6 +15734,11 @@ $(OBJS)\corelib_calctrlg.obj: ..\..\src\generic\calctrlg.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\calctrlg.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\corelib_rowheightcache.obj: ..\..\src\generic\rowheightcache.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\rowheightcache.cpp
!endif
$(OBJS)\advdll_dummy.obj: ..\..\src\common\dummy.cpp
$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) -H ..\..\src\common\dummy.cpp

48
build/msw/makefile.gcc
View File

@@ -32,7 +32,7 @@ MAKEARGS = LINK_DLL_FLAGS="$(LINK_DLL_FLAGS)" \
WINDRES="$(WINDRES)"
CPPDEPS = -MT$@ -MF$@.d -MD -MP
WX_RELEASE_NODOT = 31
WX_VERSION_NODOT = $(WX_RELEASE_NODOT)2
WX_VERSION_NODOT = $(WX_RELEASE_NODOT)3
COMPILER_PREFIX = gcc
OBJS = \
$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
@@ -2152,7 +2152,8 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_datavgen.o \
$(OBJS)\monodll_editlbox.o \
$(OBJS)\monodll_laywin.o \
$(OBJS)\monodll_calctrlg.o
$(OBJS)\monodll_calctrlg.o \
$(OBJS)\monodll_rowheightcache.o
endif
endif
ifeq ($(USE_GUI),1)
@@ -2479,7 +2480,8 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_datavgen.o \
$(OBJS)\monodll_editlbox.o \
$(OBJS)\monodll_laywin.o \
$(OBJS)\monodll_calctrlg.o
$(OBJS)\monodll_calctrlg.o \
$(OBJS)\monodll_rowheightcache.o
endif
endif
ifeq ($(USE_STC),1)
@@ -2987,7 +2989,8 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_datavgen.o \
$(OBJS)\monolib_editlbox.o \
$(OBJS)\monolib_laywin.o \
$(OBJS)\monolib_calctrlg.o
$(OBJS)\monolib_calctrlg.o \
$(OBJS)\monolib_rowheightcache.o
endif
endif
ifeq ($(USE_GUI),1)
@@ -3314,7 +3317,8 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_datavgen.o \
$(OBJS)\monolib_editlbox.o \
$(OBJS)\monolib_laywin.o \
$(OBJS)\monolib_calctrlg.o
$(OBJS)\monolib_calctrlg.o \
$(OBJS)\monolib_rowheightcache.o
endif
endif
ifeq ($(USE_STC),1)
@@ -3707,7 +3711,8 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_datavgen.o \
$(OBJS)\coredll_editlbox.o \
$(OBJS)\coredll_laywin.o \
$(OBJS)\coredll_calctrlg.o
$(OBJS)\coredll_calctrlg.o \
$(OBJS)\coredll_rowheightcache.o
endif
endif
ifeq ($(USE_GUI),1)
@@ -4034,7 +4039,8 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_datavgen.o \
$(OBJS)\coredll_editlbox.o \
$(OBJS)\coredll_laywin.o \
$(OBJS)\coredll_calctrlg.o
$(OBJS)\coredll_calctrlg.o \
$(OBJS)\coredll_rowheightcache.o
endif
endif
ifeq ($(MONOLITHIC),0)
@@ -4385,7 +4391,8 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_datavgen.o \
$(OBJS)\corelib_editlbox.o \
$(OBJS)\corelib_laywin.o \
$(OBJS)\corelib_calctrlg.o
$(OBJS)\corelib_calctrlg.o \
$(OBJS)\corelib_rowheightcache.o
endif
endif
ifeq ($(USE_GUI),1)
@@ -4712,7 +4719,8 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_datavgen.o \
$(OBJS)\corelib_editlbox.o \
$(OBJS)\corelib_laywin.o \
$(OBJS)\corelib_calctrlg.o
$(OBJS)\corelib_calctrlg.o \
$(OBJS)\corelib_rowheightcache.o
endif
endif
ifeq ($(SHARED),1)
@@ -5745,7 +5753,7 @@ $(SETUPHDIR)\wx\msw\rcdefs.h: $(SETUPHDIR)\wx\msw ..\..\include\wx\msw\genrcdefs
build_cfg_file: $(SETUPHDIR)
@echo WXVER_MAJOR=3 >$(BUILD_CFG_FILE)
@echo WXVER_MINOR=1 >>$(BUILD_CFG_FILE)
@echo WXVER_RELEASE=2 >>$(BUILD_CFG_FILE)
@echo WXVER_RELEASE=3 >>$(BUILD_CFG_FILE)
@echo BUILD=$(BUILD) >>$(BUILD_CFG_FILE)
@echo MONOLITHIC=$(MONOLITHIC) >>$(BUILD_CFG_FILE)
@echo SHARED=$(SHARED) >>$(BUILD_CFG_FILE)
@@ -9119,6 +9127,11 @@ $(OBJS)\monodll_calctrlg.o: ../../src/generic/calctrlg.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\monodll_rowheightcache.o: ../../src/generic/rowheightcache.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
endif
$(OBJS)\monodll_version_rc.o: ../../src/msw/version.rc
$(WINDRES) -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) --include-dir $(SETUPHDIR) --include-dir ../../include $(__CAIRO_INCLUDEDIR_p) --define WXBUILDING --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG) --include-dir ../../src/tiff/libtiff --include-dir ../../src/jpeg --include-dir ../../src/png --include-dir ../../src/zlib --include-dir ../../src/regex --include-dir ../../src/expat/expat/lib --include-dir ../../src/stc/scintilla/include --include-dir ../../src/stc/scintilla/lexlib --include-dir ../../src/stc/scintilla/src --define __WX__ --define SCI_LEXER --define NO_CXX11_REGEX --define LINK_LEXERS --define wxUSE_BASE=1 --define WXMAKINGDLL
@@ -11660,6 +11673,11 @@ $(OBJS)\monolib_calctrlg.o: ../../src/generic/calctrlg.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\monolib_rowheightcache.o: ../../src/generic/rowheightcache.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
endif
$(OBJS)\basedll_dummy.o: ../../src/common/dummy.cpp
$(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $<
@@ -14165,6 +14183,11 @@ $(OBJS)\coredll_calctrlg.o: ../../src/generic/calctrlg.cpp
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\coredll_rowheightcache.o: ../../src/generic/rowheightcache.cpp
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
endif
$(OBJS)\corelib_dummy.o: ../../src/common/dummy.cpp
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
@@ -15893,6 +15916,11 @@ $(OBJS)\corelib_calctrlg.o: ../../src/generic/calctrlg.cpp
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\corelib_rowheightcache.o: ../../src/generic/rowheightcache.cpp
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
endif
$(OBJS)\advdll_dummy.o: ../../src/common/dummy.cpp
$(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<

48
build/msw/makefile.vc
View File

@@ -29,7 +29,7 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
WX_FLAVOUR="$(WX_FLAVOUR)" WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" \
RUNTIME_LIBS="$(RUNTIME_LIBS)"
WX_RELEASE_NODOT = 31
WX_VERSION_NODOT = $(WX_RELEASE_NODOT)2
WX_VERSION_NODOT = $(WX_RELEASE_NODOT)3
COMPILER_PREFIX = vc
OBJS = \
$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
@@ -2443,7 +2443,8 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_datavgen.obj \
$(OBJS)\monodll_editlbox.obj \
$(OBJS)\monodll_laywin.obj \
$(OBJS)\monodll_calctrlg.obj
$(OBJS)\monodll_calctrlg.obj \
$(OBJS)\monodll_rowheightcache.obj
!endif
!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
____CORE_SRC_FILENAMES_OBJECTS = \
@@ -2768,7 +2769,8 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_datavgen.obj \
$(OBJS)\monodll_editlbox.obj \
$(OBJS)\monodll_laywin.obj \
$(OBJS)\monodll_calctrlg.obj
$(OBJS)\monodll_calctrlg.obj \
$(OBJS)\monodll_rowheightcache.obj
!endif
!if "$(USE_STC)" == "1"
____MONOLIB_STC_SRC_FILENAMES_OBJECTS = \
@@ -3278,7 +3280,8 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_datavgen.obj \
$(OBJS)\monolib_editlbox.obj \
$(OBJS)\monolib_laywin.obj \
$(OBJS)\monolib_calctrlg.obj
$(OBJS)\monolib_calctrlg.obj \
$(OBJS)\monolib_rowheightcache.obj
!endif
!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
____CORE_SRC_FILENAMES_1_OBJECTS = \
@@ -3603,7 +3606,8 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_datavgen.obj \
$(OBJS)\monolib_editlbox.obj \
$(OBJS)\monolib_laywin.obj \
$(OBJS)\monolib_calctrlg.obj
$(OBJS)\monolib_calctrlg.obj \
$(OBJS)\monolib_rowheightcache.obj
!endif
!if "$(USE_STC)" == "1"
____MONOLIB_STC_SRC_FILENAMES_1_OBJECTS = \
@@ -4048,7 +4052,8 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_datavgen.obj \
$(OBJS)\coredll_editlbox.obj \
$(OBJS)\coredll_laywin.obj \
$(OBJS)\coredll_calctrlg.obj
$(OBJS)\coredll_calctrlg.obj \
$(OBJS)\coredll_rowheightcache.obj
!endif
!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
____CORE_SRC_FILENAMES_2_OBJECTS = \
@@ -4373,7 +4378,8 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_datavgen.obj \
$(OBJS)\coredll_editlbox.obj \
$(OBJS)\coredll_laywin.obj \
$(OBJS)\coredll_calctrlg.obj
$(OBJS)\coredll_calctrlg.obj \
$(OBJS)\coredll_rowheightcache.obj
!endif
!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1"
__corelib___depname = \
@@ -4724,7 +4730,8 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_datavgen.obj \
$(OBJS)\corelib_editlbox.obj \
$(OBJS)\corelib_laywin.obj \
$(OBJS)\corelib_calctrlg.obj
$(OBJS)\corelib_calctrlg.obj \
$(OBJS)\corelib_rowheightcache.obj
!endif
!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
____CORE_SRC_FILENAMES_3_OBJECTS = \
@@ -5049,7 +5056,8 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_datavgen.obj \
$(OBJS)\corelib_editlbox.obj \
$(OBJS)\corelib_laywin.obj \
$(OBJS)\corelib_calctrlg.obj
$(OBJS)\corelib_calctrlg.obj \
$(OBJS)\corelib_rowheightcache.obj
!endif
!if "$(SHARED)" == "1"
____wxcore_namedll_DEP = $(__coredll___depname)
@@ -6272,7 +6280,7 @@ $(SETUPHDIR)\wx\msw\rcdefs.h: $(SETUPHDIR)\wx\msw ..\..\include\wx\msw\genrcdefs
build_cfg_file: $(SETUPHDIR)
@echo WXVER_MAJOR=3 >$(BUILD_CFG_FILE)
@echo WXVER_MINOR=1 >>$(BUILD_CFG_FILE)
@echo WXVER_RELEASE=2 >>$(BUILD_CFG_FILE)
@echo WXVER_RELEASE=3 >>$(BUILD_CFG_FILE)
@echo BUILD=$(BUILD) >>$(BUILD_CFG_FILE)
@echo MONOLITHIC=$(MONOLITHIC) >>$(BUILD_CFG_FILE)
@echo SHARED=$(SHARED) >>$(BUILD_CFG_FILE)
@@ -9646,6 +9654,11 @@ $(OBJS)\monodll_calctrlg.obj: ..\..\src\generic\calctrlg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\calctrlg.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_rowheightcache.obj: ..\..\src\generic\rowheightcache.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\rowheightcache.cpp
!endif
$(OBJS)\monodll_version.res: ..\..\src\msw\version.rc
rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_6) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_72) /d __WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) /i $(SETUPHDIR) /i ..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG) /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\expat\lib /i ..\..\src\stc\scintilla\include /i ..\..\src\stc\scintilla\lexlib /i ..\..\src\stc\scintilla\src /d __WX__ /d SCI_LEXER /d NO_CXX11_REGEX /d LINK_LEXERS /d wxUSE_BASE=1 /d WXMAKINGDLL ..\..\src\msw\version.rc
@@ -12187,6 +12200,11 @@ $(OBJS)\monolib_calctrlg.obj: ..\..\src\generic\calctrlg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\calctrlg.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_rowheightcache.obj: ..\..\src\generic\rowheightcache.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\rowheightcache.cpp
!endif
$(OBJS)\basedll_dummy.obj: ..\..\src\common\dummy.cpp
$(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
@@ -14692,6 +14710,11 @@ $(OBJS)\coredll_calctrlg.obj: ..\..\src\generic\calctrlg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\calctrlg.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\coredll_rowheightcache.obj: ..\..\src\generic\rowheightcache.cpp
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\rowheightcache.cpp
!endif
$(OBJS)\corelib_dummy.obj: ..\..\src\common\dummy.cpp
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
@@ -16420,6 +16443,11 @@ $(OBJS)\corelib_calctrlg.obj: ..\..\src\generic\calctrlg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\calctrlg.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\corelib_rowheightcache.obj: ..\..\src\generic\rowheightcache.cpp
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\rowheightcache.cpp
!endif
$(OBJS)\advdll_dummy.obj: ..\..\src\common\dummy.cpp
$(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp

1
build/msw/wx_core.vcxproj
View File

@@ -1061,6 +1061,7 @@
<ClCompile Include="..\..\src\generic\hyperlinkg.cpp" />
<ClCompile Include="..\..\src\generic\notifmsgg.cpp" />
<ClCompile Include="..\..\src\common\bmpcboxcmn.cpp" />
<ClCompile Include="..\..\src\generic\rowheightcache.cpp" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="..\..\src\msw\version.rc">

3
build/msw/wx_core.vcxproj.filters
View File

@@ -603,6 +603,9 @@
<ClCompile Include="..\..\src\generic\richtooltipg.cpp">
<Filter>Generic Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\generic\rowheightcache.cpp">
<Filter>Generic Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\generic\sashwin.cpp">
<Filter>Generic Sources</Filter>
</ClCompile>

2
build/msw/wx_setup.props
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Label="UserMacros">
<wxVersionString>312</wxVersionString>
<wxVersionString>313</wxVersionString>
<wxShortVersionString>31</wxShortVersionString>
<wxToolkitPrefix>msw</wxToolkitPrefix>
<wxCompilerPrefix>vc</wxCompilerPrefix>

16
build/msw/wx_vc7_adv.vcproj
View File

@@ -156,7 +156,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll\wxprec_advdll.pch"
ObjectFile="vc_mswuddll\adv\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312ud_adv_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw313ud_adv_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="TRUE"
Detect64BitPortabilityProblems="TRUE"
@@ -167,13 +167,13 @@
Name="VCLinkerTool"
AdditionalOptions=""
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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
OutputFile="..\..\lib\vc_dll\wxmsw312ud_adv_vc_custom.dll"
OutputFile="..\..\lib\vc_dll\wxmsw313ud_adv_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_adv.lib"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312ud_adv_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw313ud_adv_vc_custom.pdb"
TargetMachine="1"/>
<Tool
Name="VCMIDLTool"
@@ -187,7 +187,7 @@
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312ud_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV"
PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw313ud_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"/>
<Tool
@@ -221,7 +221,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswudll\wxprec_advdll.pch"
ObjectFile="vc_mswudll\adv\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312u_adv_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw313u_adv_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="TRUE"
Detect64BitPortabilityProblems="TRUE"
@@ -232,13 +232,13 @@
Name="VCLinkerTool"
AdditionalOptions=""
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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
OutputFile="..\..\lib\vc_dll\wxmsw312u_adv_vc_custom.dll"
OutputFile="..\..\lib\vc_dll\wxmsw313u_adv_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_dll\wxmsw31u_adv.lib"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312u_adv_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw313u_adv_vc_custom.pdb"
TargetMachine="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"/>
@@ -254,7 +254,7 @@
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312u_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV"
PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw313u_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"/>
<Tool

16
build/msw/wx_vc7_aui.vcproj
View File

@@ -156,7 +156,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll\wxprec_auidll.pch"
ObjectFile="vc_mswuddll\aui\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312ud_aui_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw313ud_aui_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="TRUE"
Detect64BitPortabilityProblems="TRUE"
@@ -167,13 +167,13 @@
Name="VCLinkerTool"
AdditionalOptions=""
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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
OutputFile="..\..\lib\vc_dll\wxmsw312ud_aui_vc_custom.dll"
OutputFile="..\..\lib\vc_dll\wxmsw313ud_aui_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_aui.lib"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312ud_aui_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw313ud_aui_vc_custom.pdb"
TargetMachine="1"/>
<Tool
Name="VCMIDLTool"
@@ -187,7 +187,7 @@
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312ud_aui_vc_custom;WXUSINGDLL;WXMAKINGDLL_AUI"
PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw313ud_aui_vc_custom;WXUSINGDLL;WXMAKINGDLL_AUI"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"/>
<Tool
@@ -221,7 +221,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswudll\wxprec_auidll.pch"
ObjectFile="vc_mswudll\aui\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312u_aui_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw313u_aui_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="TRUE"
Detect64BitPortabilityProblems="TRUE"
@@ -232,13 +232,13 @@
Name="VCLinkerTool"
AdditionalOptions=""
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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
OutputFile="..\..\lib\vc_dll\wxmsw312u_aui_vc_custom.dll"
OutputFile="..\..\lib\vc_dll\wxmsw313u_aui_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_dll\wxmsw31u_aui.lib"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312u_aui_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw313u_aui_vc_custom.pdb"
TargetMachine="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"/>
@@ -254,7 +254,7 @@
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312u_aui_vc_custom;WXUSINGDLL;WXMAKINGDLL_AUI"
PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw313u_aui_vc_custom;WXUSINGDLL;WXMAKINGDLL_AUI"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"/>
<Tool

16
build/msw/wx_vc7_base.vcproj
View File

@@ -156,7 +156,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll\wxprec_basedll.pch"
ObjectFile="vc_mswuddll\base\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase312ud_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase313ud_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="TRUE"
Detect64BitPortabilityProblems="TRUE"
@@ -167,13 +167,13 @@
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalDependencies="wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="..\..\lib\vc_dll\wxbase312ud_vc_custom.dll"
OutputFile="..\..\lib\vc_dll\wxbase313ud_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxbase31ud.lib"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile="..\..\lib\vc_dll\wxbase312ud_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_dll\wxbase313ud_vc_custom.pdb"
TargetMachine="1"/>
<Tool
Name="VCMIDLTool"
@@ -187,7 +187,7 @@
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase312ud_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"
PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase313ud_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"/>
<Tool
@@ -221,7 +221,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswudll\wxprec_basedll.pch"
ObjectFile="vc_mswudll\base\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase312u_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase313u_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="TRUE"
Detect64BitPortabilityProblems="TRUE"
@@ -232,13 +232,13 @@
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalDependencies="wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="..\..\lib\vc_dll\wxbase312u_vc_custom.dll"
OutputFile="..\..\lib\vc_dll\wxbase313u_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_dll\wxbase31u.lib"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile="..\..\lib\vc_dll\wxbase312u_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_dll\wxbase313u_vc_custom.pdb"
TargetMachine="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"/>
@@ -254,7 +254,7 @@
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase312u_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"
PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase313u_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"/>
<Tool

19
build/msw/wx_vc7_core.vcproj
View File

@@ -156,7 +156,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll\wxprec_coredll.pch"
ObjectFile="vc_mswuddll\core\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312ud_core_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw313ud_core_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="TRUE"
Detect64BitPortabilityProblems="TRUE"
@@ -167,13 +167,13 @@
Name="VCLinkerTool"
AdditionalOptions=""
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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase31ud.lib"
OutputFile="..\..\lib\vc_dll\wxmsw312ud_core_vc_custom.dll"
OutputFile="..\..\lib\vc_dll\wxmsw313ud_core_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_core.lib"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312ud_core_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw313ud_core_vc_custom.pdb"
TargetMachine="1"/>
<Tool
Name="VCMIDLTool"
@@ -187,7 +187,7 @@
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312ud_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw313ud_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"/>
<Tool
@@ -221,7 +221,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswudll\wxprec_coredll.pch"
ObjectFile="vc_mswudll\core\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312u_core_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw313u_core_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="TRUE"
Detect64BitPortabilityProblems="TRUE"
@@ -232,13 +232,13 @@
Name="VCLinkerTool"
AdditionalOptions=""
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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase31u.lib"
OutputFile="..\..\lib\vc_dll\wxmsw312u_core_vc_custom.dll"
OutputFile="..\..\lib\vc_dll\wxmsw313u_core_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_dll\wxmsw31u_core.lib"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312u_core_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw313u_core_vc_custom.pdb"
TargetMachine="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"/>
@@ -254,7 +254,7 @@
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312u_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw313u_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"/>
<Tool
@@ -1286,6 +1286,9 @@
<File
RelativePath="..\..\src\generic\richtooltipg.cpp">
</File>
<File
RelativePath="..\..\src\generic\rowheightcache.cpp">
</File>
<File
RelativePath="..\..\src\generic\sashwin.cpp">
</File>

16
build/msw/wx_vc7_gl.vcproj
View File

@@ -156,7 +156,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll\wxprec_gldll.pch"
ObjectFile="vc_mswuddll\gl\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312ud_gl_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw313ud_gl_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="TRUE"
Detect64BitPortabilityProblems="TRUE"
@@ -167,13 +167,13 @@
Name="VCLinkerTool"
AdditionalOptions=""
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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib wxmsw31ud_core.lib wxbase31ud.lib opengl32.lib glu32.lib"
OutputFile="..\..\lib\vc_dll\wxmsw312ud_gl_vc_custom.dll"
OutputFile="..\..\lib\vc_dll\wxmsw313ud_gl_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_gl.lib"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312ud_gl_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw313ud_gl_vc_custom.pdb"
TargetMachine="1"/>
<Tool
Name="VCMIDLTool"
@@ -187,7 +187,7 @@
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312ud_gl_vc_custom;WXUSINGDLL;WXMAKINGDLL_GL"
PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw313ud_gl_vc_custom;WXUSINGDLL;WXMAKINGDLL_GL"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"/>
<Tool
@@ -221,7 +221,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswudll\wxprec_gldll.pch"
ObjectFile="vc_mswudll\gl\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312u_gl_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw313u_gl_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="TRUE"
Detect64BitPortabilityProblems="TRUE"
@@ -232,13 +232,13 @@
Name="VCLinkerTool"
AdditionalOptions=""
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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib wxmsw31u_core.lib wxbase31u.lib opengl32.lib glu32.lib"
OutputFile="..\..\lib\vc_dll\wxmsw312u_gl_vc_custom.dll"
OutputFile="..\..\lib\vc_dll\wxmsw313u_gl_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_dll\wxmsw31u_gl.lib"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312u_gl_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw313u_gl_vc_custom.pdb"
TargetMachine="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"/>
@@ -254,7 +254,7 @@
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312u_gl_vc_custom;WXUSINGDLL;WXMAKINGDLL_GL"
PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw313u_gl_vc_custom;WXUSINGDLL;WXMAKINGDLL_GL"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"/>
<Tool

16
build/msw/wx_vc7_html.vcproj
View File

@@ -156,7 +156,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll\wxprec_htmldll.pch"
ObjectFile="vc_mswuddll\html\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312ud_html_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw313ud_html_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="TRUE"
Detect64BitPortabilityProblems="TRUE"
@@ -167,13 +167,13 @@
Name="VCLinkerTool"
AdditionalOptions=""
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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
OutputFile="..\..\lib\vc_dll\wxmsw312ud_html_vc_custom.dll"
OutputFile="..\..\lib\vc_dll\wxmsw313ud_html_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_html.lib"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312ud_html_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw313ud_html_vc_custom.pdb"
TargetMachine="1"/>
<Tool
Name="VCMIDLTool"
@@ -187,7 +187,7 @@
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312ud_html_vc_custom;WXUSINGDLL;WXMAKINGDLL_HTML"
PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw313ud_html_vc_custom;WXUSINGDLL;WXMAKINGDLL_HTML"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"/>
<Tool
@@ -221,7 +221,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswudll\wxprec_htmldll.pch"
ObjectFile="vc_mswudll\html\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312u_html_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw313u_html_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="TRUE"
Detect64BitPortabilityProblems="TRUE"
@@ -232,13 +232,13 @@
Name="VCLinkerTool"
AdditionalOptions=""
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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
OutputFile="..\..\lib\vc_dll\wxmsw312u_html_vc_custom.dll"
OutputFile="..\..\lib\vc_dll\wxmsw313u_html_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_dll\wxmsw31u_html.lib"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312u_html_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw313u_html_vc_custom.pdb"
TargetMachine="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"/>
@@ -254,7 +254,7 @@
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312u_html_vc_custom;WXUSINGDLL;WXMAKINGDLL_HTML"
PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw313u_html_vc_custom;WXUSINGDLL;WXMAKINGDLL_HTML"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"/>
<Tool

16
build/msw/wx_vc7_media.vcproj
View File

@@ -156,7 +156,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll\wxprec_mediadll.pch"
ObjectFile="vc_mswuddll\media\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312ud_media_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw313ud_media_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="TRUE"
Detect64BitPortabilityProblems="TRUE"
@@ -167,13 +167,13 @@
Name="VCLinkerTool"
AdditionalOptions=""
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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
OutputFile="..\..\lib\vc_dll\wxmsw312ud_media_vc_custom.dll"
OutputFile="..\..\lib\vc_dll\wxmsw313ud_media_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_media.lib"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312ud_media_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw313ud_media_vc_custom.pdb"
TargetMachine="1"/>
<Tool
Name="VCMIDLTool"
@@ -187,7 +187,7 @@
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312ud_media_vc_custom;WXUSINGDLL;WXMAKINGDLL_MEDIA"
PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw313ud_media_vc_custom;WXUSINGDLL;WXMAKINGDLL_MEDIA"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"/>
<Tool
@@ -221,7 +221,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswudll\wxprec_mediadll.pch"
ObjectFile="vc_mswudll\media\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312u_media_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw313u_media_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="TRUE"
Detect64BitPortabilityProblems="TRUE"
@@ -232,13 +232,13 @@
Name="VCLinkerTool"
AdditionalOptions=""
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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
OutputFile="..\..\lib\vc_dll\wxmsw312u_media_vc_custom.dll"
OutputFile="..\..\lib\vc_dll\wxmsw313u_media_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_dll\wxmsw31u_media.lib"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312u_media_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw313u_media_vc_custom.pdb"
TargetMachine="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"/>
@@ -254,7 +254,7 @@
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312u_media_vc_custom;WXUSINGDLL;WXMAKINGDLL_MEDIA"
PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw313u_media_vc_custom;WXUSINGDLL;WXMAKINGDLL_MEDIA"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"/>
<Tool

16
build/msw/wx_vc7_net.vcproj
View File

@@ -156,7 +156,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll\wxprec_netdll.pch"
ObjectFile="vc_mswuddll\net\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase312ud_net_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase313ud_net_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="TRUE"
Detect64BitPortabilityProblems="TRUE"
@@ -167,13 +167,13 @@
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalDependencies="wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase31ud.lib"
OutputFile="..\..\lib\vc_dll\wxbase312ud_net_vc_custom.dll"
OutputFile="..\..\lib\vc_dll\wxbase313ud_net_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxbase31ud_net.lib"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile="..\..\lib\vc_dll\wxbase312ud_net_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_dll\wxbase313ud_net_vc_custom.pdb"
TargetMachine="1"/>
<Tool
Name="VCMIDLTool"
@@ -187,7 +187,7 @@
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase312ud_net_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET"
PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase313ud_net_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"/>
<Tool
@@ -221,7 +221,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswudll\wxprec_netdll.pch"
ObjectFile="vc_mswudll\net\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase312u_net_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase313u_net_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="TRUE"
Detect64BitPortabilityProblems="TRUE"
@@ -232,13 +232,13 @@
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalDependencies="wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase31u.lib"
OutputFile="..\..\lib\vc_dll\wxbase312u_net_vc_custom.dll"
OutputFile="..\..\lib\vc_dll\wxbase313u_net_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_dll\wxbase31u_net.lib"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile="..\..\lib\vc_dll\wxbase312u_net_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_dll\wxbase313u_net_vc_custom.pdb"
TargetMachine="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"/>
@@ -254,7 +254,7 @@
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase312u_net_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET"
PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase313u_net_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"/>
<Tool

16
build/msw/wx_vc7_propgrid.vcproj
View File

@@ -156,7 +156,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll\wxprec_propgriddll.pch"
ObjectFile="vc_mswuddll\propgrid\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312ud_propgrid_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw313ud_propgrid_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="TRUE"
Detect64BitPortabilityProblems="TRUE"
@@ -167,13 +167,13 @@
Name="VCLinkerTool"
AdditionalOptions=""
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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
OutputFile="..\..\lib\vc_dll\wxmsw312ud_propgrid_vc_custom.dll"
OutputFile="..\..\lib\vc_dll\wxmsw313ud_propgrid_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_propgrid.lib"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312ud_propgrid_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw313ud_propgrid_vc_custom.pdb"
TargetMachine="1"/>
<Tool
Name="VCMIDLTool"
@@ -187,7 +187,7 @@
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312ud_propgrid_vc_custom;WXUSINGDLL;WXMAKINGDLL_PROPGRID"
PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw313ud_propgrid_vc_custom;WXUSINGDLL;WXMAKINGDLL_PROPGRID"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"/>
<Tool
@@ -221,7 +221,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswudll\wxprec_propgriddll.pch"
ObjectFile="vc_mswudll\propgrid\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312u_propgrid_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw313u_propgrid_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="TRUE"
Detect64BitPortabilityProblems="TRUE"
@@ -232,13 +232,13 @@
Name="VCLinkerTool"
AdditionalOptions=""
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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
OutputFile="..\..\lib\vc_dll\wxmsw312u_propgrid_vc_custom.dll"
OutputFile="..\..\lib\vc_dll\wxmsw313u_propgrid_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_dll\wxmsw31u_propgrid.lib"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312u_propgrid_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw313u_propgrid_vc_custom.pdb"
TargetMachine="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"/>
@@ -254,7 +254,7 @@
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312u_propgrid_vc_custom;WXUSINGDLL;WXMAKINGDLL_PROPGRID"
PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw313u_propgrid_vc_custom;WXUSINGDLL;WXMAKINGDLL_PROPGRID"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"/>
<Tool

16
build/msw/wx_vc7_qa.vcproj
View File

@@ -156,7 +156,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll\wxprec_qadll.pch"
ObjectFile="vc_mswuddll\qa\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312ud_qa_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw313ud_qa_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="TRUE"
Detect64BitPortabilityProblems="TRUE"
@@ -167,13 +167,13 @@
Name="VCLinkerTool"
AdditionalOptions=""
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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib ..\..\lib\vc_dll\wxbase31ud_xml.lib"
OutputFile="..\..\lib\vc_dll\wxmsw312ud_qa_vc_custom.dll"
OutputFile="..\..\lib\vc_dll\wxmsw313ud_qa_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_qa.lib"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312ud_qa_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw313ud_qa_vc_custom.pdb"
TargetMachine="1"/>
<Tool
Name="VCMIDLTool"
@@ -187,7 +187,7 @@
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312ud_qa_vc_custom;WXUSINGDLL;WXMAKINGDLL_QA"
PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw313ud_qa_vc_custom;WXUSINGDLL;WXMAKINGDLL_QA"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"/>
<Tool
@@ -221,7 +221,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswudll\wxprec_qadll.pch"
ObjectFile="vc_mswudll\qa\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312u_qa_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw313u_qa_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="TRUE"
Detect64BitPortabilityProblems="TRUE"
@@ -232,13 +232,13 @@
Name="VCLinkerTool"
AdditionalOptions=""
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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib ..\..\lib\vc_dll\wxbase31u_xml.lib"
OutputFile="..\..\lib\vc_dll\wxmsw312u_qa_vc_custom.dll"
OutputFile="..\..\lib\vc_dll\wxmsw313u_qa_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_dll\wxmsw31u_qa.lib"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312u_qa_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw313u_qa_vc_custom.pdb"
TargetMachine="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"/>
@@ -254,7 +254,7 @@
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312u_qa_vc_custom;WXUSINGDLL;WXMAKINGDLL_QA"
PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw313u_qa_vc_custom;WXUSINGDLL;WXMAKINGDLL_QA"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"/>
<Tool

16
build/msw/wx_vc7_ribbon.vcproj
View File

@@ -156,7 +156,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll\wxprec_ribbondll.pch"
ObjectFile="vc_mswuddll\ribbon\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312ud_ribbon_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw313ud_ribbon_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="TRUE"
Detect64BitPortabilityProblems="TRUE"
@@ -167,13 +167,13 @@
Name="VCLinkerTool"
AdditionalOptions=""
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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
OutputFile="..\..\lib\vc_dll\wxmsw312ud_ribbon_vc_custom.dll"
OutputFile="..\..\lib\vc_dll\wxmsw313ud_ribbon_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_ribbon.lib"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312ud_ribbon_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw313ud_ribbon_vc_custom.pdb"
TargetMachine="1"/>
<Tool
Name="VCMIDLTool"
@@ -187,7 +187,7 @@
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312ud_ribbon_vc_custom;WXUSINGDLL;WXMAKINGDLL_RIBBON"
PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw313ud_ribbon_vc_custom;WXUSINGDLL;WXMAKINGDLL_RIBBON"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"/>
<Tool
@@ -221,7 +221,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswudll\wxprec_ribbondll.pch"
ObjectFile="vc_mswudll\ribbon\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312u_ribbon_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw313u_ribbon_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="TRUE"
Detect64BitPortabilityProblems="TRUE"
@@ -232,13 +232,13 @@
Name="VCLinkerTool"
AdditionalOptions=""
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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
OutputFile="..\..\lib\vc_dll\wxmsw312u_ribbon_vc_custom.dll"
OutputFile="..\..\lib\vc_dll\wxmsw313u_ribbon_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_dll\wxmsw31u_ribbon.lib"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312u_ribbon_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw313u_ribbon_vc_custom.pdb"
TargetMachine="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"/>
@@ -254,7 +254,7 @@
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312u_ribbon_vc_custom;WXUSINGDLL;WXMAKINGDLL_RIBBON"
PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw313u_ribbon_vc_custom;WXUSINGDLL;WXMAKINGDLL_RIBBON"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"/>
<Tool

16
build/msw/wx_vc7_richtext.vcproj
View File

@@ -156,7 +156,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll\wxprec_richtextdll.pch"
ObjectFile="vc_mswuddll\richtext\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312ud_richtext_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw313ud_richtext_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="TRUE"
Detect64BitPortabilityProblems="TRUE"
@@ -167,13 +167,13 @@
Name="VCLinkerTool"
AdditionalOptions=""
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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_html.lib ..\..\lib\vc_dll\wxbase31ud_xml.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
OutputFile="..\..\lib\vc_dll\wxmsw312ud_richtext_vc_custom.dll"
OutputFile="..\..\lib\vc_dll\wxmsw313ud_richtext_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_richtext.lib"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312ud_richtext_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw313ud_richtext_vc_custom.pdb"
TargetMachine="1"/>
<Tool
Name="VCMIDLTool"
@@ -187,7 +187,7 @@
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312ud_richtext_vc_custom;WXUSINGDLL;WXMAKINGDLL_RICHTEXT"
PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw313ud_richtext_vc_custom;WXUSINGDLL;WXMAKINGDLL_RICHTEXT"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"/>
<Tool
@@ -221,7 +221,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswudll\wxprec_richtextdll.pch"
ObjectFile="vc_mswudll\richtext\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312u_richtext_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw313u_richtext_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="TRUE"
Detect64BitPortabilityProblems="TRUE"
@@ -232,13 +232,13 @@
Name="VCLinkerTool"
AdditionalOptions=""
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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_html.lib ..\..\lib\vc_dll\wxbase31u_xml.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
OutputFile="..\..\lib\vc_dll\wxmsw312u_richtext_vc_custom.dll"
OutputFile="..\..\lib\vc_dll\wxmsw313u_richtext_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_dll\wxmsw31u_richtext.lib"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312u_richtext_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw313u_richtext_vc_custom.pdb"
TargetMachine="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"/>
@@ -254,7 +254,7 @@
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312u_richtext_vc_custom;WXUSINGDLL;WXMAKINGDLL_RICHTEXT"
PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw313u_richtext_vc_custom;WXUSINGDLL;WXMAKINGDLL_RICHTEXT"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"/>
<Tool

16
build/msw/wx_vc7_stc.vcproj
View File

@@ -156,7 +156,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll\wxprec_stcdll.pch"
ObjectFile="vc_mswuddll\stc\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312ud_stc_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw313ud_stc_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="TRUE"
Detect64BitPortabilityProblems="TRUE"
@@ -167,13 +167,13 @@
Name="VCLinkerTool"
AdditionalOptions=""
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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxscintillad.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
OutputFile="..\..\lib\vc_dll\wxmsw312ud_stc_vc_custom.dll"
OutputFile="..\..\lib\vc_dll\wxmsw313ud_stc_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_stc.lib"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312ud_stc_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw313ud_stc_vc_custom.pdb"
TargetMachine="1"/>
<Tool
Name="VCMIDLTool"
@@ -187,7 +187,7 @@
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312ud_stc_vc_custom;__WX__;SCI_LEXER;NO_CXX11_REGEX;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"
PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw313ud_stc_vc_custom;__WX__;SCI_LEXER;NO_CXX11_REGEX;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src"/>
<Tool
@@ -221,7 +221,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswudll\wxprec_stcdll.pch"
ObjectFile="vc_mswudll\stc\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312u_stc_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw313u_stc_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="TRUE"
Detect64BitPortabilityProblems="TRUE"
@@ -232,13 +232,13 @@
Name="VCLinkerTool"
AdditionalOptions=""
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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxscintilla.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
OutputFile="..\..\lib\vc_dll\wxmsw312u_stc_vc_custom.dll"
OutputFile="..\..\lib\vc_dll\wxmsw313u_stc_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_dll\wxmsw31u_stc.lib"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312u_stc_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw313u_stc_vc_custom.pdb"
TargetMachine="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"/>
@@ -254,7 +254,7 @@
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312u_stc_vc_custom;__WX__;SCI_LEXER;NO_CXX11_REGEX;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"
PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw313u_stc_vc_custom;__WX__;SCI_LEXER;NO_CXX11_REGEX;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src"/>
<Tool

16
build/msw/wx_vc7_webview.vcproj
View File

@@ -156,7 +156,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll\wxprec_webviewdll.pch"
ObjectFile="vc_mswuddll\webview\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312ud_webview_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw313ud_webview_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="TRUE"
Detect64BitPortabilityProblems="TRUE"
@@ -167,13 +167,13 @@
Name="VCLinkerTool"
AdditionalOptions=""
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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
OutputFile="..\..\lib\vc_dll\wxmsw312ud_webview_vc_custom.dll"
OutputFile="..\..\lib\vc_dll\wxmsw313ud_webview_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_webview.lib"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312ud_webview_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw313ud_webview_vc_custom.pdb"
TargetMachine="1"/>
<Tool
Name="VCMIDLTool"
@@ -187,7 +187,7 @@
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312ud_webview_vc_custom;WXUSINGDLL;WXMAKINGDLL_WEBVIEW"
PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw313ud_webview_vc_custom;WXUSINGDLL;WXMAKINGDLL_WEBVIEW"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"/>
<Tool
@@ -221,7 +221,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswudll\wxprec_webviewdll.pch"
ObjectFile="vc_mswudll\webview\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312u_webview_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw313u_webview_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="TRUE"
Detect64BitPortabilityProblems="TRUE"
@@ -232,13 +232,13 @@
Name="VCLinkerTool"
AdditionalOptions=""
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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
OutputFile="..\..\lib\vc_dll\wxmsw312u_webview_vc_custom.dll"
OutputFile="..\..\lib\vc_dll\wxmsw313u_webview_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_dll\wxmsw31u_webview.lib"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312u_webview_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw313u_webview_vc_custom.pdb"
TargetMachine="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"/>
@@ -254,7 +254,7 @@
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312u_webview_vc_custom;WXUSINGDLL;WXMAKINGDLL_WEBVIEW"
PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw313u_webview_vc_custom;WXUSINGDLL;WXMAKINGDLL_WEBVIEW"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"/>
<Tool

16
build/msw/wx_vc7_xml.vcproj
View File

@@ -156,7 +156,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll\wxprec_xmldll.pch"
ObjectFile="vc_mswuddll\xml\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase312ud_xml_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase313ud_xml_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="TRUE"
Detect64BitPortabilityProblems="TRUE"
@@ -167,13 +167,13 @@
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalDependencies="wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase31ud.lib"
OutputFile="..\..\lib\vc_dll\wxbase312ud_xml_vc_custom.dll"
OutputFile="..\..\lib\vc_dll\wxbase313ud_xml_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxbase31ud_xml.lib"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile="..\..\lib\vc_dll\wxbase312ud_xml_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_dll\wxbase313ud_xml_vc_custom.pdb"
TargetMachine="1"/>
<Tool
Name="VCMIDLTool"
@@ -187,7 +187,7 @@
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase312ud_xml_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML"
PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase313ud_xml_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"/>
<Tool
@@ -221,7 +221,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswudll\wxprec_xmldll.pch"
ObjectFile="vc_mswudll\xml\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase312u_xml_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase313u_xml_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="TRUE"
Detect64BitPortabilityProblems="TRUE"
@@ -232,13 +232,13 @@
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalDependencies="wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase31u.lib"
OutputFile="..\..\lib\vc_dll\wxbase312u_xml_vc_custom.dll"
OutputFile="..\..\lib\vc_dll\wxbase313u_xml_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_dll\wxbase31u_xml.lib"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile="..\..\lib\vc_dll\wxbase312u_xml_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_dll\wxbase313u_xml_vc_custom.pdb"
TargetMachine="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"/>
@@ -254,7 +254,7 @@
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase312u_xml_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML"
PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase313u_xml_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"/>
<Tool

16
build/msw/wx_vc7_xrc.vcproj
View File

@@ -156,7 +156,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll\wxprec_xrcdll.pch"
ObjectFile="vc_mswuddll\xrc\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312ud_xrc_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw313ud_xrc_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="TRUE"
Detect64BitPortabilityProblems="TRUE"
@@ -167,13 +167,13 @@
Name="VCLinkerTool"
AdditionalOptions=""
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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_html.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud_xml.lib ..\..\lib\vc_dll\wxbase31ud.lib"
OutputFile="..\..\lib\vc_dll\wxmsw312ud_xrc_vc_custom.dll"
OutputFile="..\..\lib\vc_dll\wxmsw313ud_xrc_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_xrc.lib"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312ud_xrc_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw313ud_xrc_vc_custom.pdb"
TargetMachine="1"/>
<Tool
Name="VCMIDLTool"
@@ -187,7 +187,7 @@
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312ud_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC"
PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw313ud_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"/>
<Tool
@@ -221,7 +221,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswudll\wxprec_xrcdll.pch"
ObjectFile="vc_mswudll\xrc\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312u_xrc_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw313u_xrc_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="TRUE"
Detect64BitPortabilityProblems="TRUE"
@@ -232,13 +232,13 @@
Name="VCLinkerTool"
AdditionalOptions=""
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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_html.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u_xml.lib ..\..\lib\vc_dll\wxbase31u.lib"
OutputFile="..\..\lib\vc_dll\wxmsw312u_xrc_vc_custom.dll"
OutputFile="..\..\lib\vc_dll\wxmsw313u_xrc_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_dll\wxmsw31u_xrc.lib"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312u_xrc_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw313u_xrc_vc_custom.pdb"
TargetMachine="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"/>
@@ -254,7 +254,7 @@
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312u_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC"
PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw313u_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"/>
<Tool

32
build/msw/wx_vc8_adv.vcproj
View File

@@ -232,7 +232,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll\wxprec_advdll.pch"
ObjectFile="vc_mswuddll\adv\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312ud_adv_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw313ud_adv_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="true"
@@ -243,7 +243,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312ud_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw313ud_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
/>
@@ -254,14 +254,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
OutputFile="..\..\lib\vc_dll\wxmsw312ud_adv_vc_custom.dll"
OutputFile="..\..\lib\vc_dll\wxmsw313ud_adv_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_adv.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312ud_adv_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw313ud_adv_vc_custom.pdb"
TargetMachine="1"
/>
<Tool
@@ -323,7 +323,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswudll\wxprec_advdll.pch"
ObjectFile="vc_mswudll\adv\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312u_adv_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw313u_adv_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="true"
@@ -334,7 +334,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312u_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw313u_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
/>
@@ -345,14 +345,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
OutputFile="..\..\lib\vc_dll\wxmsw312u_adv_vc_custom.dll"
OutputFile="..\..\lib\vc_dll\wxmsw313u_adv_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_dll\wxmsw31u_adv.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312u_adv_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw313u_adv_vc_custom.pdb"
TargetMachine="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
@@ -586,7 +586,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_advdll.pch"
ObjectFile="vc_mswuddll_x64\adv\"
ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw312ud_adv_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw313ud_adv_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="true"
@@ -597,7 +597,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312ud_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw313ud_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_x64_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
/>
@@ -608,14 +608,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib"
OutputFile="..\..\lib\vc_x64_dll\wxmsw312ud_adv_vc_custom.dll"
OutputFile="..\..\lib\vc_x64_dll\wxmsw313ud_adv_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31ud_adv.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312ud_adv_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw313ud_adv_vc_custom.pdb"
TargetMachine="17"
/>
<Tool
@@ -677,7 +677,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswudll_x64\wxprec_advdll.pch"
ObjectFile="vc_mswudll_x64\adv\"
ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw312u_adv_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw313u_adv_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="true"
@@ -688,7 +688,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312u_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw313u_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_x64_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
/>
@@ -699,14 +699,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u.lib"
OutputFile="..\..\lib\vc_x64_dll\wxmsw312u_adv_vc_custom.dll"
OutputFile="..\..\lib\vc_x64_dll\wxmsw313u_adv_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31u_adv.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312u_adv_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw313u_adv_vc_custom.pdb"
TargetMachine="17"
OptimizeReferences="2"
EnableCOMDATFolding="2"

32
build/msw/wx_vc8_aui.vcproj
View File

@@ -232,7 +232,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll\wxprec_auidll.pch"
ObjectFile="vc_mswuddll\aui\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312ud_aui_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw313ud_aui_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="true"
@@ -243,7 +243,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312ud_aui_vc_custom;WXUSINGDLL;WXMAKINGDLL_AUI"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw313ud_aui_vc_custom;WXUSINGDLL;WXMAKINGDLL_AUI"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
/>
@@ -254,14 +254,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
OutputFile="..\..\lib\vc_dll\wxmsw312ud_aui_vc_custom.dll"
OutputFile="..\..\lib\vc_dll\wxmsw313ud_aui_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_aui.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312ud_aui_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw313ud_aui_vc_custom.pdb"
TargetMachine="1"
/>
<Tool
@@ -323,7 +323,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswudll\wxprec_auidll.pch"
ObjectFile="vc_mswudll\aui\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312u_aui_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw313u_aui_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="true"
@@ -334,7 +334,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312u_aui_vc_custom;WXUSINGDLL;WXMAKINGDLL_AUI"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw313u_aui_vc_custom;WXUSINGDLL;WXMAKINGDLL_AUI"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
/>
@@ -345,14 +345,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
OutputFile="..\..\lib\vc_dll\wxmsw312u_aui_vc_custom.dll"
OutputFile="..\..\lib\vc_dll\wxmsw313u_aui_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_dll\wxmsw31u_aui.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312u_aui_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw313u_aui_vc_custom.pdb"
TargetMachine="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
@@ -586,7 +586,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_auidll.pch"
ObjectFile="vc_mswuddll_x64\aui\"
ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw312ud_aui_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw313ud_aui_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="true"
@@ -597,7 +597,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312ud_aui_vc_custom;WXUSINGDLL;WXMAKINGDLL_AUI"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw313ud_aui_vc_custom;WXUSINGDLL;WXMAKINGDLL_AUI"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_x64_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
/>
@@ -608,14 +608,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib"
OutputFile="..\..\lib\vc_x64_dll\wxmsw312ud_aui_vc_custom.dll"
OutputFile="..\..\lib\vc_x64_dll\wxmsw313ud_aui_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31ud_aui.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312ud_aui_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw313ud_aui_vc_custom.pdb"
TargetMachine="17"
/>
<Tool
@@ -677,7 +677,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswudll_x64\wxprec_auidll.pch"
ObjectFile="vc_mswudll_x64\aui\"
ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw312u_aui_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw313u_aui_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="true"
@@ -688,7 +688,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312u_aui_vc_custom;WXUSINGDLL;WXMAKINGDLL_AUI"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw313u_aui_vc_custom;WXUSINGDLL;WXMAKINGDLL_AUI"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_x64_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
/>
@@ -699,14 +699,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u.lib"
OutputFile="..\..\lib\vc_x64_dll\wxmsw312u_aui_vc_custom.dll"
OutputFile="..\..\lib\vc_x64_dll\wxmsw313u_aui_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31u_aui.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312u_aui_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw313u_aui_vc_custom.pdb"
TargetMachine="17"
OptimizeReferences="2"
EnableCOMDATFolding="2"

32
build/msw/wx_vc8_base.vcproj
View File

@@ -232,7 +232,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll\wxprec_basedll.pch"
ObjectFile="vc_mswuddll\base\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase312ud_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase313ud_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="true"
@@ -243,7 +243,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase312ud_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase313ud_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
/>
@@ -254,14 +254,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalDependencies="wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="..\..\lib\vc_dll\wxbase312ud_vc_custom.dll"
OutputFile="..\..\lib\vc_dll\wxbase313ud_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxbase31ud.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\lib\vc_dll\wxbase312ud_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_dll\wxbase313ud_vc_custom.pdb"
TargetMachine="1"
/>
<Tool
@@ -323,7 +323,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswudll\wxprec_basedll.pch"
ObjectFile="vc_mswudll\base\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase312u_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase313u_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="true"
@@ -334,7 +334,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase312u_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase313u_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
/>
@@ -345,14 +345,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalDependencies="wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="..\..\lib\vc_dll\wxbase312u_vc_custom.dll"
OutputFile="..\..\lib\vc_dll\wxbase313u_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_dll\wxbase31u.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\lib\vc_dll\wxbase312u_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_dll\wxbase313u_vc_custom.pdb"
TargetMachine="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
@@ -586,7 +586,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_basedll.pch"
ObjectFile="vc_mswuddll_x64\base\"
ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxbase312ud_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxbase313ud_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="true"
@@ -597,7 +597,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase312ud_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase313ud_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_x64_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
/>
@@ -608,14 +608,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalDependencies="wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="..\..\lib\vc_x64_dll\wxbase312ud_vc_custom.dll"
OutputFile="..\..\lib\vc_x64_dll\wxbase313ud_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_x64_dll\wxbase31ud.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxbase312ud_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxbase313ud_vc_custom.pdb"
TargetMachine="17"
/>
<Tool
@@ -677,7 +677,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswudll_x64\wxprec_basedll.pch"
ObjectFile="vc_mswudll_x64\base\"
ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxbase312u_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxbase313u_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="true"
@@ -688,7 +688,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase312u_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase313u_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_x64_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
/>
@@ -699,14 +699,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalDependencies="wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="..\..\lib\vc_x64_dll\wxbase312u_vc_custom.dll"
OutputFile="..\..\lib\vc_x64_dll\wxbase313u_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_x64_dll\wxbase31u.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxbase312u_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxbase313u_vc_custom.pdb"
TargetMachine="17"
OptimizeReferences="2"
EnableCOMDATFolding="2"

36
build/msw/wx_vc8_core.vcproj
View File

@@ -232,7 +232,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll\wxprec_coredll.pch"
ObjectFile="vc_mswuddll\core\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312ud_core_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw313ud_core_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="true"
@@ -243,7 +243,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312ud_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw313ud_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
/>
@@ -254,14 +254,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase31ud.lib"
OutputFile="..\..\lib\vc_dll\wxmsw312ud_core_vc_custom.dll"
OutputFile="..\..\lib\vc_dll\wxmsw313ud_core_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_core.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312ud_core_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw313ud_core_vc_custom.pdb"
TargetMachine="1"
/>
<Tool
@@ -323,7 +323,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswudll\wxprec_coredll.pch"
ObjectFile="vc_mswudll\core\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312u_core_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw313u_core_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="true"
@@ -334,7 +334,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312u_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw313u_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
/>
@@ -345,14 +345,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase31u.lib"
OutputFile="..\..\lib\vc_dll\wxmsw312u_core_vc_custom.dll"
OutputFile="..\..\lib\vc_dll\wxmsw313u_core_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_dll\wxmsw31u_core.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312u_core_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw313u_core_vc_custom.pdb"
TargetMachine="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
@@ -586,7 +586,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_coredll.pch"
ObjectFile="vc_mswuddll_x64\core\"
ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw312ud_core_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw313ud_core_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="true"
@@ -597,7 +597,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312ud_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw313ud_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_x64_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
/>
@@ -608,14 +608,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib"
OutputFile="..\..\lib\vc_x64_dll\wxmsw312ud_core_vc_custom.dll"
OutputFile="..\..\lib\vc_x64_dll\wxmsw313ud_core_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31ud_core.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312ud_core_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw313ud_core_vc_custom.pdb"
TargetMachine="17"
/>
<Tool
@@ -677,7 +677,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswudll_x64\wxprec_coredll.pch"
ObjectFile="vc_mswudll_x64\core\"
ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw312u_core_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw313u_core_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="true"
@@ -688,7 +688,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312u_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw313u_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_x64_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
/>
@@ -699,14 +699,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxbase31u.lib"
OutputFile="..\..\lib\vc_x64_dll\wxmsw312u_core_vc_custom.dll"
OutputFile="..\..\lib\vc_x64_dll\wxmsw313u_core_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31u_core.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312u_core_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw313u_core_vc_custom.pdb"
TargetMachine="17"
OptimizeReferences="2"
EnableCOMDATFolding="2"
@@ -2127,6 +2127,10 @@
RelativePath="..\..\src\generic\richtooltipg.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\rowheightcache.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\sashwin.cpp"
>

32
build/msw/wx_vc8_gl.vcproj
View File

@@ -232,7 +232,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll\wxprec_gldll.pch"
ObjectFile="vc_mswuddll\gl\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312ud_gl_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw313ud_gl_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="true"
@@ -243,7 +243,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312ud_gl_vc_custom;WXUSINGDLL;WXMAKINGDLL_GL"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw313ud_gl_vc_custom;WXUSINGDLL;WXMAKINGDLL_GL"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
/>
@@ -254,14 +254,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib wxmsw31ud_core.lib wxbase31ud.lib opengl32.lib glu32.lib"
OutputFile="..\..\lib\vc_dll\wxmsw312ud_gl_vc_custom.dll"
OutputFile="..\..\lib\vc_dll\wxmsw313ud_gl_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_gl.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312ud_gl_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw313ud_gl_vc_custom.pdb"
TargetMachine="1"
/>
<Tool
@@ -323,7 +323,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswudll\wxprec_gldll.pch"
ObjectFile="vc_mswudll\gl\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312u_gl_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw313u_gl_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="true"
@@ -334,7 +334,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312u_gl_vc_custom;WXUSINGDLL;WXMAKINGDLL_GL"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw313u_gl_vc_custom;WXUSINGDLL;WXMAKINGDLL_GL"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
/>
@@ -345,14 +345,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib wxmsw31u_core.lib wxbase31u.lib opengl32.lib glu32.lib"
OutputFile="..\..\lib\vc_dll\wxmsw312u_gl_vc_custom.dll"
OutputFile="..\..\lib\vc_dll\wxmsw313u_gl_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_dll\wxmsw31u_gl.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312u_gl_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw313u_gl_vc_custom.pdb"
TargetMachine="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
@@ -586,7 +586,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_gldll.pch"
ObjectFile="vc_mswuddll_x64\gl\"
ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw312ud_gl_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw313ud_gl_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="true"
@@ -597,7 +597,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312ud_gl_vc_custom;WXUSINGDLL;WXMAKINGDLL_GL"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw313ud_gl_vc_custom;WXUSINGDLL;WXMAKINGDLL_GL"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_x64_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
/>
@@ -608,14 +608,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib wxmsw31ud_core.lib wxbase31ud.lib opengl32.lib glu32.lib"
OutputFile="..\..\lib\vc_x64_dll\wxmsw312ud_gl_vc_custom.dll"
OutputFile="..\..\lib\vc_x64_dll\wxmsw313ud_gl_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31ud_gl.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312ud_gl_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw313ud_gl_vc_custom.pdb"
TargetMachine="17"
/>
<Tool
@@ -677,7 +677,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswudll_x64\wxprec_gldll.pch"
ObjectFile="vc_mswudll_x64\gl\"
ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw312u_gl_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw313u_gl_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="true"
@@ -688,7 +688,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312u_gl_vc_custom;WXUSINGDLL;WXMAKINGDLL_GL"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw313u_gl_vc_custom;WXUSINGDLL;WXMAKINGDLL_GL"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_x64_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
/>
@@ -699,14 +699,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib wxmsw31u_core.lib wxbase31u.lib opengl32.lib glu32.lib"
OutputFile="..\..\lib\vc_x64_dll\wxmsw312u_gl_vc_custom.dll"
OutputFile="..\..\lib\vc_x64_dll\wxmsw313u_gl_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31u_gl.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312u_gl_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw313u_gl_vc_custom.pdb"
TargetMachine="17"
OptimizeReferences="2"
EnableCOMDATFolding="2"

32
build/msw/wx_vc8_html.vcproj
View File

@@ -232,7 +232,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll\wxprec_htmldll.pch"
ObjectFile="vc_mswuddll\html\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312ud_html_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw313ud_html_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="true"
@@ -243,7 +243,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312ud_html_vc_custom;WXUSINGDLL;WXMAKINGDLL_HTML"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw313ud_html_vc_custom;WXUSINGDLL;WXMAKINGDLL_HTML"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
/>
@@ -254,14 +254,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
OutputFile="..\..\lib\vc_dll\wxmsw312ud_html_vc_custom.dll"
OutputFile="..\..\lib\vc_dll\wxmsw313ud_html_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_html.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312ud_html_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw313ud_html_vc_custom.pdb"
TargetMachine="1"
/>
<Tool
@@ -323,7 +323,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswudll\wxprec_htmldll.pch"
ObjectFile="vc_mswudll\html\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312u_html_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw313u_html_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="true"
@@ -334,7 +334,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312u_html_vc_custom;WXUSINGDLL;WXMAKINGDLL_HTML"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw313u_html_vc_custom;WXUSINGDLL;WXMAKINGDLL_HTML"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
/>
@@ -345,14 +345,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
OutputFile="..\..\lib\vc_dll\wxmsw312u_html_vc_custom.dll"
OutputFile="..\..\lib\vc_dll\wxmsw313u_html_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_dll\wxmsw31u_html.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312u_html_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw313u_html_vc_custom.pdb"
TargetMachine="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
@@ -586,7 +586,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_htmldll.pch"
ObjectFile="vc_mswuddll_x64\html\"
ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw312ud_html_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw313ud_html_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="true"
@@ -597,7 +597,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312ud_html_vc_custom;WXUSINGDLL;WXMAKINGDLL_HTML"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw313ud_html_vc_custom;WXUSINGDLL;WXMAKINGDLL_HTML"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_x64_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
/>
@@ -608,14 +608,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib"
OutputFile="..\..\lib\vc_x64_dll\wxmsw312ud_html_vc_custom.dll"
OutputFile="..\..\lib\vc_x64_dll\wxmsw313ud_html_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31ud_html.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312ud_html_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw313ud_html_vc_custom.pdb"
TargetMachine="17"
/>
<Tool
@@ -677,7 +677,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswudll_x64\wxprec_htmldll.pch"
ObjectFile="vc_mswudll_x64\html\"
ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw312u_html_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw313u_html_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="true"
@@ -688,7 +688,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312u_html_vc_custom;WXUSINGDLL;WXMAKINGDLL_HTML"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw313u_html_vc_custom;WXUSINGDLL;WXMAKINGDLL_HTML"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_x64_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
/>
@@ -699,14 +699,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u.lib"
OutputFile="..\..\lib\vc_x64_dll\wxmsw312u_html_vc_custom.dll"
OutputFile="..\..\lib\vc_x64_dll\wxmsw313u_html_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31u_html.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312u_html_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw313u_html_vc_custom.pdb"
TargetMachine="17"
OptimizeReferences="2"
EnableCOMDATFolding="2"

32
build/msw/wx_vc8_media.vcproj
View File

@@ -232,7 +232,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll\wxprec_mediadll.pch"
ObjectFile="vc_mswuddll\media\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312ud_media_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw313ud_media_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="true"
@@ -243,7 +243,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312ud_media_vc_custom;WXUSINGDLL;WXMAKINGDLL_MEDIA"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw313ud_media_vc_custom;WXUSINGDLL;WXMAKINGDLL_MEDIA"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
/>
@@ -254,14 +254,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
OutputFile="..\..\lib\vc_dll\wxmsw312ud_media_vc_custom.dll"
OutputFile="..\..\lib\vc_dll\wxmsw313ud_media_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_media.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312ud_media_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw313ud_media_vc_custom.pdb"
TargetMachine="1"
/>
<Tool
@@ -323,7 +323,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswudll\wxprec_mediadll.pch"
ObjectFile="vc_mswudll\media\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312u_media_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw313u_media_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="true"
@@ -334,7 +334,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312u_media_vc_custom;WXUSINGDLL;WXMAKINGDLL_MEDIA"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw313u_media_vc_custom;WXUSINGDLL;WXMAKINGDLL_MEDIA"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
/>
@@ -345,14 +345,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
OutputFile="..\..\lib\vc_dll\wxmsw312u_media_vc_custom.dll"
OutputFile="..\..\lib\vc_dll\wxmsw313u_media_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_dll\wxmsw31u_media.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312u_media_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw313u_media_vc_custom.pdb"
TargetMachine="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
@@ -586,7 +586,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_mediadll.pch"
ObjectFile="vc_mswuddll_x64\media\"
ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw312ud_media_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw313ud_media_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="true"
@@ -597,7 +597,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312ud_media_vc_custom;WXUSINGDLL;WXMAKINGDLL_MEDIA"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw313ud_media_vc_custom;WXUSINGDLL;WXMAKINGDLL_MEDIA"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_x64_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
/>
@@ -608,14 +608,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib"
OutputFile="..\..\lib\vc_x64_dll\wxmsw312ud_media_vc_custom.dll"
OutputFile="..\..\lib\vc_x64_dll\wxmsw313ud_media_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31ud_media.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312ud_media_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw313ud_media_vc_custom.pdb"
TargetMachine="17"
/>
<Tool
@@ -677,7 +677,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswudll_x64\wxprec_mediadll.pch"
ObjectFile="vc_mswudll_x64\media\"
ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw312u_media_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw313u_media_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="true"
@@ -688,7 +688,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312u_media_vc_custom;WXUSINGDLL;WXMAKINGDLL_MEDIA"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw313u_media_vc_custom;WXUSINGDLL;WXMAKINGDLL_MEDIA"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_x64_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
/>
@@ -699,14 +699,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u.lib"
OutputFile="..\..\lib\vc_x64_dll\wxmsw312u_media_vc_custom.dll"
OutputFile="..\..\lib\vc_x64_dll\wxmsw313u_media_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31u_media.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312u_media_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw313u_media_vc_custom.pdb"
TargetMachine="17"
OptimizeReferences="2"
EnableCOMDATFolding="2"

32
build/msw/wx_vc8_net.vcproj
View File

@@ -232,7 +232,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll\wxprec_netdll.pch"
ObjectFile="vc_mswuddll\net\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase312ud_net_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase313ud_net_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="true"
@@ -243,7 +243,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase312ud_net_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase313ud_net_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
/>
@@ -254,14 +254,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalDependencies="wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase31ud.lib"
OutputFile="..\..\lib\vc_dll\wxbase312ud_net_vc_custom.dll"
OutputFile="..\..\lib\vc_dll\wxbase313ud_net_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxbase31ud_net.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\lib\vc_dll\wxbase312ud_net_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_dll\wxbase313ud_net_vc_custom.pdb"
TargetMachine="1"
/>
<Tool
@@ -323,7 +323,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswudll\wxprec_netdll.pch"
ObjectFile="vc_mswudll\net\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase312u_net_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase313u_net_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="true"
@@ -334,7 +334,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase312u_net_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase313u_net_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
/>
@@ -345,14 +345,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalDependencies="wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase31u.lib"
OutputFile="..\..\lib\vc_dll\wxbase312u_net_vc_custom.dll"
OutputFile="..\..\lib\vc_dll\wxbase313u_net_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_dll\wxbase31u_net.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\lib\vc_dll\wxbase312u_net_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_dll\wxbase313u_net_vc_custom.pdb"
TargetMachine="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
@@ -586,7 +586,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_netdll.pch"
ObjectFile="vc_mswuddll_x64\net\"
ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxbase312ud_net_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxbase313ud_net_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="true"
@@ -597,7 +597,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase312ud_net_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase313ud_net_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_x64_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
/>
@@ -608,14 +608,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalDependencies="wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib"
OutputFile="..\..\lib\vc_x64_dll\wxbase312ud_net_vc_custom.dll"
OutputFile="..\..\lib\vc_x64_dll\wxbase313ud_net_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_x64_dll\wxbase31ud_net.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxbase312ud_net_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxbase313ud_net_vc_custom.pdb"
TargetMachine="17"
/>
<Tool
@@ -677,7 +677,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswudll_x64\wxprec_netdll.pch"
ObjectFile="vc_mswudll_x64\net\"
ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxbase312u_net_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxbase313u_net_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="true"
@@ -688,7 +688,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase312u_net_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase313u_net_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_x64_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
/>
@@ -699,14 +699,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalDependencies="wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxbase31u.lib"
OutputFile="..\..\lib\vc_x64_dll\wxbase312u_net_vc_custom.dll"
OutputFile="..\..\lib\vc_x64_dll\wxbase313u_net_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_x64_dll\wxbase31u_net.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxbase312u_net_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxbase313u_net_vc_custom.pdb"
TargetMachine="17"
OptimizeReferences="2"
EnableCOMDATFolding="2"

32
build/msw/wx_vc8_propgrid.vcproj
View File

@@ -232,7 +232,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll\wxprec_propgriddll.pch"
ObjectFile="vc_mswuddll\propgrid\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312ud_propgrid_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw313ud_propgrid_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="true"
@@ -243,7 +243,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312ud_propgrid_vc_custom;WXUSINGDLL;WXMAKINGDLL_PROPGRID"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw313ud_propgrid_vc_custom;WXUSINGDLL;WXMAKINGDLL_PROPGRID"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
/>
@@ -254,14 +254,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
OutputFile="..\..\lib\vc_dll\wxmsw312ud_propgrid_vc_custom.dll"
OutputFile="..\..\lib\vc_dll\wxmsw313ud_propgrid_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_propgrid.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312ud_propgrid_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw313ud_propgrid_vc_custom.pdb"
TargetMachine="1"
/>
<Tool
@@ -323,7 +323,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswudll\wxprec_propgriddll.pch"
ObjectFile="vc_mswudll\propgrid\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312u_propgrid_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw313u_propgrid_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="true"
@@ -334,7 +334,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312u_propgrid_vc_custom;WXUSINGDLL;WXMAKINGDLL_PROPGRID"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw313u_propgrid_vc_custom;WXUSINGDLL;WXMAKINGDLL_PROPGRID"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
/>
@@ -345,14 +345,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
OutputFile="..\..\lib\vc_dll\wxmsw312u_propgrid_vc_custom.dll"
OutputFile="..\..\lib\vc_dll\wxmsw313u_propgrid_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_dll\wxmsw31u_propgrid.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312u_propgrid_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw313u_propgrid_vc_custom.pdb"
TargetMachine="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
@@ -586,7 +586,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_propgriddll.pch"
ObjectFile="vc_mswuddll_x64\propgrid\"
ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw312ud_propgrid_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw313ud_propgrid_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="true"
@@ -597,7 +597,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312ud_propgrid_vc_custom;WXUSINGDLL;WXMAKINGDLL_PROPGRID"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw313ud_propgrid_vc_custom;WXUSINGDLL;WXMAKINGDLL_PROPGRID"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_x64_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
/>
@@ -608,14 +608,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib"
OutputFile="..\..\lib\vc_x64_dll\wxmsw312ud_propgrid_vc_custom.dll"
OutputFile="..\..\lib\vc_x64_dll\wxmsw313ud_propgrid_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31ud_propgrid.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312ud_propgrid_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw313ud_propgrid_vc_custom.pdb"
TargetMachine="17"
/>
<Tool
@@ -677,7 +677,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswudll_x64\wxprec_propgriddll.pch"
ObjectFile="vc_mswudll_x64\propgrid\"
ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw312u_propgrid_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw313u_propgrid_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="true"
@@ -688,7 +688,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312u_propgrid_vc_custom;WXUSINGDLL;WXMAKINGDLL_PROPGRID"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw313u_propgrid_vc_custom;WXUSINGDLL;WXMAKINGDLL_PROPGRID"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_x64_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
/>
@@ -699,14 +699,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u.lib"
OutputFile="..\..\lib\vc_x64_dll\wxmsw312u_propgrid_vc_custom.dll"
OutputFile="..\..\lib\vc_x64_dll\wxmsw313u_propgrid_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31u_propgrid.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312u_propgrid_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw313u_propgrid_vc_custom.pdb"
TargetMachine="17"
OptimizeReferences="2"
EnableCOMDATFolding="2"

32
build/msw/wx_vc8_qa.vcproj
View File

@@ -232,7 +232,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll\wxprec_qadll.pch"
ObjectFile="vc_mswuddll\qa\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312ud_qa_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw313ud_qa_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="true"
@@ -243,7 +243,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312ud_qa_vc_custom;WXUSINGDLL;WXMAKINGDLL_QA"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw313ud_qa_vc_custom;WXUSINGDLL;WXMAKINGDLL_QA"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
/>
@@ -254,14 +254,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib ..\..\lib\vc_dll\wxbase31ud_xml.lib"
OutputFile="..\..\lib\vc_dll\wxmsw312ud_qa_vc_custom.dll"
OutputFile="..\..\lib\vc_dll\wxmsw313ud_qa_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_qa.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312ud_qa_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw313ud_qa_vc_custom.pdb"
TargetMachine="1"
/>
<Tool
@@ -323,7 +323,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswudll\wxprec_qadll.pch"
ObjectFile="vc_mswudll\qa\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312u_qa_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw313u_qa_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="true"
@@ -334,7 +334,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312u_qa_vc_custom;WXUSINGDLL;WXMAKINGDLL_QA"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw313u_qa_vc_custom;WXUSINGDLL;WXMAKINGDLL_QA"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
/>
@@ -345,14 +345,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib ..\..\lib\vc_dll\wxbase31u_xml.lib"
OutputFile="..\..\lib\vc_dll\wxmsw312u_qa_vc_custom.dll"
OutputFile="..\..\lib\vc_dll\wxmsw313u_qa_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_dll\wxmsw31u_qa.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312u_qa_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw313u_qa_vc_custom.pdb"
TargetMachine="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
@@ -586,7 +586,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_qadll.pch"
ObjectFile="vc_mswuddll_x64\qa\"
ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw312ud_qa_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw313ud_qa_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="true"
@@ -597,7 +597,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312ud_qa_vc_custom;WXUSINGDLL;WXMAKINGDLL_QA"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw313ud_qa_vc_custom;WXUSINGDLL;WXMAKINGDLL_QA"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_x64_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
/>
@@ -608,14 +608,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib ..\..\lib\vc_x64_dll\wxbase31ud_xml.lib"
OutputFile="..\..\lib\vc_x64_dll\wxmsw312ud_qa_vc_custom.dll"
OutputFile="..\..\lib\vc_x64_dll\wxmsw313ud_qa_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31ud_qa.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312ud_qa_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw313ud_qa_vc_custom.pdb"
TargetMachine="17"
/>
<Tool
@@ -677,7 +677,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswudll_x64\wxprec_qadll.pch"
ObjectFile="vc_mswudll_x64\qa\"
ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw312u_qa_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw313u_qa_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="true"
@@ -688,7 +688,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312u_qa_vc_custom;WXUSINGDLL;WXMAKINGDLL_QA"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw313u_qa_vc_custom;WXUSINGDLL;WXMAKINGDLL_QA"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_x64_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
/>
@@ -699,14 +699,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u.lib ..\..\lib\vc_x64_dll\wxbase31u_xml.lib"
OutputFile="..\..\lib\vc_x64_dll\wxmsw312u_qa_vc_custom.dll"
OutputFile="..\..\lib\vc_x64_dll\wxmsw313u_qa_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31u_qa.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312u_qa_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw313u_qa_vc_custom.pdb"
TargetMachine="17"
OptimizeReferences="2"
EnableCOMDATFolding="2"

32
build/msw/wx_vc8_ribbon.vcproj
View File

@@ -232,7 +232,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll\wxprec_ribbondll.pch"
ObjectFile="vc_mswuddll\ribbon\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312ud_ribbon_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw313ud_ribbon_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="true"
@@ -243,7 +243,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312ud_ribbon_vc_custom;WXUSINGDLL;WXMAKINGDLL_RIBBON"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw313ud_ribbon_vc_custom;WXUSINGDLL;WXMAKINGDLL_RIBBON"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
/>
@@ -254,14 +254,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
OutputFile="..\..\lib\vc_dll\wxmsw312ud_ribbon_vc_custom.dll"
OutputFile="..\..\lib\vc_dll\wxmsw313ud_ribbon_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_ribbon.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312ud_ribbon_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw313ud_ribbon_vc_custom.pdb"
TargetMachine="1"
/>
<Tool
@@ -323,7 +323,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswudll\wxprec_ribbondll.pch"
ObjectFile="vc_mswudll\ribbon\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312u_ribbon_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw313u_ribbon_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="true"
@@ -334,7 +334,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312u_ribbon_vc_custom;WXUSINGDLL;WXMAKINGDLL_RIBBON"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw313u_ribbon_vc_custom;WXUSINGDLL;WXMAKINGDLL_RIBBON"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
/>
@@ -345,14 +345,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
OutputFile="..\..\lib\vc_dll\wxmsw312u_ribbon_vc_custom.dll"
OutputFile="..\..\lib\vc_dll\wxmsw313u_ribbon_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_dll\wxmsw31u_ribbon.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312u_ribbon_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw313u_ribbon_vc_custom.pdb"
TargetMachine="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
@@ -586,7 +586,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_ribbondll.pch"
ObjectFile="vc_mswuddll_x64\ribbon\"
ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw312ud_ribbon_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw313ud_ribbon_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="true"
@@ -597,7 +597,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312ud_ribbon_vc_custom;WXUSINGDLL;WXMAKINGDLL_RIBBON"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw313ud_ribbon_vc_custom;WXUSINGDLL;WXMAKINGDLL_RIBBON"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_x64_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
/>
@@ -608,14 +608,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib"
OutputFile="..\..\lib\vc_x64_dll\wxmsw312ud_ribbon_vc_custom.dll"
OutputFile="..\..\lib\vc_x64_dll\wxmsw313ud_ribbon_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31ud_ribbon.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312ud_ribbon_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw313ud_ribbon_vc_custom.pdb"
TargetMachine="17"
/>
<Tool
@@ -677,7 +677,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswudll_x64\wxprec_ribbondll.pch"
ObjectFile="vc_mswudll_x64\ribbon\"
ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw312u_ribbon_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw313u_ribbon_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="true"
@@ -688,7 +688,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312u_ribbon_vc_custom;WXUSINGDLL;WXMAKINGDLL_RIBBON"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw313u_ribbon_vc_custom;WXUSINGDLL;WXMAKINGDLL_RIBBON"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_x64_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
/>
@@ -699,14 +699,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u.lib"
OutputFile="..\..\lib\vc_x64_dll\wxmsw312u_ribbon_vc_custom.dll"
OutputFile="..\..\lib\vc_x64_dll\wxmsw313u_ribbon_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31u_ribbon.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312u_ribbon_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw313u_ribbon_vc_custom.pdb"
TargetMachine="17"
OptimizeReferences="2"
EnableCOMDATFolding="2"

32
build/msw/wx_vc8_richtext.vcproj
View File

@@ -232,7 +232,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll\wxprec_richtextdll.pch"
ObjectFile="vc_mswuddll\richtext\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312ud_richtext_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw313ud_richtext_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="true"
@@ -243,7 +243,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312ud_richtext_vc_custom;WXUSINGDLL;WXMAKINGDLL_RICHTEXT"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw313ud_richtext_vc_custom;WXUSINGDLL;WXMAKINGDLL_RICHTEXT"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
/>
@@ -254,14 +254,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_html.lib ..\..\lib\vc_dll\wxbase31ud_xml.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
OutputFile="..\..\lib\vc_dll\wxmsw312ud_richtext_vc_custom.dll"
OutputFile="..\..\lib\vc_dll\wxmsw313ud_richtext_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_richtext.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312ud_richtext_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw313ud_richtext_vc_custom.pdb"
TargetMachine="1"
/>
<Tool
@@ -323,7 +323,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswudll\wxprec_richtextdll.pch"
ObjectFile="vc_mswudll\richtext\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312u_richtext_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw313u_richtext_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="true"
@@ -334,7 +334,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312u_richtext_vc_custom;WXUSINGDLL;WXMAKINGDLL_RICHTEXT"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw313u_richtext_vc_custom;WXUSINGDLL;WXMAKINGDLL_RICHTEXT"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
/>
@@ -345,14 +345,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_html.lib ..\..\lib\vc_dll\wxbase31u_xml.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
OutputFile="..\..\lib\vc_dll\wxmsw312u_richtext_vc_custom.dll"
OutputFile="..\..\lib\vc_dll\wxmsw313u_richtext_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_dll\wxmsw31u_richtext.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312u_richtext_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw313u_richtext_vc_custom.pdb"
TargetMachine="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
@@ -586,7 +586,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_richtextdll.pch"
ObjectFile="vc_mswuddll_x64\richtext\"
ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw312ud_richtext_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw313ud_richtext_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="true"
@@ -597,7 +597,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312ud_richtext_vc_custom;WXUSINGDLL;WXMAKINGDLL_RICHTEXT"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw313ud_richtext_vc_custom;WXUSINGDLL;WXMAKINGDLL_RICHTEXT"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_x64_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
/>
@@ -608,14 +608,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31ud_html.lib ..\..\lib\vc_x64_dll\wxbase31ud_xml.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib"
OutputFile="..\..\lib\vc_x64_dll\wxmsw312ud_richtext_vc_custom.dll"
OutputFile="..\..\lib\vc_x64_dll\wxmsw313ud_richtext_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31ud_richtext.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312ud_richtext_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw313ud_richtext_vc_custom.pdb"
TargetMachine="17"
/>
<Tool
@@ -677,7 +677,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswudll_x64\wxprec_richtextdll.pch"
ObjectFile="vc_mswudll_x64\richtext\"
ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw312u_richtext_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw313u_richtext_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="true"
@@ -688,7 +688,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312u_richtext_vc_custom;WXUSINGDLL;WXMAKINGDLL_RICHTEXT"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw313u_richtext_vc_custom;WXUSINGDLL;WXMAKINGDLL_RICHTEXT"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_x64_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
/>
@@ -699,14 +699,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31u_html.lib ..\..\lib\vc_x64_dll\wxbase31u_xml.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u.lib"
OutputFile="..\..\lib\vc_x64_dll\wxmsw312u_richtext_vc_custom.dll"
OutputFile="..\..\lib\vc_x64_dll\wxmsw313u_richtext_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31u_richtext.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312u_richtext_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw313u_richtext_vc_custom.pdb"
TargetMachine="17"
OptimizeReferences="2"
EnableCOMDATFolding="2"

32
build/msw/wx_vc8_stc.vcproj
View File

@@ -232,7 +232,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll\wxprec_stcdll.pch"
ObjectFile="vc_mswuddll\stc\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312ud_stc_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw313ud_stc_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="true"
@@ -243,7 +243,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312ud_stc_vc_custom;__WX__;SCI_LEXER;NO_CXX11_REGEX;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw313ud_stc_vc_custom;__WX__;SCI_LEXER;NO_CXX11_REGEX;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src"
/>
@@ -254,14 +254,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxscintillad.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
OutputFile="..\..\lib\vc_dll\wxmsw312ud_stc_vc_custom.dll"
OutputFile="..\..\lib\vc_dll\wxmsw313ud_stc_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_stc.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312ud_stc_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw313ud_stc_vc_custom.pdb"
TargetMachine="1"
/>
<Tool
@@ -323,7 +323,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswudll\wxprec_stcdll.pch"
ObjectFile="vc_mswudll\stc\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312u_stc_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw313u_stc_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="true"
@@ -334,7 +334,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312u_stc_vc_custom;__WX__;SCI_LEXER;NO_CXX11_REGEX;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw313u_stc_vc_custom;__WX__;SCI_LEXER;NO_CXX11_REGEX;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src"
/>
@@ -345,14 +345,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxscintilla.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
OutputFile="..\..\lib\vc_dll\wxmsw312u_stc_vc_custom.dll"
OutputFile="..\..\lib\vc_dll\wxmsw313u_stc_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_dll\wxmsw31u_stc.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312u_stc_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw313u_stc_vc_custom.pdb"
TargetMachine="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
@@ -586,7 +586,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_stcdll.pch"
ObjectFile="vc_mswuddll_x64\stc\"
ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw312ud_stc_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw313ud_stc_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="true"
@@ -597,7 +597,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312ud_stc_vc_custom;__WX__;SCI_LEXER;NO_CXX11_REGEX;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw313ud_stc_vc_custom;__WX__;SCI_LEXER;NO_CXX11_REGEX;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_x64_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src"
/>
@@ -608,14 +608,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxscintillad.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib"
OutputFile="..\..\lib\vc_x64_dll\wxmsw312ud_stc_vc_custom.dll"
OutputFile="..\..\lib\vc_x64_dll\wxmsw313ud_stc_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31ud_stc.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312ud_stc_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw313ud_stc_vc_custom.pdb"
TargetMachine="17"
/>
<Tool
@@ -677,7 +677,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswudll_x64\wxprec_stcdll.pch"
ObjectFile="vc_mswudll_x64\stc\"
ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw312u_stc_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw313u_stc_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="true"
@@ -688,7 +688,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312u_stc_vc_custom;__WX__;SCI_LEXER;NO_CXX11_REGEX;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw313u_stc_vc_custom;__WX__;SCI_LEXER;NO_CXX11_REGEX;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_x64_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src"
/>
@@ -699,14 +699,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxscintilla.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u.lib"
OutputFile="..\..\lib\vc_x64_dll\wxmsw312u_stc_vc_custom.dll"
OutputFile="..\..\lib\vc_x64_dll\wxmsw313u_stc_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31u_stc.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312u_stc_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw313u_stc_vc_custom.pdb"
TargetMachine="17"
OptimizeReferences="2"
EnableCOMDATFolding="2"

32
build/msw/wx_vc8_webview.vcproj
View File

@@ -232,7 +232,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll\wxprec_webviewdll.pch"
ObjectFile="vc_mswuddll\webview\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312ud_webview_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw313ud_webview_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="true"
@@ -243,7 +243,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312ud_webview_vc_custom;WXUSINGDLL;WXMAKINGDLL_WEBVIEW"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw313ud_webview_vc_custom;WXUSINGDLL;WXMAKINGDLL_WEBVIEW"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
/>
@@ -254,14 +254,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
OutputFile="..\..\lib\vc_dll\wxmsw312ud_webview_vc_custom.dll"
OutputFile="..\..\lib\vc_dll\wxmsw313ud_webview_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_webview.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312ud_webview_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw313ud_webview_vc_custom.pdb"
TargetMachine="1"
/>
<Tool
@@ -323,7 +323,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswudll\wxprec_webviewdll.pch"
ObjectFile="vc_mswudll\webview\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312u_webview_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw313u_webview_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="true"
@@ -334,7 +334,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312u_webview_vc_custom;WXUSINGDLL;WXMAKINGDLL_WEBVIEW"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw313u_webview_vc_custom;WXUSINGDLL;WXMAKINGDLL_WEBVIEW"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
/>
@@ -345,14 +345,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
OutputFile="..\..\lib\vc_dll\wxmsw312u_webview_vc_custom.dll"
OutputFile="..\..\lib\vc_dll\wxmsw313u_webview_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_dll\wxmsw31u_webview.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312u_webview_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw313u_webview_vc_custom.pdb"
TargetMachine="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
@@ -586,7 +586,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_webviewdll.pch"
ObjectFile="vc_mswuddll_x64\webview\"
ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw312ud_webview_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw313ud_webview_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="true"
@@ -597,7 +597,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312ud_webview_vc_custom;WXUSINGDLL;WXMAKINGDLL_WEBVIEW"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw313ud_webview_vc_custom;WXUSINGDLL;WXMAKINGDLL_WEBVIEW"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_x64_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
/>
@@ -608,14 +608,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib"
OutputFile="..\..\lib\vc_x64_dll\wxmsw312ud_webview_vc_custom.dll"
OutputFile="..\..\lib\vc_x64_dll\wxmsw313ud_webview_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31ud_webview.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312ud_webview_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw313ud_webview_vc_custom.pdb"
TargetMachine="17"
/>
<Tool
@@ -677,7 +677,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswudll_x64\wxprec_webviewdll.pch"
ObjectFile="vc_mswudll_x64\webview\"
ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw312u_webview_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw313u_webview_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="true"
@@ -688,7 +688,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312u_webview_vc_custom;WXUSINGDLL;WXMAKINGDLL_WEBVIEW"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw313u_webview_vc_custom;WXUSINGDLL;WXMAKINGDLL_WEBVIEW"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_x64_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
/>
@@ -699,14 +699,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u.lib"
OutputFile="..\..\lib\vc_x64_dll\wxmsw312u_webview_vc_custom.dll"
OutputFile="..\..\lib\vc_x64_dll\wxmsw313u_webview_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31u_webview.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312u_webview_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw313u_webview_vc_custom.pdb"
TargetMachine="17"
OptimizeReferences="2"
EnableCOMDATFolding="2"

32
build/msw/wx_vc8_xml.vcproj
View File

@@ -232,7 +232,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll\wxprec_xmldll.pch"
ObjectFile="vc_mswuddll\xml\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase312ud_xml_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase313ud_xml_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="true"
@@ -243,7 +243,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase312ud_xml_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase313ud_xml_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
/>
@@ -254,14 +254,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalDependencies="wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase31ud.lib"
OutputFile="..\..\lib\vc_dll\wxbase312ud_xml_vc_custom.dll"
OutputFile="..\..\lib\vc_dll\wxbase313ud_xml_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxbase31ud_xml.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\lib\vc_dll\wxbase312ud_xml_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_dll\wxbase313ud_xml_vc_custom.pdb"
TargetMachine="1"
/>
<Tool
@@ -323,7 +323,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswudll\wxprec_xmldll.pch"
ObjectFile="vc_mswudll\xml\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase312u_xml_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase313u_xml_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="true"
@@ -334,7 +334,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase312u_xml_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase313u_xml_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
/>
@@ -345,14 +345,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalDependencies="wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase31u.lib"
OutputFile="..\..\lib\vc_dll\wxbase312u_xml_vc_custom.dll"
OutputFile="..\..\lib\vc_dll\wxbase313u_xml_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_dll\wxbase31u_xml.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\lib\vc_dll\wxbase312u_xml_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_dll\wxbase313u_xml_vc_custom.pdb"
TargetMachine="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
@@ -586,7 +586,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_xmldll.pch"
ObjectFile="vc_mswuddll_x64\xml\"
ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxbase312ud_xml_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxbase313ud_xml_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="true"
@@ -597,7 +597,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase312ud_xml_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase313ud_xml_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_x64_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
/>
@@ -608,14 +608,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalDependencies="wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib"
OutputFile="..\..\lib\vc_x64_dll\wxbase312ud_xml_vc_custom.dll"
OutputFile="..\..\lib\vc_x64_dll\wxbase313ud_xml_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_x64_dll\wxbase31ud_xml.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxbase312ud_xml_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxbase313ud_xml_vc_custom.pdb"
TargetMachine="17"
/>
<Tool
@@ -677,7 +677,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswudll_x64\wxprec_xmldll.pch"
ObjectFile="vc_mswudll_x64\xml\"
ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxbase312u_xml_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxbase313u_xml_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="true"
@@ -688,7 +688,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase312u_xml_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase313u_xml_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_x64_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
/>
@@ -699,14 +699,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalDependencies="wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxbase31u.lib"
OutputFile="..\..\lib\vc_x64_dll\wxbase312u_xml_vc_custom.dll"
OutputFile="..\..\lib\vc_x64_dll\wxbase313u_xml_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_x64_dll\wxbase31u_xml.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxbase312u_xml_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxbase313u_xml_vc_custom.pdb"
TargetMachine="17"
OptimizeReferences="2"
EnableCOMDATFolding="2"

32
build/msw/wx_vc8_xrc.vcproj
View File

@@ -232,7 +232,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll\wxprec_xrcdll.pch"
ObjectFile="vc_mswuddll\xrc\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312ud_xrc_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw313ud_xrc_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="true"
@@ -243,7 +243,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312ud_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw313ud_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
/>
@@ -254,14 +254,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_html.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud_xml.lib ..\..\lib\vc_dll\wxbase31ud.lib"
OutputFile="..\..\lib\vc_dll\wxmsw312ud_xrc_vc_custom.dll"
OutputFile="..\..\lib\vc_dll\wxmsw313ud_xrc_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_xrc.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312ud_xrc_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw313ud_xrc_vc_custom.pdb"
TargetMachine="1"
/>
<Tool
@@ -323,7 +323,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswudll\wxprec_xrcdll.pch"
ObjectFile="vc_mswudll\xrc\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312u_xrc_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw313u_xrc_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="true"
@@ -334,7 +334,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312u_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw313u_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
/>
@@ -345,14 +345,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_html.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u_xml.lib ..\..\lib\vc_dll\wxbase31u.lib"
OutputFile="..\..\lib\vc_dll\wxmsw312u_xrc_vc_custom.dll"
OutputFile="..\..\lib\vc_dll\wxmsw313u_xrc_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_dll\wxmsw31u_xrc.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312u_xrc_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw313u_xrc_vc_custom.pdb"
TargetMachine="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
@@ -586,7 +586,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_xrcdll.pch"
ObjectFile="vc_mswuddll_x64\xrc\"
ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw312ud_xrc_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw313ud_xrc_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="true"
@@ -597,7 +597,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312ud_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw313ud_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_x64_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
/>
@@ -608,14 +608,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31ud_html.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud_xml.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib"
OutputFile="..\..\lib\vc_x64_dll\wxmsw312ud_xrc_vc_custom.dll"
OutputFile="..\..\lib\vc_x64_dll\wxmsw313ud_xrc_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31ud_xrc.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312ud_xrc_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw313ud_xrc_vc_custom.pdb"
TargetMachine="17"
/>
<Tool
@@ -677,7 +677,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswudll_x64\wxprec_xrcdll.pch"
ObjectFile="vc_mswudll_x64\xrc\"
ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw312u_xrc_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw313u_xrc_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="true"
@@ -688,7 +688,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312u_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw313u_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_x64_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
/>
@@ -699,14 +699,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31u_html.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u_xml.lib ..\..\lib\vc_x64_dll\wxbase31u.lib"
OutputFile="..\..\lib\vc_x64_dll\wxmsw312u_xrc_vc_custom.dll"
OutputFile="..\..\lib\vc_x64_dll\wxmsw313u_xrc_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31u_xrc.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312u_xrc_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw313u_xrc_vc_custom.pdb"
TargetMachine="17"
OptimizeReferences="2"
EnableCOMDATFolding="2"

32
build/msw/wx_vc9_adv.vcproj
View File

@@ -231,7 +231,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll\wxprec_advdll.pch"
ObjectFile="vc_mswuddll\adv\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312ud_adv_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw313ud_adv_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
DebugInformationFormat="3"
@@ -241,7 +241,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312ud_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw313ud_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
/>
@@ -252,14 +252,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
OutputFile="..\..\lib\vc_dll\wxmsw312ud_adv_vc_custom.dll"
OutputFile="..\..\lib\vc_dll\wxmsw313ud_adv_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_adv.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312ud_adv_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw313ud_adv_vc_custom.pdb"
TargetMachine="1"
/>
<Tool
@@ -322,7 +322,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswudll\wxprec_advdll.pch"
ObjectFile="vc_mswudll\adv\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312u_adv_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw313u_adv_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
DebugInformationFormat="3"
@@ -332,7 +332,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312u_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw313u_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
/>
@@ -343,14 +343,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
OutputFile="..\..\lib\vc_dll\wxmsw312u_adv_vc_custom.dll"
OutputFile="..\..\lib\vc_dll\wxmsw313u_adv_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_dll\wxmsw31u_adv.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312u_adv_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw313u_adv_vc_custom.pdb"
TargetMachine="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
@@ -583,7 +583,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_advdll.pch"
ObjectFile="vc_mswuddll_x64\adv\"
ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw312ud_adv_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw313ud_adv_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
DebugInformationFormat="3"
@@ -593,7 +593,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312ud_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw313ud_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_x64_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
/>
@@ -604,14 +604,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib"
OutputFile="..\..\lib\vc_x64_dll\wxmsw312ud_adv_vc_custom.dll"
OutputFile="..\..\lib\vc_x64_dll\wxmsw313ud_adv_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31ud_adv.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312ud_adv_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw313ud_adv_vc_custom.pdb"
TargetMachine="17"
/>
<Tool
@@ -674,7 +674,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswudll_x64\wxprec_advdll.pch"
ObjectFile="vc_mswudll_x64\adv\"
ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw312u_adv_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw313u_adv_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
DebugInformationFormat="3"
@@ -684,7 +684,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312u_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw313u_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_x64_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
/>
@@ -695,14 +695,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u.lib"
OutputFile="..\..\lib\vc_x64_dll\wxmsw312u_adv_vc_custom.dll"
OutputFile="..\..\lib\vc_x64_dll\wxmsw313u_adv_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31u_adv.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312u_adv_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw313u_adv_vc_custom.pdb"
TargetMachine="17"
OptimizeReferences="2"
EnableCOMDATFolding="2"

32
build/msw/wx_vc9_aui.vcproj
View File

@@ -231,7 +231,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll\wxprec_auidll.pch"
ObjectFile="vc_mswuddll\aui\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312ud_aui_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw313ud_aui_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
DebugInformationFormat="3"
@@ -241,7 +241,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312ud_aui_vc_custom;WXUSINGDLL;WXMAKINGDLL_AUI"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw313ud_aui_vc_custom;WXUSINGDLL;WXMAKINGDLL_AUI"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
/>
@@ -252,14 +252,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
OutputFile="..\..\lib\vc_dll\wxmsw312ud_aui_vc_custom.dll"
OutputFile="..\..\lib\vc_dll\wxmsw313ud_aui_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_aui.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312ud_aui_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw313ud_aui_vc_custom.pdb"
TargetMachine="1"
/>
<Tool
@@ -322,7 +322,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswudll\wxprec_auidll.pch"
ObjectFile="vc_mswudll\aui\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312u_aui_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw313u_aui_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
DebugInformationFormat="3"
@@ -332,7 +332,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312u_aui_vc_custom;WXUSINGDLL;WXMAKINGDLL_AUI"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw313u_aui_vc_custom;WXUSINGDLL;WXMAKINGDLL_AUI"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
/>
@@ -343,14 +343,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
OutputFile="..\..\lib\vc_dll\wxmsw312u_aui_vc_custom.dll"
OutputFile="..\..\lib\vc_dll\wxmsw313u_aui_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_dll\wxmsw31u_aui.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312u_aui_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw313u_aui_vc_custom.pdb"
TargetMachine="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
@@ -583,7 +583,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_auidll.pch"
ObjectFile="vc_mswuddll_x64\aui\"
ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw312ud_aui_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw313ud_aui_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
DebugInformationFormat="3"
@@ -593,7 +593,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312ud_aui_vc_custom;WXUSINGDLL;WXMAKINGDLL_AUI"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw313ud_aui_vc_custom;WXUSINGDLL;WXMAKINGDLL_AUI"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_x64_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
/>
@@ -604,14 +604,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib"
OutputFile="..\..\lib\vc_x64_dll\wxmsw312ud_aui_vc_custom.dll"
OutputFile="..\..\lib\vc_x64_dll\wxmsw313ud_aui_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31ud_aui.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312ud_aui_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw313ud_aui_vc_custom.pdb"
TargetMachine="17"
/>
<Tool
@@ -674,7 +674,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswudll_x64\wxprec_auidll.pch"
ObjectFile="vc_mswudll_x64\aui\"
ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw312u_aui_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw313u_aui_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
DebugInformationFormat="3"
@@ -684,7 +684,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312u_aui_vc_custom;WXUSINGDLL;WXMAKINGDLL_AUI"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw313u_aui_vc_custom;WXUSINGDLL;WXMAKINGDLL_AUI"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_x64_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
/>
@@ -695,14 +695,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u.lib"
OutputFile="..\..\lib\vc_x64_dll\wxmsw312u_aui_vc_custom.dll"
OutputFile="..\..\lib\vc_x64_dll\wxmsw313u_aui_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31u_aui.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312u_aui_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw313u_aui_vc_custom.pdb"
TargetMachine="17"
OptimizeReferences="2"
EnableCOMDATFolding="2"

32
build/msw/wx_vc9_base.vcproj
View File

@@ -231,7 +231,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll\wxprec_basedll.pch"
ObjectFile="vc_mswuddll\base\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase312ud_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase313ud_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
DebugInformationFormat="3"
@@ -241,7 +241,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase312ud_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase313ud_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
/>
@@ -252,14 +252,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalDependencies="wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="..\..\lib\vc_dll\wxbase312ud_vc_custom.dll"
OutputFile="..\..\lib\vc_dll\wxbase313ud_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxbase31ud.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\lib\vc_dll\wxbase312ud_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_dll\wxbase313ud_vc_custom.pdb"
TargetMachine="1"
/>
<Tool
@@ -322,7 +322,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswudll\wxprec_basedll.pch"
ObjectFile="vc_mswudll\base\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase312u_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase313u_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
DebugInformationFormat="3"
@@ -332,7 +332,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase312u_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase313u_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
/>
@@ -343,14 +343,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalDependencies="wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="..\..\lib\vc_dll\wxbase312u_vc_custom.dll"
OutputFile="..\..\lib\vc_dll\wxbase313u_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_dll\wxbase31u.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\lib\vc_dll\wxbase312u_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_dll\wxbase313u_vc_custom.pdb"
TargetMachine="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
@@ -583,7 +583,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_basedll.pch"
ObjectFile="vc_mswuddll_x64\base\"
ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxbase312ud_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxbase313ud_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
DebugInformationFormat="3"
@@ -593,7 +593,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase312ud_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase313ud_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_x64_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
/>
@@ -604,14 +604,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalDependencies="wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="..\..\lib\vc_x64_dll\wxbase312ud_vc_custom.dll"
OutputFile="..\..\lib\vc_x64_dll\wxbase313ud_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_x64_dll\wxbase31ud.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxbase312ud_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxbase313ud_vc_custom.pdb"
TargetMachine="17"
/>
<Tool
@@ -674,7 +674,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswudll_x64\wxprec_basedll.pch"
ObjectFile="vc_mswudll_x64\base\"
ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxbase312u_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxbase313u_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
DebugInformationFormat="3"
@@ -684,7 +684,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase312u_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase313u_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_x64_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
/>
@@ -695,14 +695,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalDependencies="wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="..\..\lib\vc_x64_dll\wxbase312u_vc_custom.dll"
OutputFile="..\..\lib\vc_x64_dll\wxbase313u_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_x64_dll\wxbase31u.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxbase312u_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxbase313u_vc_custom.pdb"
TargetMachine="17"
OptimizeReferences="2"
EnableCOMDATFolding="2"

36
build/msw/wx_vc9_core.vcproj
View File

@@ -231,7 +231,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll\wxprec_coredll.pch"
ObjectFile="vc_mswuddll\core\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312ud_core_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw313ud_core_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
DebugInformationFormat="3"
@@ -241,7 +241,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312ud_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw313ud_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
/>
@@ -252,14 +252,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase31ud.lib"
OutputFile="..\..\lib\vc_dll\wxmsw312ud_core_vc_custom.dll"
OutputFile="..\..\lib\vc_dll\wxmsw313ud_core_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_core.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312ud_core_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw313ud_core_vc_custom.pdb"
TargetMachine="1"
/>
<Tool
@@ -322,7 +322,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswudll\wxprec_coredll.pch"
ObjectFile="vc_mswudll\core\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312u_core_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw313u_core_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
DebugInformationFormat="3"
@@ -332,7 +332,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312u_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw313u_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
/>
@@ -343,14 +343,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase31u.lib"
OutputFile="..\..\lib\vc_dll\wxmsw312u_core_vc_custom.dll"
OutputFile="..\..\lib\vc_dll\wxmsw313u_core_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_dll\wxmsw31u_core.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312u_core_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw313u_core_vc_custom.pdb"
TargetMachine="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
@@ -583,7 +583,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_coredll.pch"
ObjectFile="vc_mswuddll_x64\core\"
ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw312ud_core_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw313ud_core_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
DebugInformationFormat="3"
@@ -593,7 +593,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312ud_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw313ud_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_x64_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
/>
@@ -604,14 +604,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib"
OutputFile="..\..\lib\vc_x64_dll\wxmsw312ud_core_vc_custom.dll"
OutputFile="..\..\lib\vc_x64_dll\wxmsw313ud_core_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31ud_core.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312ud_core_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw313ud_core_vc_custom.pdb"
TargetMachine="17"
/>
<Tool
@@ -674,7 +674,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswudll_x64\wxprec_coredll.pch"
ObjectFile="vc_mswudll_x64\core\"
ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw312u_core_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw313u_core_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
DebugInformationFormat="3"
@@ -684,7 +684,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312u_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw313u_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_x64_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
/>
@@ -695,14 +695,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxbase31u.lib"
OutputFile="..\..\lib\vc_x64_dll\wxmsw312u_core_vc_custom.dll"
OutputFile="..\..\lib\vc_x64_dll\wxmsw313u_core_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31u_core.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312u_core_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw313u_core_vc_custom.pdb"
TargetMachine="17"
OptimizeReferences="2"
EnableCOMDATFolding="2"
@@ -2123,6 +2123,10 @@
RelativePath="..\..\src\generic\richtooltipg.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\rowheightcache.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\sashwin.cpp"
>

32
build/msw/wx_vc9_gl.vcproj
View File

@@ -231,7 +231,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll\wxprec_gldll.pch"
ObjectFile="vc_mswuddll\gl\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312ud_gl_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw313ud_gl_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
DebugInformationFormat="3"
@@ -241,7 +241,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312ud_gl_vc_custom;WXUSINGDLL;WXMAKINGDLL_GL"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw313ud_gl_vc_custom;WXUSINGDLL;WXMAKINGDLL_GL"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
/>
@@ -252,14 +252,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib wxmsw31ud_core.lib wxbase31ud.lib opengl32.lib glu32.lib"
OutputFile="..\..\lib\vc_dll\wxmsw312ud_gl_vc_custom.dll"
OutputFile="..\..\lib\vc_dll\wxmsw313ud_gl_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_gl.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312ud_gl_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw313ud_gl_vc_custom.pdb"
TargetMachine="1"
/>
<Tool
@@ -322,7 +322,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswudll\wxprec_gldll.pch"
ObjectFile="vc_mswudll\gl\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312u_gl_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw313u_gl_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
DebugInformationFormat="3"
@@ -332,7 +332,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312u_gl_vc_custom;WXUSINGDLL;WXMAKINGDLL_GL"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw313u_gl_vc_custom;WXUSINGDLL;WXMAKINGDLL_GL"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
/>
@@ -343,14 +343,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib wxmsw31u_core.lib wxbase31u.lib opengl32.lib glu32.lib"
OutputFile="..\..\lib\vc_dll\wxmsw312u_gl_vc_custom.dll"
OutputFile="..\..\lib\vc_dll\wxmsw313u_gl_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_dll\wxmsw31u_gl.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312u_gl_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw313u_gl_vc_custom.pdb"
TargetMachine="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
@@ -583,7 +583,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_gldll.pch"
ObjectFile="vc_mswuddll_x64\gl\"
ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw312ud_gl_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw313ud_gl_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
DebugInformationFormat="3"
@@ -593,7 +593,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312ud_gl_vc_custom;WXUSINGDLL;WXMAKINGDLL_GL"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw313ud_gl_vc_custom;WXUSINGDLL;WXMAKINGDLL_GL"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_x64_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
/>
@@ -604,14 +604,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib wxmsw31ud_core.lib wxbase31ud.lib opengl32.lib glu32.lib"
OutputFile="..\..\lib\vc_x64_dll\wxmsw312ud_gl_vc_custom.dll"
OutputFile="..\..\lib\vc_x64_dll\wxmsw313ud_gl_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31ud_gl.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312ud_gl_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw313ud_gl_vc_custom.pdb"
TargetMachine="17"
/>
<Tool
@@ -674,7 +674,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswudll_x64\wxprec_gldll.pch"
ObjectFile="vc_mswudll_x64\gl\"
ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw312u_gl_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw313u_gl_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
DebugInformationFormat="3"
@@ -684,7 +684,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312u_gl_vc_custom;WXUSINGDLL;WXMAKINGDLL_GL"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw313u_gl_vc_custom;WXUSINGDLL;WXMAKINGDLL_GL"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_x64_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
/>
@@ -695,14 +695,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib wxmsw31u_core.lib wxbase31u.lib opengl32.lib glu32.lib"
OutputFile="..\..\lib\vc_x64_dll\wxmsw312u_gl_vc_custom.dll"
OutputFile="..\..\lib\vc_x64_dll\wxmsw313u_gl_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31u_gl.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312u_gl_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw313u_gl_vc_custom.pdb"
TargetMachine="17"
OptimizeReferences="2"
EnableCOMDATFolding="2"

32
build/msw/wx_vc9_html.vcproj
View File

@@ -231,7 +231,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll\wxprec_htmldll.pch"
ObjectFile="vc_mswuddll\html\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312ud_html_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw313ud_html_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
DebugInformationFormat="3"
@@ -241,7 +241,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312ud_html_vc_custom;WXUSINGDLL;WXMAKINGDLL_HTML"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw313ud_html_vc_custom;WXUSINGDLL;WXMAKINGDLL_HTML"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
/>
@@ -252,14 +252,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
OutputFile="..\..\lib\vc_dll\wxmsw312ud_html_vc_custom.dll"
OutputFile="..\..\lib\vc_dll\wxmsw313ud_html_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_html.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312ud_html_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw313ud_html_vc_custom.pdb"
TargetMachine="1"
/>
<Tool
@@ -322,7 +322,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswudll\wxprec_htmldll.pch"
ObjectFile="vc_mswudll\html\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312u_html_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw313u_html_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
DebugInformationFormat="3"
@@ -332,7 +332,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312u_html_vc_custom;WXUSINGDLL;WXMAKINGDLL_HTML"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw313u_html_vc_custom;WXUSINGDLL;WXMAKINGDLL_HTML"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
/>
@@ -343,14 +343,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
OutputFile="..\..\lib\vc_dll\wxmsw312u_html_vc_custom.dll"
OutputFile="..\..\lib\vc_dll\wxmsw313u_html_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_dll\wxmsw31u_html.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312u_html_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw313u_html_vc_custom.pdb"
TargetMachine="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
@@ -583,7 +583,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_htmldll.pch"
ObjectFile="vc_mswuddll_x64\html\"
ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw312ud_html_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw313ud_html_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
DebugInformationFormat="3"
@@ -593,7 +593,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312ud_html_vc_custom;WXUSINGDLL;WXMAKINGDLL_HTML"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw313ud_html_vc_custom;WXUSINGDLL;WXMAKINGDLL_HTML"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_x64_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
/>
@@ -604,14 +604,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib"
OutputFile="..\..\lib\vc_x64_dll\wxmsw312ud_html_vc_custom.dll"
OutputFile="..\..\lib\vc_x64_dll\wxmsw313ud_html_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31ud_html.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312ud_html_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw313ud_html_vc_custom.pdb"
TargetMachine="17"
/>
<Tool
@@ -674,7 +674,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswudll_x64\wxprec_htmldll.pch"
ObjectFile="vc_mswudll_x64\html\"
ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw312u_html_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw313u_html_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
DebugInformationFormat="3"
@@ -684,7 +684,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312u_html_vc_custom;WXUSINGDLL;WXMAKINGDLL_HTML"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw313u_html_vc_custom;WXUSINGDLL;WXMAKINGDLL_HTML"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_x64_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
/>
@@ -695,14 +695,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u.lib"
OutputFile="..\..\lib\vc_x64_dll\wxmsw312u_html_vc_custom.dll"
OutputFile="..\..\lib\vc_x64_dll\wxmsw313u_html_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31u_html.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312u_html_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw313u_html_vc_custom.pdb"
TargetMachine="17"
OptimizeReferences="2"
EnableCOMDATFolding="2"

32
build/msw/wx_vc9_media.vcproj
View File

@@ -231,7 +231,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll\wxprec_mediadll.pch"
ObjectFile="vc_mswuddll\media\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312ud_media_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw313ud_media_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
DebugInformationFormat="3"
@@ -241,7 +241,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312ud_media_vc_custom;WXUSINGDLL;WXMAKINGDLL_MEDIA"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw313ud_media_vc_custom;WXUSINGDLL;WXMAKINGDLL_MEDIA"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
/>
@@ -252,14 +252,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
OutputFile="..\..\lib\vc_dll\wxmsw312ud_media_vc_custom.dll"
OutputFile="..\..\lib\vc_dll\wxmsw313ud_media_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_media.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312ud_media_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw313ud_media_vc_custom.pdb"
TargetMachine="1"
/>
<Tool
@@ -322,7 +322,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswudll\wxprec_mediadll.pch"
ObjectFile="vc_mswudll\media\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312u_media_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw313u_media_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
DebugInformationFormat="3"
@@ -332,7 +332,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312u_media_vc_custom;WXUSINGDLL;WXMAKINGDLL_MEDIA"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw313u_media_vc_custom;WXUSINGDLL;WXMAKINGDLL_MEDIA"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
/>
@@ -343,14 +343,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
OutputFile="..\..\lib\vc_dll\wxmsw312u_media_vc_custom.dll"
OutputFile="..\..\lib\vc_dll\wxmsw313u_media_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_dll\wxmsw31u_media.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312u_media_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw313u_media_vc_custom.pdb"
TargetMachine="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
@@ -583,7 +583,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_mediadll.pch"
ObjectFile="vc_mswuddll_x64\media\"
ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw312ud_media_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw313ud_media_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
DebugInformationFormat="3"
@@ -593,7 +593,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312ud_media_vc_custom;WXUSINGDLL;WXMAKINGDLL_MEDIA"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw313ud_media_vc_custom;WXUSINGDLL;WXMAKINGDLL_MEDIA"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_x64_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
/>
@@ -604,14 +604,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib"
OutputFile="..\..\lib\vc_x64_dll\wxmsw312ud_media_vc_custom.dll"
OutputFile="..\..\lib\vc_x64_dll\wxmsw313ud_media_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31ud_media.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312ud_media_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw313ud_media_vc_custom.pdb"
TargetMachine="17"
/>
<Tool
@@ -674,7 +674,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswudll_x64\wxprec_mediadll.pch"
ObjectFile="vc_mswudll_x64\media\"
ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw312u_media_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw313u_media_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
DebugInformationFormat="3"
@@ -684,7 +684,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312u_media_vc_custom;WXUSINGDLL;WXMAKINGDLL_MEDIA"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw313u_media_vc_custom;WXUSINGDLL;WXMAKINGDLL_MEDIA"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_x64_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
/>
@@ -695,14 +695,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u.lib"
OutputFile="..\..\lib\vc_x64_dll\wxmsw312u_media_vc_custom.dll"
OutputFile="..\..\lib\vc_x64_dll\wxmsw313u_media_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31u_media.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312u_media_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw313u_media_vc_custom.pdb"
TargetMachine="17"
OptimizeReferences="2"
EnableCOMDATFolding="2"

32
build/msw/wx_vc9_net.vcproj
View File

@@ -231,7 +231,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll\wxprec_netdll.pch"
ObjectFile="vc_mswuddll\net\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase312ud_net_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase313ud_net_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
DebugInformationFormat="3"
@@ -241,7 +241,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase312ud_net_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase313ud_net_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
/>
@@ -252,14 +252,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalDependencies="wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase31ud.lib"
OutputFile="..\..\lib\vc_dll\wxbase312ud_net_vc_custom.dll"
OutputFile="..\..\lib\vc_dll\wxbase313ud_net_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxbase31ud_net.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\lib\vc_dll\wxbase312ud_net_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_dll\wxbase313ud_net_vc_custom.pdb"
TargetMachine="1"
/>
<Tool
@@ -322,7 +322,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswudll\wxprec_netdll.pch"
ObjectFile="vc_mswudll\net\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase312u_net_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase313u_net_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
DebugInformationFormat="3"
@@ -332,7 +332,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase312u_net_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase313u_net_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
/>
@@ -343,14 +343,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalDependencies="wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase31u.lib"
OutputFile="..\..\lib\vc_dll\wxbase312u_net_vc_custom.dll"
OutputFile="..\..\lib\vc_dll\wxbase313u_net_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_dll\wxbase31u_net.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\lib\vc_dll\wxbase312u_net_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_dll\wxbase313u_net_vc_custom.pdb"
TargetMachine="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
@@ -583,7 +583,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_netdll.pch"
ObjectFile="vc_mswuddll_x64\net\"
ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxbase312ud_net_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxbase313ud_net_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
DebugInformationFormat="3"
@@ -593,7 +593,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase312ud_net_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase313ud_net_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_x64_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
/>
@@ -604,14 +604,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalDependencies="wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib"
OutputFile="..\..\lib\vc_x64_dll\wxbase312ud_net_vc_custom.dll"
OutputFile="..\..\lib\vc_x64_dll\wxbase313ud_net_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_x64_dll\wxbase31ud_net.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxbase312ud_net_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxbase313ud_net_vc_custom.pdb"
TargetMachine="17"
/>
<Tool
@@ -674,7 +674,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswudll_x64\wxprec_netdll.pch"
ObjectFile="vc_mswudll_x64\net\"
ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxbase312u_net_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxbase313u_net_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
DebugInformationFormat="3"
@@ -684,7 +684,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase312u_net_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase313u_net_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_x64_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
/>
@@ -695,14 +695,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalDependencies="wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxbase31u.lib"
OutputFile="..\..\lib\vc_x64_dll\wxbase312u_net_vc_custom.dll"
OutputFile="..\..\lib\vc_x64_dll\wxbase313u_net_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_x64_dll\wxbase31u_net.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxbase312u_net_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxbase313u_net_vc_custom.pdb"
TargetMachine="17"
OptimizeReferences="2"
EnableCOMDATFolding="2"

32
build/msw/wx_vc9_propgrid.vcproj
View File

@@ -231,7 +231,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll\wxprec_propgriddll.pch"
ObjectFile="vc_mswuddll\propgrid\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312ud_propgrid_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw313ud_propgrid_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
DebugInformationFormat="3"
@@ -241,7 +241,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312ud_propgrid_vc_custom;WXUSINGDLL;WXMAKINGDLL_PROPGRID"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw313ud_propgrid_vc_custom;WXUSINGDLL;WXMAKINGDLL_PROPGRID"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
/>
@@ -252,14 +252,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
OutputFile="..\..\lib\vc_dll\wxmsw312ud_propgrid_vc_custom.dll"
OutputFile="..\..\lib\vc_dll\wxmsw313ud_propgrid_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_propgrid.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312ud_propgrid_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw313ud_propgrid_vc_custom.pdb"
TargetMachine="1"
/>
<Tool
@@ -322,7 +322,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswudll\wxprec_propgriddll.pch"
ObjectFile="vc_mswudll\propgrid\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312u_propgrid_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw313u_propgrid_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
DebugInformationFormat="3"
@@ -332,7 +332,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312u_propgrid_vc_custom;WXUSINGDLL;WXMAKINGDLL_PROPGRID"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw313u_propgrid_vc_custom;WXUSINGDLL;WXMAKINGDLL_PROPGRID"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
/>
@@ -343,14 +343,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
OutputFile="..\..\lib\vc_dll\wxmsw312u_propgrid_vc_custom.dll"
OutputFile="..\..\lib\vc_dll\wxmsw313u_propgrid_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_dll\wxmsw31u_propgrid.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312u_propgrid_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw313u_propgrid_vc_custom.pdb"
TargetMachine="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
@@ -583,7 +583,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_propgriddll.pch"
ObjectFile="vc_mswuddll_x64\propgrid\"
ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw312ud_propgrid_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw313ud_propgrid_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
DebugInformationFormat="3"
@@ -593,7 +593,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312ud_propgrid_vc_custom;WXUSINGDLL;WXMAKINGDLL_PROPGRID"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw313ud_propgrid_vc_custom;WXUSINGDLL;WXMAKINGDLL_PROPGRID"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_x64_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
/>
@@ -604,14 +604,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib"
OutputFile="..\..\lib\vc_x64_dll\wxmsw312ud_propgrid_vc_custom.dll"
OutputFile="..\..\lib\vc_x64_dll\wxmsw313ud_propgrid_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31ud_propgrid.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312ud_propgrid_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw313ud_propgrid_vc_custom.pdb"
TargetMachine="17"
/>
<Tool
@@ -674,7 +674,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswudll_x64\wxprec_propgriddll.pch"
ObjectFile="vc_mswudll_x64\propgrid\"
ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw312u_propgrid_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw313u_propgrid_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
DebugInformationFormat="3"
@@ -684,7 +684,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312u_propgrid_vc_custom;WXUSINGDLL;WXMAKINGDLL_PROPGRID"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw313u_propgrid_vc_custom;WXUSINGDLL;WXMAKINGDLL_PROPGRID"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_x64_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
/>
@@ -695,14 +695,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u.lib"
OutputFile="..\..\lib\vc_x64_dll\wxmsw312u_propgrid_vc_custom.dll"
OutputFile="..\..\lib\vc_x64_dll\wxmsw313u_propgrid_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31u_propgrid.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312u_propgrid_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw313u_propgrid_vc_custom.pdb"
TargetMachine="17"
OptimizeReferences="2"
EnableCOMDATFolding="2"

32
build/msw/wx_vc9_qa.vcproj
View File

@@ -231,7 +231,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll\wxprec_qadll.pch"
ObjectFile="vc_mswuddll\qa\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312ud_qa_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw313ud_qa_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
DebugInformationFormat="3"
@@ -241,7 +241,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312ud_qa_vc_custom;WXUSINGDLL;WXMAKINGDLL_QA"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw313ud_qa_vc_custom;WXUSINGDLL;WXMAKINGDLL_QA"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
/>
@@ -252,14 +252,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib ..\..\lib\vc_dll\wxbase31ud_xml.lib"
OutputFile="..\..\lib\vc_dll\wxmsw312ud_qa_vc_custom.dll"
OutputFile="..\..\lib\vc_dll\wxmsw313ud_qa_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_qa.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312ud_qa_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw313ud_qa_vc_custom.pdb"
TargetMachine="1"
/>
<Tool
@@ -322,7 +322,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswudll\wxprec_qadll.pch"
ObjectFile="vc_mswudll\qa\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312u_qa_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw313u_qa_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
DebugInformationFormat="3"
@@ -332,7 +332,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312u_qa_vc_custom;WXUSINGDLL;WXMAKINGDLL_QA"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw313u_qa_vc_custom;WXUSINGDLL;WXMAKINGDLL_QA"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
/>
@@ -343,14 +343,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib ..\..\lib\vc_dll\wxbase31u_xml.lib"
OutputFile="..\..\lib\vc_dll\wxmsw312u_qa_vc_custom.dll"
OutputFile="..\..\lib\vc_dll\wxmsw313u_qa_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_dll\wxmsw31u_qa.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312u_qa_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw313u_qa_vc_custom.pdb"
TargetMachine="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
@@ -583,7 +583,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_qadll.pch"
ObjectFile="vc_mswuddll_x64\qa\"
ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw312ud_qa_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw313ud_qa_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
DebugInformationFormat="3"
@@ -593,7 +593,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312ud_qa_vc_custom;WXUSINGDLL;WXMAKINGDLL_QA"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw313ud_qa_vc_custom;WXUSINGDLL;WXMAKINGDLL_QA"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_x64_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
/>
@@ -604,14 +604,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib ..\..\lib\vc_x64_dll\wxbase31ud_xml.lib"
OutputFile="..\..\lib\vc_x64_dll\wxmsw312ud_qa_vc_custom.dll"
OutputFile="..\..\lib\vc_x64_dll\wxmsw313ud_qa_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31ud_qa.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312ud_qa_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw313ud_qa_vc_custom.pdb"
TargetMachine="17"
/>
<Tool
@@ -674,7 +674,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswudll_x64\wxprec_qadll.pch"
ObjectFile="vc_mswudll_x64\qa\"
ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw312u_qa_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw313u_qa_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
DebugInformationFormat="3"
@@ -684,7 +684,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312u_qa_vc_custom;WXUSINGDLL;WXMAKINGDLL_QA"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw313u_qa_vc_custom;WXUSINGDLL;WXMAKINGDLL_QA"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_x64_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
/>
@@ -695,14 +695,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u.lib ..\..\lib\vc_x64_dll\wxbase31u_xml.lib"
OutputFile="..\..\lib\vc_x64_dll\wxmsw312u_qa_vc_custom.dll"
OutputFile="..\..\lib\vc_x64_dll\wxmsw313u_qa_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31u_qa.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312u_qa_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw313u_qa_vc_custom.pdb"
TargetMachine="17"
OptimizeReferences="2"
EnableCOMDATFolding="2"

32
build/msw/wx_vc9_ribbon.vcproj
View File

@@ -231,7 +231,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll\wxprec_ribbondll.pch"
ObjectFile="vc_mswuddll\ribbon\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312ud_ribbon_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw313ud_ribbon_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
DebugInformationFormat="3"
@@ -241,7 +241,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312ud_ribbon_vc_custom;WXUSINGDLL;WXMAKINGDLL_RIBBON"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw313ud_ribbon_vc_custom;WXUSINGDLL;WXMAKINGDLL_RIBBON"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
/>
@@ -252,14 +252,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
OutputFile="..\..\lib\vc_dll\wxmsw312ud_ribbon_vc_custom.dll"
OutputFile="..\..\lib\vc_dll\wxmsw313ud_ribbon_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_ribbon.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312ud_ribbon_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw313ud_ribbon_vc_custom.pdb"
TargetMachine="1"
/>
<Tool
@@ -322,7 +322,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswudll\wxprec_ribbondll.pch"
ObjectFile="vc_mswudll\ribbon\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312u_ribbon_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw313u_ribbon_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
DebugInformationFormat="3"
@@ -332,7 +332,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312u_ribbon_vc_custom;WXUSINGDLL;WXMAKINGDLL_RIBBON"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw313u_ribbon_vc_custom;WXUSINGDLL;WXMAKINGDLL_RIBBON"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
/>
@@ -343,14 +343,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
OutputFile="..\..\lib\vc_dll\wxmsw312u_ribbon_vc_custom.dll"
OutputFile="..\..\lib\vc_dll\wxmsw313u_ribbon_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_dll\wxmsw31u_ribbon.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312u_ribbon_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw313u_ribbon_vc_custom.pdb"
TargetMachine="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
@@ -583,7 +583,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_ribbondll.pch"
ObjectFile="vc_mswuddll_x64\ribbon\"
ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw312ud_ribbon_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw313ud_ribbon_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
DebugInformationFormat="3"
@@ -593,7 +593,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312ud_ribbon_vc_custom;WXUSINGDLL;WXMAKINGDLL_RIBBON"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw313ud_ribbon_vc_custom;WXUSINGDLL;WXMAKINGDLL_RIBBON"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_x64_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
/>
@@ -604,14 +604,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib"
OutputFile="..\..\lib\vc_x64_dll\wxmsw312ud_ribbon_vc_custom.dll"
OutputFile="..\..\lib\vc_x64_dll\wxmsw313ud_ribbon_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31ud_ribbon.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312ud_ribbon_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw313ud_ribbon_vc_custom.pdb"
TargetMachine="17"
/>
<Tool
@@ -674,7 +674,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswudll_x64\wxprec_ribbondll.pch"
ObjectFile="vc_mswudll_x64\ribbon\"
ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw312u_ribbon_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw313u_ribbon_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
DebugInformationFormat="3"
@@ -684,7 +684,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312u_ribbon_vc_custom;WXUSINGDLL;WXMAKINGDLL_RIBBON"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw313u_ribbon_vc_custom;WXUSINGDLL;WXMAKINGDLL_RIBBON"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_x64_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
/>
@@ -695,14 +695,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u.lib"
OutputFile="..\..\lib\vc_x64_dll\wxmsw312u_ribbon_vc_custom.dll"
OutputFile="..\..\lib\vc_x64_dll\wxmsw313u_ribbon_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31u_ribbon.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312u_ribbon_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw313u_ribbon_vc_custom.pdb"
TargetMachine="17"
OptimizeReferences="2"
EnableCOMDATFolding="2"

32
build/msw/wx_vc9_richtext.vcproj
View File

@@ -231,7 +231,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll\wxprec_richtextdll.pch"
ObjectFile="vc_mswuddll\richtext\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312ud_richtext_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw313ud_richtext_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
DebugInformationFormat="3"
@@ -241,7 +241,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312ud_richtext_vc_custom;WXUSINGDLL;WXMAKINGDLL_RICHTEXT"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw313ud_richtext_vc_custom;WXUSINGDLL;WXMAKINGDLL_RICHTEXT"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
/>
@@ -252,14 +252,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_html.lib ..\..\lib\vc_dll\wxbase31ud_xml.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
OutputFile="..\..\lib\vc_dll\wxmsw312ud_richtext_vc_custom.dll"
OutputFile="..\..\lib\vc_dll\wxmsw313ud_richtext_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_richtext.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312ud_richtext_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw313ud_richtext_vc_custom.pdb"
TargetMachine="1"
/>
<Tool
@@ -322,7 +322,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswudll\wxprec_richtextdll.pch"
ObjectFile="vc_mswudll\richtext\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312u_richtext_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw313u_richtext_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
DebugInformationFormat="3"
@@ -332,7 +332,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312u_richtext_vc_custom;WXUSINGDLL;WXMAKINGDLL_RICHTEXT"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw313u_richtext_vc_custom;WXUSINGDLL;WXMAKINGDLL_RICHTEXT"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
/>
@@ -343,14 +343,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_html.lib ..\..\lib\vc_dll\wxbase31u_xml.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
OutputFile="..\..\lib\vc_dll\wxmsw312u_richtext_vc_custom.dll"
OutputFile="..\..\lib\vc_dll\wxmsw313u_richtext_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_dll\wxmsw31u_richtext.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312u_richtext_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw313u_richtext_vc_custom.pdb"
TargetMachine="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
@@ -583,7 +583,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_richtextdll.pch"
ObjectFile="vc_mswuddll_x64\richtext\"
ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw312ud_richtext_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw313ud_richtext_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
DebugInformationFormat="3"
@@ -593,7 +593,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312ud_richtext_vc_custom;WXUSINGDLL;WXMAKINGDLL_RICHTEXT"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw313ud_richtext_vc_custom;WXUSINGDLL;WXMAKINGDLL_RICHTEXT"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_x64_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
/>
@@ -604,14 +604,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31ud_html.lib ..\..\lib\vc_x64_dll\wxbase31ud_xml.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib"
OutputFile="..\..\lib\vc_x64_dll\wxmsw312ud_richtext_vc_custom.dll"
OutputFile="..\..\lib\vc_x64_dll\wxmsw313ud_richtext_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31ud_richtext.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312ud_richtext_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw313ud_richtext_vc_custom.pdb"
TargetMachine="17"
/>
<Tool
@@ -674,7 +674,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswudll_x64\wxprec_richtextdll.pch"
ObjectFile="vc_mswudll_x64\richtext\"
ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw312u_richtext_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw313u_richtext_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
DebugInformationFormat="3"
@@ -684,7 +684,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312u_richtext_vc_custom;WXUSINGDLL;WXMAKINGDLL_RICHTEXT"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw313u_richtext_vc_custom;WXUSINGDLL;WXMAKINGDLL_RICHTEXT"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_x64_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
/>
@@ -695,14 +695,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31u_html.lib ..\..\lib\vc_x64_dll\wxbase31u_xml.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u.lib"
OutputFile="..\..\lib\vc_x64_dll\wxmsw312u_richtext_vc_custom.dll"
OutputFile="..\..\lib\vc_x64_dll\wxmsw313u_richtext_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31u_richtext.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312u_richtext_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw313u_richtext_vc_custom.pdb"
TargetMachine="17"
OptimizeReferences="2"
EnableCOMDATFolding="2"

32
build/msw/wx_vc9_stc.vcproj
View File

@@ -231,7 +231,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll\wxprec_stcdll.pch"
ObjectFile="vc_mswuddll\stc\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312ud_stc_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw313ud_stc_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
DebugInformationFormat="3"
@@ -241,7 +241,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312ud_stc_vc_custom;__WX__;SCI_LEXER;NO_CXX11_REGEX;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw313ud_stc_vc_custom;__WX__;SCI_LEXER;NO_CXX11_REGEX;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src"
/>
@@ -252,14 +252,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxscintillad.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
OutputFile="..\..\lib\vc_dll\wxmsw312ud_stc_vc_custom.dll"
OutputFile="..\..\lib\vc_dll\wxmsw313ud_stc_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_stc.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312ud_stc_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw313ud_stc_vc_custom.pdb"
TargetMachine="1"
/>
<Tool
@@ -322,7 +322,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswudll\wxprec_stcdll.pch"
ObjectFile="vc_mswudll\stc\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312u_stc_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw313u_stc_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
DebugInformationFormat="3"
@@ -332,7 +332,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312u_stc_vc_custom;__WX__;SCI_LEXER;NO_CXX11_REGEX;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw313u_stc_vc_custom;__WX__;SCI_LEXER;NO_CXX11_REGEX;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src"
/>
@@ -343,14 +343,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxscintilla.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
OutputFile="..\..\lib\vc_dll\wxmsw312u_stc_vc_custom.dll"
OutputFile="..\..\lib\vc_dll\wxmsw313u_stc_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_dll\wxmsw31u_stc.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312u_stc_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw313u_stc_vc_custom.pdb"
TargetMachine="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
@@ -583,7 +583,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_stcdll.pch"
ObjectFile="vc_mswuddll_x64\stc\"
ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw312ud_stc_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw313ud_stc_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
DebugInformationFormat="3"
@@ -593,7 +593,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312ud_stc_vc_custom;__WX__;SCI_LEXER;NO_CXX11_REGEX;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw313ud_stc_vc_custom;__WX__;SCI_LEXER;NO_CXX11_REGEX;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_x64_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src"
/>
@@ -604,14 +604,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxscintillad.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib"
OutputFile="..\..\lib\vc_x64_dll\wxmsw312ud_stc_vc_custom.dll"
OutputFile="..\..\lib\vc_x64_dll\wxmsw313ud_stc_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31ud_stc.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312ud_stc_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw313ud_stc_vc_custom.pdb"
TargetMachine="17"
/>
<Tool
@@ -674,7 +674,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswudll_x64\wxprec_stcdll.pch"
ObjectFile="vc_mswudll_x64\stc\"
ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw312u_stc_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw313u_stc_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
DebugInformationFormat="3"
@@ -684,7 +684,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312u_stc_vc_custom;__WX__;SCI_LEXER;NO_CXX11_REGEX;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw313u_stc_vc_custom;__WX__;SCI_LEXER;NO_CXX11_REGEX;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_x64_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src"
/>
@@ -695,14 +695,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxscintilla.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u.lib"
OutputFile="..\..\lib\vc_x64_dll\wxmsw312u_stc_vc_custom.dll"
OutputFile="..\..\lib\vc_x64_dll\wxmsw313u_stc_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31u_stc.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312u_stc_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw313u_stc_vc_custom.pdb"
TargetMachine="17"
OptimizeReferences="2"
EnableCOMDATFolding="2"

32
build/msw/wx_vc9_webview.vcproj
View File

@@ -231,7 +231,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll\wxprec_webviewdll.pch"
ObjectFile="vc_mswuddll\webview\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312ud_webview_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw313ud_webview_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
DebugInformationFormat="3"
@@ -241,7 +241,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312ud_webview_vc_custom;WXUSINGDLL;WXMAKINGDLL_WEBVIEW"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw313ud_webview_vc_custom;WXUSINGDLL;WXMAKINGDLL_WEBVIEW"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
/>
@@ -252,14 +252,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
OutputFile="..\..\lib\vc_dll\wxmsw312ud_webview_vc_custom.dll"
OutputFile="..\..\lib\vc_dll\wxmsw313ud_webview_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_webview.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312ud_webview_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw313ud_webview_vc_custom.pdb"
TargetMachine="1"
/>
<Tool
@@ -322,7 +322,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswudll\wxprec_webviewdll.pch"
ObjectFile="vc_mswudll\webview\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312u_webview_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw313u_webview_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
DebugInformationFormat="3"
@@ -332,7 +332,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312u_webview_vc_custom;WXUSINGDLL;WXMAKINGDLL_WEBVIEW"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw313u_webview_vc_custom;WXUSINGDLL;WXMAKINGDLL_WEBVIEW"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
/>
@@ -343,14 +343,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
OutputFile="..\..\lib\vc_dll\wxmsw312u_webview_vc_custom.dll"
OutputFile="..\..\lib\vc_dll\wxmsw313u_webview_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_dll\wxmsw31u_webview.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312u_webview_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw313u_webview_vc_custom.pdb"
TargetMachine="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
@@ -583,7 +583,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_webviewdll.pch"
ObjectFile="vc_mswuddll_x64\webview\"
ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw312ud_webview_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw313ud_webview_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
DebugInformationFormat="3"
@@ -593,7 +593,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312ud_webview_vc_custom;WXUSINGDLL;WXMAKINGDLL_WEBVIEW"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw313ud_webview_vc_custom;WXUSINGDLL;WXMAKINGDLL_WEBVIEW"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_x64_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
/>
@@ -604,14 +604,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib"
OutputFile="..\..\lib\vc_x64_dll\wxmsw312ud_webview_vc_custom.dll"
OutputFile="..\..\lib\vc_x64_dll\wxmsw313ud_webview_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31ud_webview.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312ud_webview_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw313ud_webview_vc_custom.pdb"
TargetMachine="17"
/>
<Tool
@@ -674,7 +674,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswudll_x64\wxprec_webviewdll.pch"
ObjectFile="vc_mswudll_x64\webview\"
ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw312u_webview_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw313u_webview_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
DebugInformationFormat="3"
@@ -684,7 +684,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312u_webview_vc_custom;WXUSINGDLL;WXMAKINGDLL_WEBVIEW"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw313u_webview_vc_custom;WXUSINGDLL;WXMAKINGDLL_WEBVIEW"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_x64_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
/>
@@ -695,14 +695,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u.lib"
OutputFile="..\..\lib\vc_x64_dll\wxmsw312u_webview_vc_custom.dll"
OutputFile="..\..\lib\vc_x64_dll\wxmsw313u_webview_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31u_webview.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312u_webview_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw313u_webview_vc_custom.pdb"
TargetMachine="17"
OptimizeReferences="2"
EnableCOMDATFolding="2"

32
build/msw/wx_vc9_xml.vcproj
View File

@@ -231,7 +231,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll\wxprec_xmldll.pch"
ObjectFile="vc_mswuddll\xml\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase312ud_xml_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase313ud_xml_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
DebugInformationFormat="3"
@@ -241,7 +241,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase312ud_xml_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase313ud_xml_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
/>
@@ -252,14 +252,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalDependencies="wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase31ud.lib"
OutputFile="..\..\lib\vc_dll\wxbase312ud_xml_vc_custom.dll"
OutputFile="..\..\lib\vc_dll\wxbase313ud_xml_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxbase31ud_xml.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\lib\vc_dll\wxbase312ud_xml_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_dll\wxbase313ud_xml_vc_custom.pdb"
TargetMachine="1"
/>
<Tool
@@ -322,7 +322,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswudll\wxprec_xmldll.pch"
ObjectFile="vc_mswudll\xml\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase312u_xml_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase313u_xml_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
DebugInformationFormat="3"
@@ -332,7 +332,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase312u_xml_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase313u_xml_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
/>
@@ -343,14 +343,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalDependencies="wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase31u.lib"
OutputFile="..\..\lib\vc_dll\wxbase312u_xml_vc_custom.dll"
OutputFile="..\..\lib\vc_dll\wxbase313u_xml_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_dll\wxbase31u_xml.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\lib\vc_dll\wxbase312u_xml_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_dll\wxbase313u_xml_vc_custom.pdb"
TargetMachine="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
@@ -583,7 +583,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_xmldll.pch"
ObjectFile="vc_mswuddll_x64\xml\"
ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxbase312ud_xml_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxbase313ud_xml_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
DebugInformationFormat="3"
@@ -593,7 +593,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase312ud_xml_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase313ud_xml_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_x64_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
/>
@@ -604,14 +604,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalDependencies="wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib"
OutputFile="..\..\lib\vc_x64_dll\wxbase312ud_xml_vc_custom.dll"
OutputFile="..\..\lib\vc_x64_dll\wxbase313ud_xml_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_x64_dll\wxbase31ud_xml.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxbase312ud_xml_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxbase313ud_xml_vc_custom.pdb"
TargetMachine="17"
/>
<Tool
@@ -674,7 +674,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswudll_x64\wxprec_xmldll.pch"
ObjectFile="vc_mswudll_x64\xml\"
ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxbase312u_xml_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxbase313u_xml_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
DebugInformationFormat="3"
@@ -684,7 +684,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase312u_xml_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase313u_xml_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_x64_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
/>
@@ -695,14 +695,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalDependencies="wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxbase31u.lib"
OutputFile="..\..\lib\vc_x64_dll\wxbase312u_xml_vc_custom.dll"
OutputFile="..\..\lib\vc_x64_dll\wxbase313u_xml_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_x64_dll\wxbase31u_xml.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxbase312u_xml_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxbase313u_xml_vc_custom.pdb"
TargetMachine="17"
OptimizeReferences="2"
EnableCOMDATFolding="2"

32
build/msw/wx_vc9_xrc.vcproj
View File

@@ -231,7 +231,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll\wxprec_xrcdll.pch"
ObjectFile="vc_mswuddll\xrc\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312ud_xrc_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw313ud_xrc_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
DebugInformationFormat="3"
@@ -241,7 +241,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312ud_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw313ud_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
/>
@@ -252,14 +252,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_html.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud_xml.lib ..\..\lib\vc_dll\wxbase31ud.lib"
OutputFile="..\..\lib\vc_dll\wxmsw312ud_xrc_vc_custom.dll"
OutputFile="..\..\lib\vc_dll\wxmsw313ud_xrc_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_xrc.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312ud_xrc_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw313ud_xrc_vc_custom.pdb"
TargetMachine="1"
/>
<Tool
@@ -322,7 +322,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswudll\wxprec_xrcdll.pch"
ObjectFile="vc_mswudll\xrc\"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312u_xrc_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw313u_xrc_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
DebugInformationFormat="3"
@@ -332,7 +332,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312u_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw313u_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
/>
@@ -343,14 +343,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_html.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u_xml.lib ..\..\lib\vc_dll\wxbase31u.lib"
OutputFile="..\..\lib\vc_dll\wxmsw312u_xrc_vc_custom.dll"
OutputFile="..\..\lib\vc_dll\wxmsw313u_xrc_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_dll\wxmsw31u_xrc.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312u_xrc_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw313u_xrc_vc_custom.pdb"
TargetMachine="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
@@ -583,7 +583,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_xrcdll.pch"
ObjectFile="vc_mswuddll_x64\xrc\"
ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw312ud_xrc_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw313ud_xrc_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
DebugInformationFormat="3"
@@ -593,7 +593,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312ud_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC"
PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw313ud_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_x64_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
/>
@@ -604,14 +604,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31ud_html.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud_xml.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib"
OutputFile="..\..\lib\vc_x64_dll\wxmsw312ud_xrc_vc_custom.dll"
OutputFile="..\..\lib\vc_x64_dll\wxmsw313ud_xrc_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31ud_xrc.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312ud_xrc_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw313ud_xrc_vc_custom.pdb"
TargetMachine="17"
/>
<Tool
@@ -674,7 +674,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswudll_x64\wxprec_xrcdll.pch"
ObjectFile="vc_mswudll_x64\xrc\"
ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw312u_xrc_vc_custom.pdb"
ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw313u_xrc_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
DebugInformationFormat="3"
@@ -684,7 +684,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312u_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw313u_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_x64_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
/>
@@ -695,14 +695,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31u_html.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u_xml.lib ..\..\lib\vc_x64_dll\wxbase31u.lib"
OutputFile="..\..\lib\vc_x64_dll\wxmsw312u_xrc_vc_custom.dll"
OutputFile="..\..\lib\vc_x64_dll\wxmsw313u_xrc_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31u_xrc.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312u_xrc_vc_custom.pdb"
ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw313u_xrc_vc_custom.pdb"
TargetMachine="17"
OptimizeReferences="2"
EnableCOMDATFolding="2"

2
build/osx/wxvers.xcconfig
View File

@@ -1,4 +1,4 @@
// update this file with new version numbers
DYLIB_COMPATIBILITY_VERSION = 3.1
DYLIB_CURRENT_VERSION = 3.1.2
DYLIB_CURRENT_VERSION = 3.1.3

29
build/tools/appveyor.bat
View File

@@ -52,32 +52,6 @@ bash -lc "g++ --version"
bash -lc "LDFLAGS=-L/usr/lib/w32api ./configure --disable-optimise --disable-shared && make -j3 && make -j3 -C tests"
goto :eof
:cmake_msys
if "%MSYSTEM%"=="" set MSYSTEM=MINGW32
path C:\msys64\%MSYSTEM%\bin;C:\msys64\usr\bin;%path%
set GENERATOR=MSYS Makefiles
set SKIPTESTS=1
set SKIPINSTALL=1
set CMAKE_NATIVE_FLAGS=-j3
goto cmake
:cmake_cygwin
C:\cygwin\setup-x86.exe -qnNdO -R C:/cygwin -s http://cygwin.mirror.constant.com -l C:/cygwin/var/cache/setup -P libjpeg-devel -P libpng-devel -P libtiff-devel -P libexpat-devel
path c:\cygwin\bin;%path%
set GENERATOR=Unix Makefiles
set SKIPTESTS=1
set SKIPINSTALL=1
set CMAKE_NATIVE_FLAGS=-j3
goto cmake
:cmake_mingw
:: CMake requires a path without sh (added by git on AppVeyor)
path C:\Program Files (x86)\CMake\bin;C:\MinGW\bin
set GENERATOR=MinGW Makefiles
set SKIPTESTS=1
set CMAKE_NATIVE_FLAGS=-j3
goto cmake
:cmake_qt
set SKIPINSTALL=1
set QT5DIR="C:\Qt\5.11\msvc2015_64"
@@ -106,7 +80,7 @@ set WX_INSTALL_PATH=%HOMEDRIVE%%HOMEPATH%\wx_install_target
mkdir %WX_INSTALL_PATH%
mkdir build_cmake
pushd build_cmake
cmake -G "%GENERATOR%" -DwxBUILD_TESTS=%BUILD_TESTS% -DCMAKE_INSTALL_PREFIX=%WX_INSTALL_PATH% -DwxBUILD_SHARED=%SHARED% %CMAKE_CONFIGURE_FLAGS% ..
cmake -G "%GENERATOR%" -DwxBUILD_TESTS=%BUILD_TESTS% -DwxBUILD_SAMPLES=SOME -DCMAKE_INSTALL_PREFIX=%WX_INSTALL_PATH% -DwxBUILD_SHARED=%SHARED% %CMAKE_CONFIGURE_FLAGS% ..
if ERRORLEVEL 1 goto error
echo.
echo --- Starting the build
@@ -141,7 +115,6 @@ if NOT "%SKIPINSTALL%"=="1" (
echo --- Building minimal sample with installed library
cmake --build . --config %CONFIGURATION% -- %CMAKE_LOGGER%
if ERRORLEVEL 1 goto error
popd
)
popd

2
build/tools/msvs/getversion.bat
View File

@@ -1,3 +1,3 @@
set wxMAJOR_VERSION=3
set wxMINOR_VERSION=1
set wxRELEASE_NUMBER=2
set wxRELEASE_NUMBER=3

7
build/tools/post-release.sh
View File

@@ -6,7 +6,12 @@ set -e
topdir=`dirname $0`/../..
# Build the file list for sha1sums, from `docs/release.md`
declare -a files=(`sed -n '/^## Download Verification/,/^## Binaries/p' $topdir/docs/release.md | sed -n -E 's/^\s*0{40}\s{2}(wx.*)/\1/p'`)
declare -a files=(`sed -n '/^To verify your download/,/^## Binaries/p' $topdir/docs/release.md | sed -n -E 's/^\s*0{40}\s{2}(wx.*)/\1/p'`)
if [ -z "$files" ]; then
echo "No lines with SHA-1 sums, has release.md format changed?" >&2
exit 1
fi
# Get the release version unless it's given explicitly on the command line.
if [ -z $1 ]; then

22
build/tools/travis-ci.sh
View File

@@ -16,42 +16,64 @@ case $wxTOOLSET in
cmake)
if [ -z $wxCMAKE_TESTS ]; then wxCMAKE_TESTS=CONSOLE_ONLY; fi
cmake --version
echo 'travis_fold:start:configure'
echo 'Configuring...'
mkdir build_cmake
pushd build_cmake
cmake -G "$wxCMAKE_GENERATOR" $wxCMAKE_DEFINES -D wxBUILD_SAMPLES=SOME -D wxBUILD_TESTS=$wxCMAKE_TESTS ..
echo 'travis_fold:end:configure'
echo 'travis_fold:start:building'
echo 'Building...'
cmake --build . -- $wxJOBS
echo 'travis_fold:end:building'
if [ "$wxCMAKE_TESTS" != "OFF" ]; then
echo 'travis_fold:start:testing'
echo 'Testing...'
ctest -V -C Debug -R "test_base" --output-on-failure --interactive-debug-mode 0 .
echo 'travis_fold:end:testing'
fi
echo 'Installing...' && echo -en 'travis_fold:start:script.install\\r'
sudo env "PATH=$PATH" cmake --build . --target install
popd
echo -en 'travis_fold:end:script.install\\r'
echo 'Testing installation...' && echo -en 'travis_fold:start:script.testinstall\\r'
mkdir build_cmake_install_test
pushd build_cmake_install_test
cmake "$wxCMAKE_GENERATOR" $wxCMAKE_DEFINES ../samples/minimal
cmake --build .
popd
echo -en 'travis_fold:end:script.testinstall\\r'
;;
*)
echo 'Configuring...' && echo -en 'travis_fold:start:script.configure\\r'
./configure --disable-optimise $wxCONFIGURE_FLAGS
echo -en 'travis_fold:end:script.configure\\r'
echo 'Building...' && echo -en 'travis_fold:start:script.build\\r'
make $wxJOBS
echo -en 'travis_fold:end:script.build\\r'
echo 'Building tests...' && echo -en 'travis_fold:start:script.tests\\r'
make -C tests $wxJOBS
echo -en 'travis_fold:end:script.tests\\r'
echo 'Testing...' && echo -en 'travis_fold:start:script.testing\\r'
pushd tests && ./test && popd
echo -en 'travis_fold:end:script.testing\\r'
echo 'Building samples...' && echo -en 'travis_fold:start:script.samples\\r'
(test "$wxSKIP_SAMPLES" && echo 'SKIPPED') || make samples
echo -en 'travis_fold:end:script.samples\\r'
echo 'Installing...' && echo -en 'travis_fold:start:script.install\\r'
sudo make install
echo -en 'travis_fold:end:script.install\\r'
echo 'Testing installation...' && echo -en 'travis_fold:start:script.testinstall\\r'
make -C samples/minimal -f makefile.unx clean
make -C samples/minimal -f makefile.unx $wxMAKEFILE_FLAGS

56
build/tools/wxwidgets.iss
View File

@@ -1,23 +1,21 @@
; Script generated by the Inno Setup Script Wizard.
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
#if GetEnv("INNO") != ""
#define WXW_DIR GetEnv("INNO")
#else
#define WXW_DIR "..\.."
#endif
#if GetEnv("WXW_VER") == "Snapshot"
#define INFOFILE WXW_DIR + "\BuildGit.txt"
#define WX_VERSION "Snapshot"
#elif GetEnv("WXW_VER") != ""
#define INFOFILE WXW_DIR + "\docs\msw\install.txt"
#define WX_VERSION GetEnv("WXW_VER")
#if GetEnv("INNO") != ""
#define WXW_DIR GetEnv("INNO")
#else
#error "WXW_VER environment variable must be defined."
#define WXW_DIR "..\.."
#endif
#define SETUPFILENAME "wxMSW-" + GetEnv("WXW_VER") + "-Setup"
#if GetEnv("WXW_VER") == "Snapshot"
#define WX_VERSION "Snapshot"
#elif GetEnv("WXW_VER") != ""
#define WX_VERSION GetEnv("WXW_VER")
#else
#error "WXW_VER environment variable must be defined."
#endif
#define SETUPFILENAME "wxMSW-" + GetEnv("WXW_VER") + "-Setup"
@@ -32,29 +30,29 @@ DefaultDirName={sd}\wxWidgets-{#WX_VERSION}
DefaultGroupName=wxWidgets {#WX_VERSION}
UsePreviousAppDir=no
DisableProgramGroupPage=yes
LicenseFile={#WXW_DIR}\docs\licence.txt
InfoBeforeFile={#WXW_DIR}\docs\readme.txt
InfoAfterFile={#INFOFILE}
OutputDir={#WXW_DIR}\..
OutputBaseFilename={#SETUPFILENAME}
PrivilegesRequired=none
SetupIconFile={#WXW_DIR}\art\wxwin.ico
LicenseFile={#WXW_DIR}\docs\licence.txt
InfoBeforeFile={#WXW_DIR}\docs\readme.txt
InfoAfterFile={#WXW_DIR}\docs\msw\setup_after.txt
OutputDir={#WXW_DIR}\..
OutputBaseFilename={#SETUPFILENAME}
PrivilegesRequired=none
SetupIconFile={#WXW_DIR}\art\wxwin.ico
Compression=lzma
SolidCompression=yes
[Files]
; source files
Source: "{#WXW_DIR}\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
[INI]
Filename: "{app}\wx.url"; Section: "InternetShortcut"; Key: "URL"; String: "https://www.wxwidgets.org"
[Files]
; source files
Source: "{#WXW_DIR}\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
[INI]
Filename: "{app}\wx.url"; Section: "InternetShortcut"; Key: "URL"; String: "https://www.wxwidgets.org"
[Icons]
Name: "{group}\{cm:ProgramOnTheWeb,wxWidgets}"; Filename: "{app}\wx.url"
Name: {group}\wxWidgets Manual; Filename: {app}\docs\htmlhelp\wx.chm; WorkingDir: {app}; IconIndex: 0; Flags: useapppaths
Name: {group}\Changes; Filename: {app}\docs\changes.txt; WorkingDir: {app}; IconIndex: 0; Flags: useapppaths
Name: {group}\Readme; Filename: {app}\docs\readme.txt; WorkingDir: {app}; IconIndex: 0; Flags: useapppaths
Name: {group}\Compiling wxWidgets; Filename: {app}\docs\msw\install.txt; WorkingDir: {app}; IconIndex: 0; Flags: useapppaths
Name: {group}\Setting up wxWidgets; Filename: {app}\docs\msw\install.md; WorkingDir: {app}; IconIndex: 0; Flags: useapppaths
Name: "{group}\Uninstall wxWidgets {#WX_VERSION}"; Filename: "{uninstallexe}"

209
configure vendored
View File

@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for wxWidgets 3.1.2.
# Generated by GNU Autoconf 2.69 for wxWidgets 3.1.3.
#
# Report bugs to <wx-dev@googlegroups.com>.
#
@@ -580,8 +580,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='wxWidgets'
PACKAGE_TARNAME='wxwidgets'
PACKAGE_VERSION='3.1.2'
PACKAGE_STRING='wxWidgets 3.1.2'
PACKAGE_VERSION='3.1.3'
PACKAGE_STRING='wxWidgets 3.1.3'
PACKAGE_BUGREPORT='wx-dev@googlegroups.com'
PACKAGE_URL=''
@@ -977,6 +977,8 @@ GTK_CONFIG
GTK_LIBS
GTK_CFLAGS
subdirs
LIBTIFF_LIBS
LIBTIFF_CFLAGS
PKG_CONFIG
AR
HAVE_CXX17
@@ -1364,6 +1366,8 @@ CXX
CXXFLAGS
CCC
PKG_CONFIG
LIBTIFF_CFLAGS
LIBTIFF_LIBS
DIRECTFB_CFLAGS
DIRECTFB_LIBS
XMKMF
@@ -1946,7 +1950,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures wxWidgets 3.1.2 to adapt to many kinds of systems.
\`configure' configures wxWidgets 3.1.3 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -2015,7 +2019,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of wxWidgets 3.1.2:";;
short | recursive ) echo "Configuration of wxWidgets 3.1.3:";;
esac
cat <<\_ACEOF
@@ -2349,6 +2353,10 @@ Some influential environment variables:
CXX C++ compiler command
CXXFLAGS C++ compiler flags
PKG_CONFIG path to pkg-config utility
LIBTIFF_CFLAGS
C compiler flags for LIBTIFF, overriding pkg-config
LIBTIFF_LIBS
linker flags for LIBTIFF, overriding pkg-config
DIRECTFB_CFLAGS
C compiler flags for DIRECTFB, overriding pkg-config
DIRECTFB_LIBS
@@ -2480,7 +2488,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
wxWidgets configure 3.1.2
wxWidgets configure 3.1.3
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -3297,7 +3305,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by wxWidgets $as_me 3.1.2, which was
It was created by wxWidgets $as_me 3.1.3, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -3760,7 +3768,7 @@ fi
wx_major_version_number=3
wx_minor_version_number=1
wx_release_number=2
wx_release_number=3
wx_subrelease_number=0
WX_RELEASE=$wx_major_version_number.$wx_minor_version_number
@@ -20139,8 +20147,7 @@ if test "$wxUSE_MAC" = 1; then
if test "x$wxUSE_MACOSX_SDK" = "xno"; then
wxUSE_MACOSX_SDK=
elif test "x$wxUSE_MACOSX_SDK" = "xyes"; then
# TODO: Search for most recent SDK and use it.
wxUSE_MACOSX_SDK="/Developer/SDKs/MacOSX10.4u.sdk"
wxUSE_MACOSX_SDK="`xcode-select -p`/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk"
fi
@@ -20190,7 +20197,7 @@ $as_echo "$as_me: WARNING: Could not determine deployment target from SDKSetting
wxUSE_MACOSX_VERSION_MIN=
fi
elif test "x$wxUSE_MACOSX_VERSION_MIN" = "x"; then
wxUSE_MACOSX_VERSION_MIN=10.7
wxUSE_MACOSX_VERSION_MIN=10.9
fi
if test "x$MACOSX_SDK_OPTS" != "x"; then
@@ -23429,30 +23436,94 @@ fi
TIFF_LINK=
TIFF_PREREQ_LINKS=-lm
if test "$wxUSE_LIBTIFF" != "no" ; then
$as_echo "#define wxUSE_LIBTIFF 1" >>confdefs.h
if test "$wxUSE_LIBTIFF" = "sys" -o "$wxUSE_LIBTIFF" = "yes" ; then
if test "$wxUSE_LIBJPEG" = "sys"; then
TIFF_PREREQ_LINKS="$TIFF_PREREQ_LINKS $JPEG_LINK"
pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBTIFF" >&5
$as_echo_n "checking for LIBTIFF... " >&6; }
if test -n "$PKG_CONFIG"; then
if test -n "$LIBTIFF_CFLAGS"; then
pkg_cv_LIBTIFF_CFLAGS="$LIBTIFF_CFLAGS"
else
if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libtiff-4\""; } >&5
($PKG_CONFIG --exists --print-errors "libtiff-4") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_LIBTIFF_CFLAGS=`$PKG_CONFIG --cflags "libtiff-4" 2>/dev/null`
else
pkg_failed=yes
fi
fi
else
pkg_failed=untried
fi
if test -n "$PKG_CONFIG"; then
if test -n "$LIBTIFF_LIBS"; then
pkg_cv_LIBTIFF_LIBS="$LIBTIFF_LIBS"
else
if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libtiff-4\""; } >&5
($PKG_CONFIG --exists --print-errors "libtiff-4") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_LIBTIFF_LIBS=`$PKG_CONFIG --libs "libtiff-4" 2>/dev/null`
else
pkg_failed=yes
fi
fi
else
pkg_failed=untried
fi
if test $pkg_failed = yes; then
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
LIBTIFF_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libtiff-4"`
else
LIBTIFF_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libtiff-4"`
fi
if test "$wxUSE_ZLIB" = "sys"; then
TIFF_PREREQ_LINKS="$TIFF_PREREQ_LINKS $ZLIB_LINK"
fi
if test -n "$LZMA_LINK"; then
TIFF_PREREQ_LINKS="$TIFF_PREREQ_LINKS $LZMA_LINK"
fi
if test "$wxUSE_LIBJBIG" = "yes"; then
TIFF_PREREQ_LINKS="$TIFF_PREREQ_LINKS $JBIG_LINK"
fi
ac_fn_c_check_header_compile "$LINENO" "tiffio.h" "ac_cv_header_tiffio_h" "
# Put the nasty error message in config.log where it belongs
echo "$LIBTIFF_PKG_ERRORS" >&5
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: not found via pkg-config" >&5
$as_echo "not found via pkg-config" >&6; }
TIFF_PREREQ_LINKS=-lm
if test "$wxUSE_LIBJPEG" = "sys"; then
TIFF_PREREQ_LINKS="$TIFF_PREREQ_LINKS $JPEG_LINK"
fi
if test "$wxUSE_ZLIB" = "sys"; then
TIFF_PREREQ_LINKS="$TIFF_PREREQ_LINKS $ZLIB_LINK"
fi
if test -n "$LZMA_LINK"; then
TIFF_PREREQ_LINKS="$TIFF_PREREQ_LINKS $LZMA_LINK"
fi
if test "$wxUSE_LIBJBIG" = "yes"; then
TIFF_PREREQ_LINKS="$TIFF_PREREQ_LINKS $JBIG_LINK"
fi
ac_fn_c_check_header_compile "$LINENO" "tiffio.h" "ac_cv_header_tiffio_h" "
"
if test "x$ac_cv_header_tiffio_h" = xyes; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for TIFFError in -ltiff" >&5
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for TIFFError in -ltiff" >&5
$as_echo_n "checking for TIFFError in -ltiff... " >&6; }
if ${ac_cv_lib_tiff_TIFFError+:} false; then :
$as_echo_n "(cached) " >&6
@@ -23497,6 +23568,86 @@ fi
elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: not found via pkg-config" >&5
$as_echo "not found via pkg-config" >&6; }
TIFF_PREREQ_LINKS=-lm
if test "$wxUSE_LIBJPEG" = "sys"; then
TIFF_PREREQ_LINKS="$TIFF_PREREQ_LINKS $JPEG_LINK"
fi
if test "$wxUSE_ZLIB" = "sys"; then
TIFF_PREREQ_LINKS="$TIFF_PREREQ_LINKS $ZLIB_LINK"
fi
if test -n "$LZMA_LINK"; then
TIFF_PREREQ_LINKS="$TIFF_PREREQ_LINKS $LZMA_LINK"
fi
if test "$wxUSE_LIBJBIG" = "yes"; then
TIFF_PREREQ_LINKS="$TIFF_PREREQ_LINKS $JBIG_LINK"
fi
ac_fn_c_check_header_compile "$LINENO" "tiffio.h" "ac_cv_header_tiffio_h" "
"
if test "x$ac_cv_header_tiffio_h" = xyes; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for TIFFError in -ltiff" >&5
$as_echo_n "checking for TIFFError in -ltiff... " >&6; }
if ${ac_cv_lib_tiff_TIFFError+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-ltiff $TIFF_PREREQ_LINKS $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
char TIFFError ();
int
main ()
{
return TIFFError ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_tiff_TIFFError=yes
else
ac_cv_lib_tiff_TIFFError=no
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tiff_TIFFError" >&5
$as_echo "$ac_cv_lib_tiff_TIFFError" >&6; }
if test "x$ac_cv_lib_tiff_TIFFError" = xyes; then :
TIFF_LINK=" -ltiff"
fi
fi
else
LIBTIFF_CFLAGS=$pkg_cv_LIBTIFF_CFLAGS
LIBTIFF_LIBS=$pkg_cv_LIBTIFF_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
TIFF_LINK=$LIBTIFF_LIBS
CFLAGS="$LIBTIFF_CFLAGS $CFLAGS"
fi
if test "x$TIFF_LINK" = "x" ; then
if test "$wxUSE_LIBTIFF" = "sys" ; then
as_fn_error $? "system tiff library not found! Use --with-libtiff=builtin to use built-in version" "$LINENO" 5
@@ -31982,7 +32133,7 @@ if test "x$ac_cv_lib_socket_inet_addr" = xyes; then :
INET_LINK="socket"
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inet_addr in -lnetwork" >&5
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inet_addr in -lnetwork" >&5
$as_echo_n "checking for inet_addr in -lnetwork... " >&6; }
if ${ac_cv_lib_network_inet_addr+:} false; then :
$as_echo_n "(cached) " >&6
@@ -34363,7 +34514,7 @@ fi
WITH_PLUGIN_SDL=0
if test "$wxUSE_SOUND" = "yes"; then
if test "$USE_UNIX" = 1 ; then
if test "$USE_UNIX" = 1 -a "$USE_MAC" != 1 ; then
if test "$wxUSE_LIBSDL" != "no"; then
pkg_failed=no
@@ -42294,7 +42445,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by wxWidgets $as_me 3.1.2, which was
This file was extended by wxWidgets $as_me 3.1.3, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -42360,7 +42511,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
wxWidgets config.status 3.1.2
wxWidgets config.status 3.1.3
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"

78
configure.in
View File

@@ -14,7 +14,7 @@ dnl ---------------------------------------------------------------------------
dnl initialization
dnl ---------------------------------------------------------------------------
AC_INIT([wxWidgets], [3.1.2], [wx-dev@googlegroups.com])
AC_INIT([wxWidgets], [3.1.3], [wx-dev@googlegroups.com])
dnl the file passed to AC_CONFIG_SRCDIR should be specific to our package
AC_CONFIG_SRCDIR([wx-config.in])
@@ -40,7 +40,7 @@ dnl wx_release_number += 1
wx_major_version_number=3
wx_minor_version_number=1
wx_release_number=2
wx_release_number=3
wx_subrelease_number=0
WX_RELEASE=$wx_major_version_number.$wx_minor_version_number
@@ -1222,8 +1222,8 @@ dnl NOTE: We clobber wxUSE_MACOSX_SDK with the SDK path
if test "x$wxUSE_MACOSX_SDK" = "xno"; then
wxUSE_MACOSX_SDK=
elif test "x$wxUSE_MACOSX_SDK" = "xyes"; then
# TODO: Search for most recent SDK and use it.
wxUSE_MACOSX_SDK="/Developer/SDKs/MacOSX10.4u.sdk"
dnl Try to use the default SDK.
wxUSE_MACOSX_SDK="`xcode-select -p`/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk"
fi
@@ -1275,7 +1275,7 @@ dnl We need to quote the next line where we don't need macros and do need [] in
wxUSE_MACOSX_VERSION_MIN=
fi
elif test "x$wxUSE_MACOSX_VERSION_MIN" = "x"; then
wxUSE_MACOSX_VERSION_MIN=10.7
wxUSE_MACOSX_VERSION_MIN=10.9
fi
if test "x$MACOSX_SDK_OPTS" != "x"; then
@@ -2612,35 +2612,47 @@ dnl Check for tiff library
dnl ------------------------------------------------------------------------
TIFF_LINK=
TIFF_PREREQ_LINKS=-lm
if test "$wxUSE_LIBTIFF" != "no" ; then
AC_DEFINE(wxUSE_LIBTIFF)
if test "$wxUSE_LIBTIFF" = "sys" -o "$wxUSE_LIBTIFF" = "yes" ; then
dnl libtiff may depend on libjpeg and libz so use them in the test
dnl below or it would fail
if test "$wxUSE_LIBJPEG" = "sys"; then
TIFF_PREREQ_LINKS="$TIFF_PREREQ_LINKS $JPEG_LINK"
fi
if test "$wxUSE_ZLIB" = "sys"; then
TIFF_PREREQ_LINKS="$TIFF_PREREQ_LINKS $ZLIB_LINK"
fi
if test -n "$LZMA_LINK"; then
TIFF_PREREQ_LINKS="$TIFF_PREREQ_LINKS $LZMA_LINK"
fi
if test "$wxUSE_LIBJBIG" = "yes"; then
TIFF_PREREQ_LINKS="$TIFF_PREREQ_LINKS $JBIG_LINK"
fi
AC_CHECK_HEADER(tiffio.h,
[
AC_CHECK_LIB(tiff, TIFFError,
TIFF_LINK=" -ltiff",
,
$TIFF_PREREQ_LINKS)
],
[],
[ ]
)
dnl First try using pkg-config as it's the most reliable way to detect
dnl libtiff.
PKG_CHECK_MODULES(LIBTIFF, [libtiff-4],
[
TIFF_LINK=$LIBTIFF_LIBS
CFLAGS="$LIBTIFF_CFLAGS $CFLAGS"
],
[
AC_MSG_RESULT([not found via pkg-config])
TIFF_PREREQ_LINKS=-lm
dnl libtiff may depend on libjpeg and libz so use them in the test
dnl below or it would fail
if test "$wxUSE_LIBJPEG" = "sys"; then
TIFF_PREREQ_LINKS="$TIFF_PREREQ_LINKS $JPEG_LINK"
fi
if test "$wxUSE_ZLIB" = "sys"; then
TIFF_PREREQ_LINKS="$TIFF_PREREQ_LINKS $ZLIB_LINK"
fi
if test -n "$LZMA_LINK"; then
TIFF_PREREQ_LINKS="$TIFF_PREREQ_LINKS $LZMA_LINK"
fi
if test "$wxUSE_LIBJBIG" = "yes"; then
TIFF_PREREQ_LINKS="$TIFF_PREREQ_LINKS $JBIG_LINK"
fi
AC_CHECK_HEADER(tiffio.h,
[
AC_CHECK_LIB(tiff, TIFFError,
TIFF_LINK=" -ltiff",
,
$TIFF_PREREQ_LINKS)
],
[],
[ ]
)
])
if test "x$TIFF_LINK" = "x" ; then
if test "$wxUSE_LIBTIFF" = "sys" ; then
@@ -4518,7 +4530,7 @@ AC_CHECK_FUNCS(inet_addr,
AC_CHECK_LIB(socket, inet_addr,
INET_LINK="socket",
[
AC_CHECK_LIB(network, inet_addr,
AC_CHECK_LIB(network, inet_addr,
INET_LINK="network"
)
]
@@ -5548,7 +5560,7 @@ fi
WITH_PLUGIN_SDL=0
if test "$wxUSE_SOUND" = "yes"; then
if test "$USE_UNIX" = 1 ; then
if test "$USE_UNIX" = 1 -a "$USE_MAC" != 1 ; then
if test "$wxUSE_LIBSDL" != "no"; then
PKG_CHECK_MODULES([SDL], [sdl2 >= 2.0.0],
[
@@ -5567,7 +5579,7 @@ if test "$wxUSE_SOUND" = "yes"; then
AC_DEFINE(wxUSE_LIBSDL)
],
[wxUSE_LIBSDL="no"])
])
])
if test "$wxUSE_LIBSDL" = "yes" -a "$wxUSE_PLUGINS" = "yes" ; then
WITH_PLUGIN_SDL=1
fi

2
demos/bombs/Makefile.in
View File

@@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR =
WX_RELEASE = 3.1
WX_VERSION = $(WX_RELEASE).2
WX_VERSION = $(WX_RELEASE).3
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) \

2
demos/forty/Makefile.in
View File

@@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR =
WX_RELEASE = 3.1
WX_VERSION = $(WX_RELEASE).2
WX_VERSION = $(WX_RELEASE).3
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) \

2
demos/fractal/Makefile.in
View File

@@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR =
WX_RELEASE = 3.1
WX_VERSION = $(WX_RELEASE).2
WX_VERSION = $(WX_RELEASE).3
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) \

2
demos/life/Makefile.in
View File

@@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR =
WX_RELEASE = 3.1
WX_VERSION = $(WX_RELEASE).2
WX_VERSION = $(WX_RELEASE).3
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) \

2
demos/poem/Makefile.in
View File

@@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR =
WX_RELEASE = 3.1
WX_VERSION = $(WX_RELEASE).2
WX_VERSION = $(WX_RELEASE).3
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) \

2
docs/base/readme.txt
View File

@@ -65,7 +65,7 @@ b) Cygwin
c) Borland
Please refer to the docs/msw/install.txt. The console sample compiles and
Please refer to the docs/msw/install.md. The console sample compiles and
runs but does not pass all tests.
d) Other compilers

50
docs/changes.txt
View File

@@ -59,6 +59,12 @@ Changes in behaviour not resulting in compilation errors
return just "N" under Linux and macOS. Use the new GetButtonOrdinal() to
update the existing code if necessary.
- Generic wxDataViewCtrl now always resizes its last column to fill all the
available space, as the GTK+ version always did.
- wxGTK wxNotebook::AddPage() doesn't generate any events any more for the
first page being added, for consistency with the other ports.
Changes in behaviour which may result in build errors
-----------------------------------------------------
@@ -101,8 +107,47 @@ Changes in behaviour which may result in build errors
e.g. if the error is due to spelling an option name wrongly, fixing or
removing its name.
- wxTextValidator::Get{In,Ex}cludes() now return a const reference to
wxArrayString. Please update your code to use the appropriate setter
Set[Char]{In,Ex}cludes(), instead of mutating the internal data directly.
3.1.2: (released 2018-??-??)
- Under macOS, 10.9 SDK is used by default now. 10.7 SDK is still supported,
but must be explicitly selected (and libstdc++ must be installed in order
to use it).
3.1.3: (released 2019-??-??)
----------------------------
INCOMPATIBLE CHANGES SINCE 3.1.2:
- New wxTranslations::GetAcceptableTranslations() method was problematic and
was removed, fixing various regressions in wxTranslations::AddCatalog() that
were introduced by it. Thanks to Tomasz Słodkowicz and Dummy for reporting
this and providing fixes for it.
All (GUI):
- Fix wxInfoBar close button size in high DPI (Stefan Ziegler).
- Make disabling the window before creating it actually work.
- Implement wxAuiNotebook::GetBestSize() (Sebastian Walderich).
- Add support for editing dates (without time) to wxGrid (Pavel Kalugin).
- Allow changing tooltip text for button allowing to enter a new string
in wxPGArrayEditorDialog.
- Fix wxPropertyGrid issues with horizontal scrolling.
wxGTK:
- Invalidate selection after deleting wxListBox item with GTK+ 3 too.
wxMSW:
- Fix passing Unicode strings via wxIPC when using DDE.
- Improve wxDataViewCtrl performance with variable line heights (Jens Goepfert).
3.1.2: (released 2018-12-10)
----------------------------
All:
@@ -143,6 +188,8 @@ All (GUI):
- Add wxToolbook::EnablePage() (Stefan Ziegler).
- Adapt AUI colours to system colour changes (Daniel Kulp).
- Fix removing and inserting pages in wxToolbook (Stefan Ziegler).
- Fix bug in template selection in docview framework (jwiesemann).
- Implement wxAuiNotebook::HitTest() (Sebastian Walderich).
wxGTK:
@@ -172,6 +219,7 @@ wxMSW:
- Send wxEVT_WEBVIEW_NAVIGATING when redirecting (Josue Andrade Gomes).
- Fix build with MSVS 2005 broken in 3.1.1.
- Add wxwidgets.props property sheet file for MSVS users.
- Fix jumping to the given position in wxMediaCtrl (ashishmore).
wxOSX:

4
docs/changes_30.txt
View File

@@ -733,10 +733,10 @@ All (GUI):
- Support hexadecimal numbers in wxSpinCtrl.
- Respect window max size in wxBoxSizer (Nathan Ridge).
- Add support for searching in wxWebView for MSW and GTK (Allonii).
- Add generic wxFileSystem support to wxWebView with
- Add generic wxFileSystem support to wxWebView with
wxWebViewFSHandler (Nick Matthews).
- Add possibility to disable context menu in wxWebView.
- Add ability to register custom wxWebView backends using
- Add ability to register custom wxWebView backends using
wxWebView::RegisterFactory and a wxWebViewFactory derived class.
- Add possibility to hide and show again wxRibbonBar pages (wxBen).
- Add wxRibbonBar pages highlighting (wxBen).

Some files were not shown because too many files have changed in this diff Show More