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

Move wxAdv library contents into wxCore

Browse Source 
This basically removes the "adv" library, even though it's still
preserved for compatibility with user make/project files referring to
it.

It is done because the distinction between "adv" and "core" was never
really clear (e.g. why wxTreeCtrl was in core but wxTreeListCtrl in
adv?) and it prevented some core classes from using adv ones.
This commit is contained in:
Vadim Zeitlin
2018-08-27 16:34:34 +02:00
parent b38813a5e9
commit 3ffa651a34
314 changed files with 9761 additions and 11422 deletions
Download Patch File Download Diff File Expand all files Collapse all files

644
build/bakefiles/files.bkl
View File

@@ -329,6 +329,13 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/generic/clrpickerg.h
wx/generic/fontpickerg.h
wx/generic/caret.h
wx/qt/calctrl.h
wx/generic/animate.h
wx/qt/dvrenderer.h
wx/qt/taskbar.h
wx/generic/activityindicator.h
wx/qt/dataview.h
wx/qt/dvrenderers.h
</set>
<set var="QT_SRC" hints="files">
@@ -420,31 +427,16 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/qt/uiaction.cpp
src/qt/utils.cpp
src/qt/window.cpp
</set>
<set var="ADVANCED_QT_HDR" hints="files">
wx/generic/animate.h
wx/qt/calctrl.h
wx/qt/dataview.h
wx/qt/dvrenderer.h
wx/qt/dvrenderers.h
wx/qt/taskbar.h
wx/generic/activityindicator.h
</set>
<set var="ADVANCED_QT_SRC" hints="files">
src/generic/animateg.cpp
src/qt/calctrl.cpp
src/qt/converter.cpp
src/qt/dataview.cpp
src/qt/dvrenderer.cpp
src/qt/dvrenderers.cpp
src/unix/joystick.cpp
src/unix/sound.cpp
src/qt/taskbar.cpp
src/common/taskbarcmn.cpp
src/qt/utils.cpp
src/unix/joystick.cpp
src/qt/taskbar.cpp
src/qt/dvrenderer.cpp
src/generic/animateg.cpp
src/qt/dataview.cpp
src/unix/sound.cpp
src/generic/activityindicator.cpp
src/qt/calctrl.cpp
src/qt/dvrenderers.cpp
</set>
<set var="MEDIA_QT_SRC" hints="files">
@@ -956,6 +948,41 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/generic/vlbox.cpp
src/generic/vscroll.cpp
src/xrc/xmlreshandler.cpp
src/generic/splash.cpp
src/generic/notifmsgg.cpp
src/generic/odcombo.cpp
src/common/calctrlcmn.cpp
src/generic/grideditors.cpp
src/common/bmpcboxcmn.cpp
src/generic/grid.cpp
src/generic/gridctrl.cpp
src/generic/hyperlinkg.cpp
src/generic/helpext.cpp
src/generic/sashwin.cpp
src/generic/gridsel.cpp
src/common/addremovectrl.cpp
src/generic/tipdlg.cpp
src/generic/aboutdlgg.cpp
src/common/gridcmn.cpp
src/common/richtooltipcmn.cpp
src/generic/datectlg.cpp
src/generic/bannerwindow.cpp
src/generic/treelist.cpp
src/common/datavcmn.cpp
src/common/animatecmn.cpp
src/common/odcombocmn.cpp
src/common/hyperlnkcmn.cpp
src/generic/propdlg.cpp
src/generic/bmpcboxg.cpp
src/generic/richtooltipg.cpp
src/generic/timectrlg.cpp
src/generic/commandlinkbuttong.cpp
src/common/notifmsgcmn.cpp
src/generic/wizard.cpp
src/generic/datavgen.cpp
src/generic/editlbox.cpp
src/generic/laywin.cpp
src/generic/calctrlg.cpp
</set>
<set var="GUI_CMN_HDR" hints="files">
wx/affinematrix2dbase.h
@@ -1194,6 +1221,57 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/generic/collheaderctrl.h
wx/itemattr.h
wx/peninfobase.h
wx/dataview.h
wx/generic/helpext.h
wx/sashwin.h
wx/tipdlg.h
wx/generic/propdlg.h
wx/generic/bmpcbox.h
wx/datetimectrl.h
wx/grid.h
wx/generic/grid.h
wx/wizard.h
wx/generic/grideditors.h
wx/generic/dataview.h
wx/generic/wizard.h
wx/generic/dvrenderers.h
wx/dateevt.h
wx/editlbox.h
wx/splash.h
wx/bmpcbox.h
wx/generic/gridctrl.h
wx/addremovectrl.h
wx/generic/notifmsg.h
wx/odcombo.h
wx/animate.h
wx/generic/hyperlink.h
wx/dcbuffer.h
wx/joystick.h
wx/timectrl.h
wx/hyperlink.h
wx/generic/aboutdlgg.h
wx/taskbar.h
wx/generic/timectrl.h
wx/commandlinkbutton.h
wx/richtooltip.h
wx/sound.h
wx/generic/laywin.h
wx/generic/splash.h
wx/generic/calctrlg.h
wx/generic/sashwin.h
wx/treelist.h
wx/notifmsg.h
wx/datectrl.h
wx/laywin.h
wx/generic/gridsel.h
wx/aboutdlg.h
wx/dvrenderers.h
wx/generic/datectrl.h
wx/bannerwindow.h
wx/activityindicator.h
wx/generic/dvrenderer.h
wx/calctrl.h
wx/propdlg.h
</set>
<!-- ====================================================================== -->
@@ -1217,12 +1295,19 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/unix/fontutil.cpp
src/unix/uiactionx11.cpp
src/unix/utilsx11.cpp
src/unix/sound.cpp
src/common/taskbarcmn.cpp
src/unix/joystick.cpp
src/unix/taskbarx11.cpp
</set>
<set var="XWIN_LOWLEVEL_HDR" hints="files">
wx/generic/caret.h
wx/generic/imaglist.h
wx/unix/fontutil.h
wx/unix/utilsx11.h
wx/unix/sound.h
wx/unix/taskbarx11.h
wx/unix/joystick.h
</set>
@@ -1244,6 +1329,9 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/msw/utilswin.cpp
src/unix/fontenum.cpp
src/unix/fontutil.cpp
src/msw/sound.cpp
src/msw/joystick.cpp
src/common/taskbarcmn.cpp
</set>
<set var="GTK_WIN32_HDR" hints="files">
wx/generic/caret.h
@@ -1255,6 +1343,9 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/msw/ole/uuid.h
wx/msw/dib.h
wx/unix/fontutil.h
wx/msw/sound.h
wx/msw/joystick.h
wx/msw/taskbar.h
</set>
<set var="GTK_PLATFORM_SRC" hints="files">
<if cond="PLATFORM_UNIX=='1'">$(XWIN_LOWLEVEL_SRC)</if>
@@ -1394,11 +1485,22 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/gtk/textentry.cpp
src/gtk/tglbtn.cpp
src/gtk/treeentry_gtk.c
src/gtk/activityindicator.cpp
src/gtk/calctrl.cpp
src/gtk/hyperlink.cpp
src/gtk/aboutdlg.cpp
src/gtk/notifmsg.cpp
src/gtk/taskbar.cpp
src/gtk/dataview.cpp
src/gtk/bmpcbox.cpp
src/gtk/animate.cpp
</set>
<set var="GTK2_SRC" hints="files">
$(GTK_SRC)
<!-- Generic implementations used by wxGPE: -->
src/generic/fontdlgg.cpp
src/generic/activityindicator.cpp
src/gtk/eggtrayicon.c
</set>
<set var="GTK_HDR" hints="files">
wx/generic/fdrepdlg.h
@@ -1451,6 +1553,16 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/gtk/textctrl.h
wx/gtk/textentry.h
wx/gtk/tglbtn.h
wx/gtk/animate.h
wx/gtk/hyperlink.h
wx/gtk/taskbar.h
wx/gtk/dvrenderers.h
wx/generic/activityindicator.h
wx/gtk/activityindicator.h
wx/gtk/calctrl.h
wx/gtk/bmpcbox.h
wx/gtk/dataview.h
wx/gtk/dvrenderer.h
</set>
<set var="GTK2_HDR" hints="files">
$(GTK_HDR)
@@ -1572,6 +1684,10 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/gtk1/toolbar.cpp
src/gtk1/textctrl.cpp
src/gtk1/tglbtn.cpp
src/gtk1/taskbar.cpp
src/generic/activityindicator.cpp
src/gtk1/eggtrayicon.c
src/generic/animateg.cpp
</set>
<set var="GTK1_HDR" hints="files">
wx/generic/clrpickerg.h
@@ -1619,6 +1735,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/gtk1/textctrl.h
wx/gtk1/tglbtn.h
wx/gtk1/treectrl.h
wx/generic/animate.h
wx/generic/activityindicator.h
</set>
@@ -1713,6 +1831,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/generic/statline.cpp
src/generic/statusbr.cpp
src/generic/tabg.cpp
src/generic/animateg.cpp
src/generic/activityindicator.cpp
</set>
<set var="MOTIF_HDR" hints="files">
wx/generic/clrpickerg.h
@@ -1783,6 +1903,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/motif/toolbar.h
wx/motif/toplevel.h
wx/motif/window.h
wx/generic/animate.h
wx/generic/animateanimate.h
</set>
@@ -1917,6 +2039,19 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/msw/window.cpp
src/msw/graphicsd2d.cpp
src/msw/rt/utilsrt.cpp
src/common/taskbarcmn.cpp
src/msw/helpchm.cpp
src/msw/taskbar.cpp
src/msw/helpwin.cpp
src/msw/joystick.cpp
src/msw/aboutdlg.cpp
src/msw/notifmsg.cpp
src/msw/richtooltip.cpp
src/msw/sound.cpp
src/msw/ole/automtn.cpp
src/msw/rt/notifmsgrt.cpp
src/generic/activityindicator.cpp
src/msw/ole/uuid.cpp
</set>
<set var="MSW_LOWLEVEL_HDR" hints="files">
wx/msw/nonownedwnd.h
@@ -1924,18 +2059,12 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/msw/popupwin.h
wx/msw/uxtheme.h
wx/msw/htmlhelp.h
</set>
<set var="MSW_DESKTOP_LOWLEVEL_SRC" hints="files">
src/msw/helpchm.cpp
src/msw/helpwin.cpp
src/msw/ole/automtn.cpp
src/msw/ole/uuid.cpp
</set>
<set var="MSW_DESKTOP_LOWLEVEL_HDR" hints="files">
wx/msw/helpchm.h
wx/generic/activityindicator.h
wx/msw/helpwin.h
wx/msw/taskbar.h
wx/msw/helpchm.h
wx/msw/sound.h
wx/msw/joystick.h
</set>
<set var="MSW_SRC" hints="files">
@@ -1999,6 +2128,15 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/msw/treectrl.cpp
src/msw/systhemectrl.cpp
src/msw/customdraw.cpp
src/generic/animateg.cpp
src/msw/commandlinkbutton.cpp
src/msw/bmpcbox.cpp
src/msw/hyperlink.cpp
src/msw/calctrl.cpp
src/msw/datectrl.cpp
src/msw/datetimectrl.cpp
src/msw/timectrl.cpp
src/msw/datecontrols.cpp
</set>
<set var="MSW_HDR" hints="files">
wx/generic/clrpickerg.h
@@ -2098,6 +2236,14 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/msw/treectrl.h
wx/msw/window.h
wx/msw/rt/utils.h
wx/msw/hyperlink.h
wx/msw/bmpcbox.h
wx/generic/animate.h
wx/msw/commandlinkbutton.h
wx/msw/datetimectrl.h
wx/msw/timectrl.h
wx/msw/datectrl.h
wx/msw/calctrl.h
</set>
<set var="MSW_RSC" hints="files">
<!-- Resources must be installed together with headers: -->
@@ -2467,6 +2613,22 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/osx/cocoa/window.mm
src/osx/cocoa/settings.mm
src/osx/cocoa/overlay.mm
src/osx/cocoa/aboutdlg.mm
src/generic/animateg.cpp
src/osx/dataview_osx.cpp
src/osx/cocoa/notifmsg.mm
src/osx/cocoa/taskbar.mm
src/osx/datectrl_osx.cpp
src/osx/cocoa/datetimectrl.mm
src/osx/core/sound.cpp
src/osx/sound_osx.cpp
src/osx/datetimectrl_osx.cpp
src/osx/core/hidjoystick.cpp
src/osx/carbon/sound.cpp
src/osx/cocoa/dataview.mm
src/osx/timectrl_osx.cpp
src/common/taskbarcmn.cpp
src/osx/cocoa/activityindicator.mm
</set>
<set var="OSX_COCOA_HDR" hints="files">
wx/osx/cocoa/chkconf.h
@@ -2474,6 +2636,19 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/osx/cocoa/private.h
wx/generic/region.h
wx/osx/cocoa/stdpaths.h
wx/osx/sound.h
wx/generic/animate.h
wx/osx/dvrenderer.h
wx/osx/cocoa/dataview.h
wx/osx/dvrenderers.h
wx/osx/taskbarosx.h
wx/osx/activityindicator.h
wx/osx/joystick.h
wx/osx/dataview.h
wx/osx/datectrl.h
wx/osx/timectrl.h
wx/osx/datetimectrl.h
wx/osx/core/joystick.h
</set>
<!-- ====================================================================== -->
@@ -2502,6 +2677,9 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/osx/iphone/window.mm
src/osx/cocoa/stdpaths.mm
src/osx/iphone/settings.mm
src/osx/sound_osx.cpp
src/osx/core/sound.cpp
src/generic/animateg.cpp
</set>
<set var="OSX_IPHONE_HDR" hints="files">
@@ -2509,6 +2687,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/osx/iphone/evtloop.h
wx/osx/iphone/private.h
wx/generic/region.h
wx/generic/animate.h
wx/osx/sound.h
</set>
<!-- ====================================================================== -->
@@ -2527,12 +2707,35 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
<if cond="TOOLKIT=='MSW'">
src/msw/evtloop.cpp
</if>
<!--
Including src/generic/animateg.cpp hre unconditionally results in bakefile
errors when not fixing the value of TOOLKIT to MSW in msvc format, see #15327.
-->
<if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">
src/generic/animateg.cpp
</if>
<if cond="TOOLKIT=='MSW'">
src/generic/animateg.cpp
</if>
<if cond="TOOLKIT=='X11'">
src/generic/animateg.cpp
</if>
</set>
<set var="UNIV_PLATFORM_HDR" hints="files">
<if cond="TOOLKIT=='MSW'">
wx/msw/evtloop.h
</if>
<if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">
wx/generic/animate.h
</if>
<if cond="TOOLKIT=='MSW'">
wx/generic/animate.h
</if>
<if cond="TOOLKIT=='X11'">
wx/generic/animate.h
</if>
</set>
<set var="UNIV_SRC" hints="files">
$(UNIV_PLATFORM_SRC)
src/generic/accel.cpp
@@ -2649,320 +2852,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/generic/activityindicator.h
</set>
<!-- ====================================================================== -->
<!-- wxAdvanced -->
<!-- ====================================================================== -->
<set var="ADVANCED_CMN_SRC" hints="files">
src/common/animatecmn.cpp
src/common/bmpcboxcmn.cpp
src/common/calctrlcmn.cpp
src/common/datavcmn.cpp
src/common/gridcmn.cpp
src/common/hyperlnkcmn.cpp
src/common/odcombocmn.cpp
src/common/richtooltipcmn.cpp
src/generic/aboutdlgg.cpp
src/generic/bannerwindow.cpp
src/generic/bmpcboxg.cpp
src/generic/calctrlg.cpp
src/generic/commandlinkbuttong.cpp
src/generic/datavgen.cpp
src/generic/datectlg.cpp
src/generic/editlbox.cpp
src/generic/grid.cpp
src/generic/gridctrl.cpp
src/generic/grideditors.cpp
src/generic/gridsel.cpp
src/generic/helpext.cpp
src/generic/hyperlinkg.cpp
src/generic/laywin.cpp
src/generic/notifmsgg.cpp
src/generic/odcombo.cpp
src/generic/propdlg.cpp
src/generic/richtooltipg.cpp
src/generic/sashwin.cpp
src/generic/splash.cpp
src/generic/timectrlg.cpp
src/generic/tipdlg.cpp
src/generic/treelist.cpp
src/generic/wizard.cpp
src/common/addremovectrl.cpp
src/common/notifmsgcmn.cpp
</set>
<set var="ADVANCED_CMN_HDR" hints="files">
wx/aboutdlg.h
wx/animate.h
wx/bannerwindow.h
wx/bmpcbox.h
wx/calctrl.h
wx/commandlinkbutton.h
wx/dataview.h
wx/datectrl.h
wx/dateevt.h
wx/datetimectrl.h
wx/dcbuffer.h
wx/dvrenderers.h
wx/editlbox.h
wx/generic/aboutdlgg.h
wx/generic/bmpcbox.h
wx/generic/calctrlg.h
wx/generic/datectrl.h
wx/generic/dataview.h
wx/generic/dvrenderer.h
wx/generic/dvrenderers.h
wx/generic/grid.h
wx/generic/gridctrl.h
wx/generic/grideditors.h
wx/generic/gridsel.h
wx/generic/helpext.h
wx/generic/hyperlink.h
wx/generic/laywin.h
wx/generic/notifmsg.h
wx/generic/propdlg.h
wx/generic/sashwin.h
wx/generic/splash.h
wx/generic/timectrl.h
wx/generic/wizard.h
wx/grid.h
wx/hyperlink.h
wx/joystick.h
wx/laywin.h
wx/notifmsg.h
wx/odcombo.h
wx/propdlg.h
wx/richtooltip.h
wx/sashwin.h
wx/sound.h
wx/splash.h
wx/taskbar.h
wx/timectrl.h
wx/tipdlg.h
wx/treelist.h
wx/wizard.h
wx/addremovectrl.h
wx/activityindicator.h
</set>
<set var="ADVANCED_MSW_SRC" hints="files">
src/common/taskbarcmn.cpp
src/msw/aboutdlg.cpp
src/msw/notifmsg.cpp
src/msw/richtooltip.cpp
src/msw/sound.cpp
src/msw/taskbar.cpp
src/msw/rt/notifmsgrt.cpp
src/generic/activityindicator.cpp
</set>
<set var="ADVANCED_MSW_HDR" hints="files">
wx/msw/sound.h
wx/msw/taskbar.h
wx/generic/activityindicator.h
</set>
<!-- not used with wxUniv -->
<set var="ADVANCED_MSW_NATIVE_SRC" hints="files">
src/generic/animateg.cpp
src/msw/bmpcbox.cpp
src/msw/calctrl.cpp
src/msw/commandlinkbutton.cpp
src/msw/datecontrols.cpp
src/msw/datectrl.cpp
src/msw/datetimectrl.cpp
src/msw/hyperlink.cpp
src/msw/timectrl.cpp
</set>
<set var="ADVANCED_MSW_NATIVE_HDR" hints="files">
wx/generic/animate.h
wx/msw/bmpcbox.h
wx/msw/commandlinkbutton.h
wx/msw/calctrl.h
wx/msw/datectrl.h
wx/msw/datetimectrl.h
wx/msw/hyperlink.h
wx/msw/timectrl.h
</set>
<!-- not built on WindowsCE: -->
<set var="ADVANCED_MSW_DESKTOP_SRC" hints="files">
src/msw/joystick.cpp
</set>
<set var="ADVANCED_MSW_DESKTOP_HDR" hints="files">
wx/msw/joystick.h
</set>
<set var="ADVANCED_OSX_COCOA_SRC" hints="files">
src/common/taskbarcmn.cpp
src/generic/animateg.cpp
src/osx/datetimectrl_osx.cpp
src/osx/datectrl_osx.cpp
src/osx/sound_osx.cpp
src/osx/timectrl_osx.cpp
src/osx/carbon/sound.cpp
src/osx/core/sound.cpp
src/osx/cocoa/aboutdlg.mm
src/osx/dataview_osx.cpp
src/osx/cocoa/dataview.mm
src/osx/cocoa/datetimectrl.mm
src/osx/cocoa/taskbar.mm
src/osx/core/hidjoystick.cpp
src/osx/cocoa/activityindicator.mm
src/osx/cocoa/notifmsg.mm
</set>
<set var="ADVANCED_OSX_COCOA_HDR" hints="files">
wx/generic/animate.h
wx/osx/activityindicator.h
wx/osx/dataview.h
wx/osx/datectrl.h
wx/osx/datetimectrl.h
wx/osx/dvrenderer.h
wx/osx/dvrenderers.h
wx/osx/joystick.h
wx/osx/sound.h
wx/osx/taskbarosx.h
wx/osx/timectrl.h
wx/osx/core/joystick.h
wx/osx/cocoa/dataview.h
</set>
<set var="ADVANCED_OSX_IPHONE_SRC" hints="files">
src/generic/animateg.cpp
src/osx/sound_osx.cpp
src/osx/core/sound.cpp
</set>
<set var="ADVANCED_OSX_IPHONE_HDR" hints="files">
wx/generic/animate.h
wx/osx/sound.h
</set>
<set var="ADVANCED_COCOA_SRC" hints="files">
src/cocoa/taskbar.mm
src/common/taskbarcmn.cpp
src/generic/animateg.cpp
src/osx/core/hidjoystick.cpp
</set>
<set var="ADVANCED_COCOA_HDR" hints="files">
wx/cocoa/taskbar.h
wx/generic/animate.h
wx/osx/core/joystick.h
</set>
<set var="ADVANCED_UNIX_SRC" hints="files">
src/common/taskbarcmn.cpp
src/unix/joystick.cpp
src/unix/sound.cpp
src/unix/taskbarx11.cpp
</set>
<set var="ADVANCED_UNIX_HDR" hints="files">
wx/unix/joystick.h
wx/unix/sound.h
wx/unix/taskbarx11.h
</set>
<set var="ADVANCED_MOTIF_SRC" hints="files">
src/generic/animateg.cpp
src/generic/activityindicator.cpp
</set>
<set var="ADVANCED_MOTIF_HDR" hints="files">
wx/generic/animate.h
wx/generic/animateanimate.h
</set>
<set var="ADVANCED_GTK_WIN32_SRC" hints="files">
src/common/taskbarcmn.cpp
src/msw/joystick.cpp
src/msw/sound.cpp
</set>
<set var="ADVANCED_GTK_WIN32_HDR" hints="files">
wx/msw/joystick.h
wx/msw/sound.h
wx/msw/taskbar.h
</set>
<set var="ADVANCED_GTK_PLATFORM_SRC" hints="files">
<if cond="PLATFORM_UNIX=='1'">$(ADVANCED_UNIX_SRC)</if>
<if cond="PLATFORM_MACOSX=='1'">$(ADVANCED_UNIX_SRC)</if>
<if cond="PLATFORM_WIN32=='1'">$(ADVANCED_GTK_WIN32_SRC)</if>
</set>
<set var="ADVANCED_GTK_PLATFORM_HDR" hints="files">
<if cond="PLATFORM_UNIX=='1'">$(ADVANCED_UNIX_HDR)</if>
<if cond="PLATFORM_MACOSX=='1'">$(ADVANCED_UNIX_HDR)</if>
<if cond="PLATFORM_WIN32=='1'">$(ADVANCED_GTK_WIN32_HDR)</if>
</set>
<set var="ADVANCED_GTK_SRC" hints="files">
$(ADVANCED_GTK_PLATFORM_SRC)
src/gtk/notifmsg.cpp
src/gtk/taskbar.cpp
</set>
<set var="ADVANCED_GTK2_SRC" hints="files">
$(ADVANCED_GTK_SRC)
src/gtk/eggtrayicon.c
src/generic/activityindicator.cpp
</set>
<set var="ADVANCED_GTK_HDR" hints="files">
$(ADVANCED_GTK_PLATFORM_HDR)
wx/gtk/taskbar.h
wx/generic/activityindicator.h
</set>
<set var="ADVANCED_GTK2_HDR" hints="files">
$(ADVANCED_GTK_HDR)
</set>
<set var="ADVANCED_GTK_NATIVE_SRC" hints="files">
src/gtk/aboutdlg.cpp
src/gtk/animate.cpp
src/gtk/bmpcbox.cpp
src/gtk/calctrl.cpp
src/gtk/dataview.cpp
src/gtk/hyperlink.cpp
src/gtk/activityindicator.cpp
</set>
<set var="ADVANCED_GTK_NATIVE_HDR" hints="files">
wx/gtk/animate.h
wx/gtk/bmpcbox.h
wx/gtk/calctrl.h
wx/gtk/dataview.h
wx/gtk/dvrenderer.h
wx/gtk/dvrenderers.h
wx/gtk/hyperlink.h
wx/gtk/activityindicator.h
</set>
<set var="ADVANCED_GTK1_SRC" hints="files">
src/generic/animateg.cpp
src/gtk1/eggtrayicon.c
src/gtk1/taskbar.cpp
src/generic/activityindicator.cpp
</set>
<set var="ADVANCED_GTK1_HDR" hints="files">
wx/generic/animate.h
wx/generic/activityindicator.h
</set>
<set var="ADVANCED_UNIV_SRC" hints="files">
<!--
Including src/generic/animateg.cpp hre unconditionally results in bakefile
errors when not fixing the value of TOOLKIT to MSW in msvc format, see #15327.
-->
<if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">
src/generic/animateg.cpp
</if>
<if cond="TOOLKIT=='MSW'">
src/generic/animateg.cpp
</if>
<if cond="TOOLKIT=='X11'">
src/generic/animateg.cpp
</if>
</set>
<set var="ADVANCED_UNIV_HDR" hints="files">
wx/generic/animate.h
</set>
<!-- ====================================================================== -->
<!-- wxMedia -->
<!-- ====================================================================== -->
@@ -3645,7 +3534,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
<if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">$(GTK2_LOWLEVEL_SRC)</if>
<if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION==''">$(GTK1_LOWLEVEL_SRC)</if>
<if cond="TOOLKIT=='MOTIF'">$(MOTIF_LOWLEVEL_SRC)</if>
<if cond="TOOLKIT=='MSW'">$(MSW_LOWLEVEL_SRC) $(MSW_DESKTOP_LOWLEVEL_SRC)</if>
<if cond="TOOLKIT=='MSW'">$(MSW_LOWLEVEL_SRC)</if>
<if cond="TOOLKIT=='OSX_COCOA'">$(OSX_LOWLEVEL_SRC)</if>
<if cond="TOOLKIT=='OSX_IPHONE'">$(OSX_LOWLEVEL_SRC)</if>
<if cond="TOOLKIT=='X11'">$(X11_LOWLEVEL_SRC)</if>
@@ -3657,7 +3546,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
<if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">$(GTK_LOWLEVEL_HDR)</if>
<if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION==''">$(GTK1_LOWLEVEL_HDR)</if>
<if cond="TOOLKIT=='MOTIF'">$(MOTIF_LOWLEVEL_HDR)</if>
<if cond="TOOLKIT=='MSW'">$(MSW_LOWLEVEL_HDR) $(MSW_DESKTOP_LOWLEVEL_HDR)</if>
<if cond="TOOLKIT=='MSW'">$(MSW_LOWLEVEL_HDR)</if>
<if cond="TOOLKIT=='OSX_COCOA'">$(OSX_LOWLEVEL_HDR)</if>
<if cond="TOOLKIT=='OSX_IPHONE'">$(OSX_LOWLEVEL_HDR)</if>
<if cond="TOOLKIT=='X11'">$(X11_LOWLEVEL_HDR)</if>
@@ -3701,56 +3590,9 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
</if>
</set>
<!-- wxAdvanced files: -->
<set var="ADVANCED_PLATFORM_SRC" hints="files">
<if cond="TOOLKIT=='MSW'">$(ADVANCED_MSW_SRC) $(ADVANCED_MSW_DESKTOP_SRC)</if>
<if cond="TOOLKIT=='OSX_COCOA'">$(ADVANCED_OSX_COCOA_SRC)</if>
<if cond="TOOLKIT=='OSX_IPHONE'">$(ADVANCED_OSX_IPHONE_SRC)</if>
<if cond="TOOLKIT=='COCOA'">$(ADVANCED_COCOA_SRC)</if>
<if cond="TOOLKIT=='MOTIF'">$(ADVANCED_UNIX_SRC) $(ADVANCED_MOTIF_SRC)</if>
<if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='4'">$(ADVANCED_GTK_SRC)</if>
<if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='3'">$(ADVANCED_GTK_SRC)</if>
<if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">$(ADVANCED_GTK2_SRC)</if>
<if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION==''">$(ADVANCED_UNIX_SRC) $(ADVANCED_GTK1_SRC)</if>
<if cond="TOOLKIT=='X11'">$(ADVANCED_UNIX_SRC)</if>
<if cond="TOOLKIT=='QT'">$(ADVANCED_QT_SRC)</if>
</set>
<set var="ADVANCED_PLATFORM_HDR" hints="files">
<if cond="TOOLKIT=='MSW'">$(ADVANCED_MSW_HDR) $(ADVANCED_MSW_DESKTOP_HDR)</if>
<if cond="TOOLKIT=='OSX_COCOA'">$(ADVANCED_OSX_COCOA_HDR)</if>
<if cond="TOOLKIT=='OSX_IPHONE'">$(ADVANCED_OSX_IPHONE_HDR)</if>
<if cond="TOOLKIT=='COCOA'">$(ADVANCED_COCOA_HDR)</if>
<if cond="TOOLKIT=='MOTIF'">$(ADVANCED_UNIX_HDR) $(ADVANCED_MOTIF_HDR)</if>
<if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='4'">$(ADVANCED_GTK_HDR)</if>
<if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='3'">$(ADVANCED_GTK_HDR)</if>
<if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">$(ADVANCED_GTK2_HDR)</if>
<if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION==''">$(ADVANCED_UNIX_HDR) $(ADVANCED_GTK1_HDR)</if>
<if cond="TOOLKIT=='X11'">$(ADVANCED_UNIX_HDR)</if>
<if cond="TOOLKIT=='QT'">$(ADVANCED_QT_HDR)</if>
</set>
<!-- wxAdv files not used by wxUniv -->
<set var="ADVANCED_PLATFORM_NATIVE_SRC" hints="files">
<if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='4'">$(ADVANCED_GTK_NATIVE_SRC)</if>
<if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='3'">$(ADVANCED_GTK_NATIVE_SRC)</if>
<if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">$(ADVANCED_GTK_NATIVE_SRC)</if>
<if cond="TOOLKIT=='MSW'">$(ADVANCED_MSW_NATIVE_SRC)</if>
</set>
<set var="ADVANCED_PLATFORM_NATIVE_HDR" hints="files">
<if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='4'">$(ADVANCED_GTK_NATIVE_HDR)</if>
<if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='3'">$(ADVANCED_GTK_NATIVE_HDR)</if>
<if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">$(ADVANCED_GTK_NATIVE_HDR)</if>
<if cond="TOOLKIT=='MSW'">$(ADVANCED_MSW_NATIVE_HDR)</if>
</set>
<set var="ADVANCED_SRC" hints="files">
<if cond="WXUNIV=='0'">$(ADVANCED_CMN_SRC) $(ADVANCED_PLATFORM_SRC) $(ADVANCED_PLATFORM_NATIVE_SRC)</if>
<if cond="WXUNIV=='1'">$(ADVANCED_CMN_SRC) $(ADVANCED_PLATFORM_SRC) $(ADVANCED_UNIV_SRC)</if>
</set>
<set var="ADVANCED_HDR" hints="files">
<if cond="WXUNIV=='0'">$(ADVANCED_CMN_HDR) $(ADVANCED_PLATFORM_HDR) $(ADVANCED_PLATFORM_NATIVE_HDR)</if>
<if cond="WXUNIV=='1'">$(ADVANCED_CMN_HDR) $(ADVANCED_PLATFORM_HDR) $(ADVANCED_UNIV_HDR)</if>
</set>
<!-- wxAdvanced: empty, kept only for backwards compatibility -->
<set var="ADVANCED_SRC" hints="files"/>
<set var="ADVANCED_HDR" hints="files"/>
<!-- wxMedia files: -->
<set var="MEDIA_PLATFORM_SRC" hints="files">
@@ -3787,7 +3629,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
$(GUI_CMN_HDR)
$(LOWLEVEL_HDR)
$(GUI_CORE_HEADERS)
$(ADVANCED_HDR) $(MEDIA_HDR) $(HTML_HDR)
$(MEDIA_HDR) $(HTML_HDR)
$(OPENGL_HDR) $(QA_HDR) $(XRC_HDR) $(AUI_HDR) $(PROPGRID_HDR)
$(RIBBON_HDR) $(RICHTEXT_HDR) $(STC_HDR) $(WEBVIEW_HDR)
</if>

5
build/bakefiles/multilib.bkl
View File

@@ -266,7 +266,6 @@
<define>WXMAKINGDLL_XRC</define>
<sources>$(XRC_SRC)</sources>
<library>$(htmldll_library_link)</library>
<library>advdll</library>
<library>coredll</library>
<library>xmldll</library>
<library>basedll</library>
@@ -292,7 +291,6 @@
<define>WXUSINGDLL</define>
<define>WXMAKINGDLL_AUI</define>
<sources>$(AUI_SRC)</sources>
<library>advdll</library>
<library>coredll</library>
<library>basedll</library>
<msvc-headers>$(AUI_HDR)</msvc-headers>
@@ -317,7 +315,6 @@
<define>WXUSINGDLL</define>
<define>WXMAKINGDLL_RIBBON</define>
<sources>$(RIBBON_SRC)</sources>
<library>advdll</library>
<library>coredll</library>
<library>basedll</library>
<msvc-headers>$(RIBBON_HDR)</msvc-headers>
@@ -342,7 +339,6 @@
<define>WXUSINGDLL</define>
<define>WXMAKINGDLL_PROPGRID</define>
<sources>$(PROPGRID_SRC)</sources>
<library>advdll</library>
<library>coredll</library>
<library>basedll</library>
<msvc-headers>$(PROPGRID_HDR)</msvc-headers>
@@ -367,7 +363,6 @@
<define>WXUSINGDLL</define>
<define>WXMAKINGDLL_RICHTEXT</define>
<sources>$(RICHTEXT_SRC)</sources>
<library>advdll</library>
<library>$(htmldll_library_link)</library>
<library>xmldll</library>
<library>coredll</library>

1
build/bakefiles/wxpresets/presets/wx.bkl
View File

@@ -99,7 +99,6 @@
<wx-lib>xrc</wx-lib>
<wx-lib>html</wx-lib>
<wx-lib>media</wx-lib>
<wx-lib>adv</wx-lib>
<wx-lib>net</wx-lib>
<wx-lib>xml</wx-lib>
<wx-lib>core</wx-lib>

217
build/cmake/files.cmake
View File

@@ -251,6 +251,13 @@ set(QT_HDR
wx/qt/utils.h
wx/qt/window.h
wx/qt/private/winevent.h
wx/qt/dvrenderer.h
wx/qt/dvrenderers.h
wx/generic/animate.h
wx/qt/calctrl.h
wx/qt/taskbar.h
wx/qt/dataview.h
wx/generic/activityindicator.h
)
set(QT_SRC
@@ -341,6 +348,16 @@ set(QT_SRC
src/qt/uiaction.cpp
src/qt/utils.cpp
src/qt/window.cpp
src/qt/dvrenderers.cpp
src/qt/dvrenderer.cpp
src/generic/activityindicator.cpp
src/common/taskbarcmn.cpp
src/generic/animateg.cpp
src/unix/sound.cpp
src/qt/calctrl.cpp
src/unix/joystick.cpp
src/qt/dataview.cpp
src/qt/taskbar.cpp
)
set(ADVANCED_QT_HDR
@@ -858,6 +875,41 @@ set(GUI_CMN_SRC
src/generic/vlbox.cpp
src/generic/vscroll.cpp
src/xrc/xmlreshandler.cpp
src/common/bmpcboxcmn.cpp
src/generic/grideditors.cpp
src/generic/gridctrl.cpp
src/generic/grid.cpp
src/generic/hyperlinkg.cpp
src/common/calctrlcmn.cpp
src/generic/notifmsgg.cpp
src/generic/odcombo.cpp
src/generic/splash.cpp
src/common/gridcmn.cpp
src/common/addremovectrl.cpp
src/generic/tipdlg.cpp
src/generic/aboutdlgg.cpp
src/generic/gridsel.cpp
src/generic/sashwin.cpp
src/generic/helpext.cpp
src/generic/richtooltipg.cpp
src/generic/bmpcboxg.cpp
src/generic/timectrlg.cpp
src/common/notifmsgcmn.cpp
src/generic/commandlinkbuttong.cpp
src/generic/propdlg.cpp
src/generic/treelist.cpp
src/common/datavcmn.cpp
src/common/animatecmn.cpp
src/common/odcombocmn.cpp
src/common/hyperlnkcmn.cpp
src/common/richtooltipcmn.cpp
src/generic/datectlg.cpp
src/generic/bannerwindow.cpp
src/generic/laywin.cpp
src/generic/calctrlg.cpp
src/generic/wizard.cpp
src/generic/editlbox.cpp
src/generic/datavgen.cpp
)
set(GUI_CMN_HDR
@@ -1096,6 +1148,57 @@ set(GUI_CMN_HDR
wx/xpmdecod.h
wx/xpmhand.h
wx/xrc/xmlreshandler.h
wx/splash.h
wx/dateevt.h
wx/editlbox.h
wx/generic/hyperlink.h
wx/joystick.h
wx/dcbuffer.h
wx/timectrl.h
wx/hyperlink.h
wx/bmpcbox.h
wx/addremovectrl.h
wx/generic/gridctrl.h
wx/generic/notifmsg.h
wx/odcombo.h
wx/animate.h
wx/sashwin.h
wx/generic/propdlg.h
wx/tipdlg.h
wx/dataview.h
wx/generic/helpext.h
wx/grid.h
wx/generic/grid.h
wx/generic/grideditors.h
wx/wizard.h
wx/generic/dataview.h
wx/generic/wizard.h
wx/generic/dvrenderers.h
wx/generic/bmpcbox.h
wx/datetimectrl.h
wx/activityindicator.h
wx/bannerwindow.h
wx/dvrenderers.h
wx/generic/datectrl.h
wx/calctrl.h
wx/propdlg.h
wx/generic/dvrenderer.h
wx/generic/timectrl.h
wx/commandlinkbutton.h
wx/richtooltip.h
wx/sound.h
wx/generic/aboutdlgg.h
wx/taskbar.h
wx/treelist.h
wx/notifmsg.h
wx/datectrl.h
wx/laywin.h
wx/generic/gridsel.h
wx/aboutdlg.h
wx/generic/laywin.h
wx/generic/splash.h
wx/generic/calctrlg.h
wx/generic/sashwin.h
)
set(UNIX_SRC
@@ -1111,6 +1214,10 @@ set(XWIN_LOWLEVEL_SRC
src/unix/fontutil.cpp
src/unix/uiactionx11.cpp
src/unix/utilsx11.cpp
src/unix/sound.cpp
src/unix/joystick.cpp
src/unix/taskbarx11.cpp
src/common/taskbarcmn.cpp
)
set(XWIN_LOWLEVEL_HDR
@@ -1118,6 +1225,9 @@ set(XWIN_LOWLEVEL_HDR
wx/generic/imaglist.h
wx/unix/fontutil.h
wx/unix/utilsx11.h
wx/unix/taskbarx11.h
wx/unix/sound.h
wx/unix/joystick.h
)
set(GTK_WIN32_SRC
@@ -1134,6 +1244,9 @@ set(GTK_WIN32_SRC
src/msw/utilswin.cpp
src/unix/fontenum.cpp
src/unix/fontutil.cpp
src/msw/sound.cpp
src/msw/joystick.cpp
src/common/taskbarcmn.cpp
)
set(GTK_WIN32_HDR
@@ -1146,6 +1259,9 @@ set(GTK_WIN32_HDR
wx/msw/ole/uuid.h
wx/msw/dib.h
wx/unix/fontutil.h
wx/msw/sound.h
wx/msw/taskbar.h
wx/msw/joystick.h
)
set(GTK_LOWLEVEL_SRC
@@ -1279,12 +1395,23 @@ set(GTK_SRC
src/gtk/textentry.cpp
src/gtk/tglbtn.cpp
src/gtk/treeentry_gtk.c
src/gtk/taskbar.cpp
src/gtk/notifmsg.cpp
src/gtk/dataview.cpp
src/gtk/aboutdlg.cpp
src/gtk/calctrl.cpp
src/gtk/activityindicator.cpp
src/gtk/animate.cpp
src/gtk/bmpcbox.cpp
src/gtk/hyperlink.cpp
)
set(GTK2_SRC
${GTK_SRC}
# Generic implementations used by wxGPE:
src/generic/fontdlgg.cpp
src/generic/activityindicator.cpp
src/gtk/eggtrayicon.c
)
set(GTK_HDR
@@ -1338,6 +1465,16 @@ set(GTK_HDR
wx/gtk/textctrl.h
wx/gtk/textentry.h
wx/gtk/tglbtn.h
wx/generic/activityindicator.h
wx/gtk/dataview.h
wx/gtk/dvrenderers.h
wx/gtk/calctrl.h
wx/gtk/animate.h
wx/gtk/bmpcbox.h
wx/gtk/dvrenderer.h
wx/gtk/taskbar.h
wx/gtk/activityindicator.h
wx/gtk/hyperlink.h
)
set(GTK2_HDR
@@ -1457,6 +1594,10 @@ set(GTK1_SRC
src/gtk1/toolbar.cpp
src/gtk1/textctrl.cpp
src/gtk1/tglbtn.cpp
src/generic/animateg.cpp
src/gtk1/eggtrayicon.c
src/generic/activityindicator.cpp
src/gtk1/taskbar.cpp
)
set(GTK1_HDR
@@ -1505,6 +1646,8 @@ set(GTK1_HDR
wx/gtk1/textctrl.h
wx/gtk1/tglbtn.h
wx/gtk1/treectrl.h
wx/generic/activityindicator.h
wx/generic/animate.h
)
set(MOTIF_LOWLEVEL_SRC
@@ -1596,6 +1739,8 @@ set(MOTIF_SRC
src/generic/statline.cpp
src/generic/statusbr.cpp
src/generic/tabg.cpp
src/generic/animateg.cpp
src/generic/activityindicator.cpp
)
set(MOTIF_HDR
@@ -1667,6 +1812,8 @@ set(MOTIF_HDR
wx/motif/toolbar.h
wx/motif/toplevel.h
wx/motif/window.h
wx/generic/animateanimate.h
wx/generic/animate.h
)
set(X11_LOWLEVEL_SRC
@@ -1790,6 +1937,19 @@ set(MSW_LOWLEVEL_SRC
src/msw/utilswin.cpp
src/msw/uxtheme.cpp
src/msw/window.cpp
src/msw/joystick.cpp
src/msw/rt/notifmsgrt.cpp
src/msw/aboutdlg.cpp
src/msw/sound.cpp
src/msw/ole/uuid.cpp
src/msw/helpchm.cpp
src/common/taskbarcmn.cpp
src/msw/helpwin.cpp
src/msw/notifmsg.cpp
src/msw/ole/automtn.cpp
src/msw/taskbar.cpp
src/generic/activityindicator.cpp
src/msw/richtooltip.cpp
)
set(MSW_LOWLEVEL_HDR
@@ -1798,6 +1958,12 @@ set(MSW_LOWLEVEL_HDR
wx/msw/popupwin.h
wx/msw/uxtheme.h
wx/msw/htmlhelp.h
wx/msw/helpchm.h
wx/msw/sound.h
wx/generic/activityindicator.h
wx/msw/joystick.h
wx/msw/helpwin.h
wx/msw/taskbar.h
)
set(MSW_DESKTOP_LOWLEVEL_SRC
@@ -1873,6 +2039,15 @@ set(MSW_SRC
src/msw/textentry.cpp
src/msw/tglbtn.cpp
src/msw/treectrl.cpp
src/msw/bmpcbox.cpp
src/msw/datectrl.cpp
src/generic/animateg.cpp
src/msw/calctrl.cpp
src/msw/datecontrols.cpp
src/msw/timectrl.cpp
src/msw/commandlinkbutton.cpp
src/msw/datetimectrl.cpp
src/msw/hyperlink.cpp
)
set(MSW_HDR
@@ -1973,6 +2148,14 @@ set(MSW_HDR
wx/msw/toplevel.h
wx/msw/treectrl.h
wx/msw/window.h
wx/msw/calctrl.h
wx/msw/bmpcbox.h
wx/msw/datectrl.h
wx/msw/commandlinkbutton.h
wx/msw/hyperlink.h
wx/msw/datetimectrl.h
wx/msw/timectrl.h
wx/generic/animate.h
)
set(MSW_RSC
@@ -2326,6 +2509,22 @@ set(OSX_COCOA_SRC
src/osx/cocoa/toolbar.mm
src/osx/cocoa/tooltip.mm
src/osx/cocoa/window.mm
src/osx/core/hidjoystick.cpp
src/osx/sound_osx.cpp
src/osx/cocoa/datetimectrl.mm
src/osx/datetimectrl_osx.cpp
src/osx/cocoa/aboutdlg.mm
src/osx/timectrl_osx.cpp
src/osx/cocoa/activityindicator.mm
src/osx/cocoa/dataview.mm
src/osx/carbon/sound.cpp
src/osx/cocoa/taskbar.mm
src/generic/animateg.cpp
src/common/taskbarcmn.cpp
src/osx/dataview_osx.cpp
src/osx/cocoa/notifmsg.mm
src/osx/datectrl_osx.cpp
src/osx/core/sound.cpp
)
set(OSX_COCOA_HDR
@@ -2334,6 +2533,19 @@ set(OSX_COCOA_HDR
wx/osx/cocoa/private.h
wx/osx/cocoa/stdpaths.h
wx/generic/region.h
wx/osx/activityindicator.h
wx/osx/datectrl.h
wx/osx/sound.h
wx/osx/joystick.h
wx/osx/timectrl.h
wx/osx/dvrenderer.h
wx/osx/dataview.h
wx/osx/cocoa/dataview.h
wx/osx/datetimectrl.h
wx/osx/taskbarosx.h
wx/osx/dvrenderers.h
wx/generic/animate.h
wx/osx/core/joystick.h
)
set(OSX_IPHONE_SRC
@@ -2358,6 +2570,9 @@ set(OSX_IPHONE_SRC
src/osx/iphone/toolbar.mm
src/osx/iphone/utils.mm
src/osx/iphone/window.mm
src/osx/sound_osx.cpp
src/generic/animateg.cpp
src/osx/core/sound.cpp
)
set(OSX_IPHONE_HDR
@@ -2365,6 +2580,8 @@ set(OSX_IPHONE_HDR
wx/osx/iphone/evtloop.h
wx/osx/iphone/private.h
wx/generic/region.h
wx/generic/animate.h
wx/osx/sound.h
)
set(UNIV_THEMES_SRC

903
build/files
View File

File diff suppressed because it is too large Load Diff

2444
build/msw/makefile.bcc
View File

File diff suppressed because it is too large Load Diff

2424
build/msw/makefile.gcc
View File

File diff suppressed because it is too large Load Diff

2444
build/msw/makefile.vc
View File

File diff suppressed because it is too large Load Diff

116
build/msw/wx_adv.vcxproj
View File

@@ -446,10 +446,6 @@
</Bscmake>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\src\common\animatecmn.cpp" />
<ClCompile Include="..\..\src\common\bmpcboxcmn.cpp" />
<ClCompile Include="..\..\src\common\calctrlcmn.cpp" />
<ClCompile Include="..\..\src\common\datavcmn.cpp" />
<ClCompile Include="..\..\src\common\dummy.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">Create</PrecompiledHeader>
@@ -460,55 +456,6 @@
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
</ClCompile>
<ClCompile Include="..\..\src\common\gridcmn.cpp" />
<ClCompile Include="..\..\src\common\hyperlnkcmn.cpp" />
<ClCompile Include="..\..\src\common\notifmsgcmn.cpp" />
<ClCompile Include="..\..\src\common\odcombocmn.cpp" />
<ClCompile Include="..\..\src\common\richtooltipcmn.cpp" />
<ClCompile Include="..\..\src\common\taskbarcmn.cpp" />
<ClCompile Include="..\..\src\msw\aboutdlg.cpp" />
<ClCompile Include="..\..\src\msw\bmpcbox.cpp" />
<ClCompile Include="..\..\src\msw\calctrl.cpp" />
<ClCompile Include="..\..\src\msw\commandlinkbutton.cpp" />
<ClCompile Include="..\..\src\msw\datecontrols.cpp" />
<ClCompile Include="..\..\src\msw\datectrl.cpp" />
<ClCompile Include="..\..\src\msw\datetimectrl.cpp" />
<ClCompile Include="..\..\src\msw\hyperlink.cpp" />
<ClCompile Include="..\..\src\msw\joystick.cpp" />
<ClCompile Include="..\..\src\msw\notifmsg.cpp" />
<ClCompile Include="..\..\src\msw\richtooltip.cpp" />
<ClCompile Include="..\..\src\msw\sound.cpp" />
<ClCompile Include="..\..\src\msw\taskbar.cpp" />
<ClCompile Include="..\..\src\msw\timectrl.cpp" />
<ClCompile Include="..\..\src\generic\aboutdlgg.cpp" />
<ClCompile Include="..\..\src\generic\animateg.cpp" />
<ClCompile Include="..\..\src\generic\bannerwindow.cpp" />
<ClCompile Include="..\..\src\generic\bmpcboxg.cpp" />
<ClCompile Include="..\..\src\generic\calctrlg.cpp" />
<ClCompile Include="..\..\src\generic\commandlinkbuttong.cpp" />
<ClCompile Include="..\..\src\generic\datavgen.cpp" />
<ClCompile Include="..\..\src\generic\datectlg.cpp" />
<ClCompile Include="..\..\src\generic\editlbox.cpp" />
<ClCompile Include="..\..\src\generic\grid.cpp" />
<ClCompile Include="..\..\src\generic\gridctrl.cpp" />
<ClCompile Include="..\..\src\generic\grideditors.cpp" />
<ClCompile Include="..\..\src\generic\gridsel.cpp" />
<ClCompile Include="..\..\src\generic\helpext.cpp" />
<ClCompile Include="..\..\src\generic\hyperlinkg.cpp" />
<ClCompile Include="..\..\src\generic\laywin.cpp" />
<ClCompile Include="..\..\src\generic\notifmsgg.cpp" />
<ClCompile Include="..\..\src\generic\odcombo.cpp" />
<ClCompile Include="..\..\src\generic\propdlg.cpp" />
<ClCompile Include="..\..\src\generic\richtooltipg.cpp" />
<ClCompile Include="..\..\src\generic\sashwin.cpp" />
<ClCompile Include="..\..\src\generic\splash.cpp" />
<ClCompile Include="..\..\src\generic\timectrlg.cpp" />
<ClCompile Include="..\..\src\generic\tipdlg.cpp" />
<ClCompile Include="..\..\src\generic\treelist.cpp" />
<ClCompile Include="..\..\src\generic\wizard.cpp" />
<ClCompile Include="..\..\src\common\addremovectrl.cpp" />
<ClCompile Include="..\..\src\generic\activityindicator.cpp" />
<ClCompile Include="..\..\src\msw\rt\notifmsgrt.cpp" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="..\..\src\msw\version.rc">
@@ -529,11 +476,6 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</CustomBuild>
<ClInclude Include="..\..\include\wx\msw\bmpcbox.h" />
<ClInclude Include="..\..\include\wx\msw\calctrl.h" />
<ClInclude Include="..\..\include\wx\msw\commandlinkbutton.h" />
<ClInclude Include="..\..\include\wx\msw\datectrl.h" />
<ClInclude Include="..\..\include\wx\msw\datetimectrl.h" />
<CustomBuild Include="..\..\include\wx\msw\genrcdefs.h">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">true</ExcludedFromBuild>
@@ -544,64 +486,6 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</CustomBuild>
<ClInclude Include="..\..\include\wx\msw\hyperlink.h" />
<ClInclude Include="..\..\include\wx\msw\joystick.h" />
<ClInclude Include="..\..\include\wx\msw\sound.h" />
<ClInclude Include="..\..\include\wx\msw\taskbar.h" />
<ClInclude Include="..\..\include\wx\msw\timectrl.h" />
<ClInclude Include="..\..\include\wx\generic\aboutdlgg.h" />
<ClInclude Include="..\..\include\wx\generic\animate.h" />
<ClInclude Include="..\..\include\wx\generic\bmpcbox.h" />
<ClInclude Include="..\..\include\wx\generic\calctrlg.h" />
<ClInclude Include="..\..\include\wx\generic\dataview.h" />
<ClInclude Include="..\..\include\wx\generic\datectrl.h" />
<ClInclude Include="..\..\include\wx\generic\dvrenderer.h" />
<ClInclude Include="..\..\include\wx\generic\dvrenderers.h" />
<ClInclude Include="..\..\include\wx\generic\grid.h" />
<ClInclude Include="..\..\include\wx\generic\gridctrl.h" />
<ClInclude Include="..\..\include\wx\generic\grideditors.h" />
<ClInclude Include="..\..\include\wx\generic\gridsel.h" />
<ClInclude Include="..\..\include\wx\generic\helpext.h" />
<ClInclude Include="..\..\include\wx\generic\hyperlink.h" />
<ClInclude Include="..\..\include\wx\generic\laywin.h" />
<ClInclude Include="..\..\include\wx\generic\notifmsg.h" />
<ClInclude Include="..\..\include\wx\generic\propdlg.h" />
<ClInclude Include="..\..\include\wx\generic\sashwin.h" />
<ClInclude Include="..\..\include\wx\generic\splash.h" />
<ClInclude Include="..\..\include\wx\generic\timectrl.h" />
<ClInclude Include="..\..\include\wx\generic\wizard.h" />
<ClInclude Include="..\..\include\wx\aboutdlg.h" />
<ClInclude Include="..\..\include\wx\animate.h" />
<ClInclude Include="..\..\include\wx\bannerwindow.h" />
<ClInclude Include="..\..\include\wx\bmpcbox.h" />
<ClInclude Include="..\..\include\wx\calctrl.h" />
<ClInclude Include="..\..\include\wx\commandlinkbutton.h" />
<ClInclude Include="..\..\include\wx\dataview.h" />
<ClInclude Include="..\..\include\wx\datectrl.h" />
<ClInclude Include="..\..\include\wx\dateevt.h" />
<ClInclude Include="..\..\include\wx\datetimectrl.h" />
<ClInclude Include="..\..\include\wx\dcbuffer.h" />
<ClInclude Include="..\..\include\wx\dvrenderers.h" />
<ClInclude Include="..\..\include\wx\editlbox.h" />
<ClInclude Include="..\..\include\wx\grid.h" />
<ClInclude Include="..\..\include\wx\hyperlink.h" />
<ClInclude Include="..\..\include\wx\joystick.h" />
<ClInclude Include="..\..\include\wx\laywin.h" />
<ClInclude Include="..\..\include\wx\notifmsg.h" />
<ClInclude Include="..\..\include\wx\odcombo.h" />
<ClInclude Include="..\..\include\wx\propdlg.h" />
<ClInclude Include="..\..\include\wx\richtooltip.h" />
<ClInclude Include="..\..\include\wx\sashwin.h" />
<ClInclude Include="..\..\include\wx\sound.h" />
<ClInclude Include="..\..\include\wx\splash.h" />
<ClInclude Include="..\..\include\wx\taskbar.h" />
<ClInclude Include="..\..\include\wx\timectrl.h" />
<ClInclude Include="..\..\include\wx\tipdlg.h" />
<ClInclude Include="..\..\include\wx\treelist.h" />
<ClInclude Include="..\..\include\wx\wizard.h" />
<ClInclude Include="..\..\include\wx\addremovectrl.h" />
<ClInclude Include="..\..\include\wx\activityindicator.h" />
<ClInclude Include="..\..\include\wx\generic\activityindicator.h" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">

348
build/msw/wx_adv.vcxproj.filters
View File

@@ -24,168 +24,9 @@
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\src\common\addremovectrl.cpp">
<Filter>Common Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\common\animatecmn.cpp">
<Filter>Common Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\common\bmpcboxcmn.cpp">
<Filter>Common Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\common\calctrlcmn.cpp">
<Filter>Common Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\common\datavcmn.cpp">
<Filter>Common Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\common\dummy.cpp">
<Filter>Common Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\common\gridcmn.cpp">
<Filter>Common Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\common\hyperlnkcmn.cpp">
<Filter>Common Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\common\notifmsgcmn.cpp">
<Filter>Common Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\common\odcombocmn.cpp">
<Filter>Common Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\common\richtooltipcmn.cpp">
<Filter>Common Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\common\taskbarcmn.cpp">
<Filter>Common Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\generic\aboutdlgg.cpp">
<Filter>Generic Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\generic\activityindicator.cpp">
<Filter>Generic Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\generic\animateg.cpp">
<Filter>Generic Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\generic\bannerwindow.cpp">
<Filter>Generic Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\generic\bmpcboxg.cpp">
<Filter>Generic Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\generic\calctrlg.cpp">
<Filter>Generic Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\generic\commandlinkbuttong.cpp">
<Filter>Generic Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\generic\datavgen.cpp">
<Filter>Generic Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\generic\datectlg.cpp">
<Filter>Generic Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\generic\editlbox.cpp">
<Filter>Generic Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\generic\grid.cpp">
<Filter>Generic Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\generic\gridctrl.cpp">
<Filter>Generic Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\generic\grideditors.cpp">
<Filter>Generic Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\generic\gridsel.cpp">
<Filter>Generic Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\generic\helpext.cpp">
<Filter>Generic Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\generic\hyperlinkg.cpp">
<Filter>Generic Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\generic\laywin.cpp">
<Filter>Generic Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\generic\notifmsgg.cpp">
<Filter>Generic Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\generic\odcombo.cpp">
<Filter>Generic Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\generic\propdlg.cpp">
<Filter>Generic Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\generic\richtooltipg.cpp">
<Filter>Generic Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\generic\sashwin.cpp">
<Filter>Generic Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\generic\splash.cpp">
<Filter>Generic Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\generic\timectrlg.cpp">
<Filter>Generic Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\generic\tipdlg.cpp">
<Filter>Generic Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\generic\treelist.cpp">
<Filter>Generic Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\generic\wizard.cpp">
<Filter>Generic Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\msw\aboutdlg.cpp">
<Filter>MSW Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\msw\bmpcbox.cpp">
<Filter>MSW Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\msw\calctrl.cpp">
<Filter>MSW Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\msw\commandlinkbutton.cpp">
<Filter>MSW Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\msw\datecontrols.cpp">
<Filter>MSW Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\msw\datectrl.cpp">
<Filter>MSW Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\msw\datetimectrl.cpp">
<Filter>MSW Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\msw\hyperlink.cpp">
<Filter>MSW Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\msw\joystick.cpp">
<Filter>MSW Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\msw\notifmsg.cpp">
<Filter>MSW Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\msw\richtooltip.cpp">
<Filter>MSW Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\msw\rt\notifmsgrt.cpp">
<Filter>MSW Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\msw\sound.cpp">
<Filter>MSW Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\msw\taskbar.cpp">
<Filter>MSW Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\msw\timectrl.cpp">
<Filter>MSW Sources</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="..\..\src\msw\version.rc">
@@ -193,195 +34,6 @@
</ResourceCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\include\wx\aboutdlg.h">
<Filter>Common Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\activityindicator.h">
<Filter>Common Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\addremovectrl.h">
<Filter>Common Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\animate.h">
<Filter>Common Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\bannerwindow.h">
<Filter>Common Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\bmpcbox.h">
<Filter>Common Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\calctrl.h">
<Filter>Common Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\commandlinkbutton.h">
<Filter>Common Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\dataview.h">
<Filter>Common Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\datectrl.h">
<Filter>Common Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\dateevt.h">
<Filter>Common Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\datetimectrl.h">
<Filter>Common Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\dcbuffer.h">
<Filter>Common Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\dvrenderers.h">
<Filter>Common Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\editlbox.h">
<Filter>Common Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\generic\aboutdlgg.h">
<Filter>Generic Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\generic\activityindicator.h">
<Filter>Generic Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\generic\animate.h">
<Filter>Generic Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\generic\bmpcbox.h">
<Filter>Generic Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\generic\calctrlg.h">
<Filter>Generic Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\generic\dataview.h">
<Filter>Generic Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\generic\datectrl.h">
<Filter>Generic Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\generic\dvrenderer.h">
<Filter>Generic Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\generic\dvrenderers.h">
<Filter>Generic Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\generic\grid.h">
<Filter>Generic Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\generic\gridctrl.h">
<Filter>Generic Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\generic\grideditors.h">
<Filter>Generic Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\generic\gridsel.h">
<Filter>Generic Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\generic\helpext.h">
<Filter>Generic Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\generic\hyperlink.h">
<Filter>Generic Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\generic\laywin.h">
<Filter>Generic Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\generic\notifmsg.h">
<Filter>Generic Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\generic\propdlg.h">
<Filter>Generic Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\generic\sashwin.h">
<Filter>Generic Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\generic\splash.h">
<Filter>Generic Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\generic\timectrl.h">
<Filter>Generic Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\generic\wizard.h">
<Filter>Generic Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\grid.h">
<Filter>Common Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\hyperlink.h">
<Filter>Common Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\joystick.h">
<Filter>Common Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\laywin.h">
<Filter>Common Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\msw\bmpcbox.h">
<Filter>MSW Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\msw\calctrl.h">
<Filter>MSW Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\msw\commandlinkbutton.h">
<Filter>MSW Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\msw\datectrl.h">
<Filter>MSW Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\msw\datetimectrl.h">
<Filter>MSW Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\msw\hyperlink.h">
<Filter>MSW Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\msw\joystick.h">
<Filter>MSW Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\msw\sound.h">
<Filter>MSW Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\msw\taskbar.h">
<Filter>MSW Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\msw\timectrl.h">
<Filter>MSW Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\notifmsg.h">
<Filter>Common Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\odcombo.h">
<Filter>Common Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\propdlg.h">
<Filter>Common Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\richtooltip.h">
<Filter>Common Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\sashwin.h">
<Filter>Common Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\sound.h">
<Filter>Common Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\splash.h">
<Filter>Common Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\taskbar.h">
<Filter>Common Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\timectrl.h">
<Filter>Common Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\tipdlg.h">
<Filter>Common Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\treelist.h">
<Filter>Common Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\wizard.h">
<Filter>Common Headers</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<CustomBuild Include="..\..\include\wx\msw\setup.h">

116
build/msw/wx_core.vcxproj
View File

@@ -1008,6 +1008,59 @@
<ClCompile Include="..\..\src\generic\collheaderctrlg.cpp" />
<ClCompile Include="..\..\src\msw\rt\utilsrt.cpp" />
<ClCompile Include="..\..\src\msw\customdraw.cpp" />
<ClCompile Include="..\..\src\msw\calctrl.cpp" />
<ClCompile Include="..\..\src\msw\commandlinkbutton.cpp" />
<ClCompile Include="..\..\src\msw\datecontrols.cpp" />
<ClCompile Include="..\..\src\msw\bmpcbox.cpp" />
<ClCompile Include="..\..\src\msw\rt\notifmsgrt.cpp" />
<ClCompile Include="..\..\src\msw\datectrl.cpp" />
<ClCompile Include="..\..\src\msw\aboutdlg.cpp" />
<ClCompile Include="..\..\src\msw\notifmsg.cpp" />
<ClCompile Include="..\..\src\msw\hyperlink.cpp" />
<ClCompile Include="..\..\src\generic\activityindicator.cpp" />
<ClCompile Include="..\..\src\msw\joystick.cpp" />
<ClCompile Include="..\..\src\common\taskbarcmn.cpp" />
<ClCompile Include="..\..\src\msw\richtooltip.cpp" />
<ClCompile Include="..\..\src\msw\datetimectrl.cpp" />
<ClCompile Include="..\..\src\generic\animateg.cpp" />
<ClCompile Include="..\..\src\msw\taskbar.cpp" />
<ClCompile Include="..\..\src\msw\sound.cpp" />
<ClCompile Include="..\..\src\msw\timectrl.cpp" />
<ClCompile Include="..\..\src\generic\aboutdlgg.cpp" />
<ClCompile Include="..\..\src\generic\grid.cpp" />
<ClCompile Include="..\..\src\common\richtooltipcmn.cpp" />
<ClCompile Include="..\..\src\generic\calctrlg.cpp" />
<ClCompile Include="..\..\src\common\gridcmn.cpp" />
<ClCompile Include="..\..\src\generic\treelist.cpp" />
<ClCompile Include="..\..\src\common\notifmsgcmn.cpp" />
<ClCompile Include="..\..\src\generic\editlbox.cpp" />
<ClCompile Include="..\..\src\generic\bannerwindow.cpp" />
<ClCompile Include="..\..\src\common\datavcmn.cpp" />
<ClCompile Include="..\..\src\generic\gridsel.cpp" />
<ClCompile Include="..\..\src\generic\gridctrl.cpp" />
<ClCompile Include="..\..\src\common\odcombocmn.cpp" />
<ClCompile Include="..\..\src\generic\richtooltipg.cpp" />
<ClCompile Include="..\..\src\generic\propdlg.cpp" />
<ClCompile Include="..\..\src\generic\sashwin.cpp" />
<ClCompile Include="..\..\src\generic\commandlinkbuttong.cpp" />
<ClCompile Include="..\..\src\generic\odcombo.cpp" />
<ClCompile Include="..\..\src\common\calctrlcmn.cpp" />
<ClCompile Include="..\..\src\generic\datectlg.cpp" />
<ClCompile Include="..\..\src\generic\laywin.cpp" />
<ClCompile Include="..\..\src\generic\timectrlg.cpp" />
<ClCompile Include="..\..\src\generic\splash.cpp" />
<ClCompile Include="..\..\src\generic\grideditors.cpp" />
<ClCompile Include="..\..\src\common\animatecmn.cpp" />
<ClCompile Include="..\..\src\generic\tipdlg.cpp" />
<ClCompile Include="..\..\src\common\addremovectrl.cpp" />
<ClCompile Include="..\..\src\generic\datavgen.cpp" />
<ClCompile Include="..\..\src\generic\helpext.cpp" />
<ClCompile Include="..\..\src\generic\wizard.cpp" />
<ClCompile Include="..\..\src\generic\bmpcboxg.cpp" />
<ClCompile Include="..\..\src\common\hyperlnkcmn.cpp" />
<ClCompile Include="..\..\src\generic\hyperlinkg.cpp" />
<ClCompile Include="..\..\src\generic\notifmsgg.cpp" />
<ClCompile Include="..\..\src\common\bmpcboxcmn.cpp" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="..\..\src\msw\version.rc">
@@ -1382,6 +1435,69 @@
<ClInclude Include="..\..\include\wx\itemattr.h" />
<ClInclude Include="..\..\include\wx\peninfobase.h" />
<ClInclude Include="..\..\include\wx\persist\dataview.h" />
<ClInclude Include="..\..\include\wx\generic\activityindicator.h" />
<ClInclude Include="..\..\include\wx\msw\taskbar.h" />
<ClInclude Include="..\..\include\wx\msw\commandlinkbutton.h" />
<ClInclude Include="..\..\include\wx\msw\bmpcbox.h" />
<ClInclude Include="..\..\include\wx\msw\hyperlink.h" />
<ClInclude Include="..\..\include\wx\msw\sound.h" />
<ClInclude Include="..\..\include\wx\msw\timectrl.h" />
<ClInclude Include="..\..\include\wx\msw\datectrl.h" />
<ClInclude Include="..\..\include\wx\msw\calctrl.h" />
<ClInclude Include="..\..\include\wx\msw\datetimectrl.h" />
<ClInclude Include="..\..\include\wx\msw\joystick.h" />
<ClInclude Include="..\..\include\wx\generic\animate.h" />
<ClInclude Include="..\..\include\wx\sashwin.h" />
<ClInclude Include="..\..\include\wx\grid.h" />
<ClInclude Include="..\..\include\wx\commandlinkbutton.h" />
<ClInclude Include="..\..\include\wx\taskbar.h" />
<ClInclude Include="..\..\include\wx\sound.h" />
<ClInclude Include="..\..\include\wx\generic\sashwin.h" />
<ClInclude Include="..\..\include\wx\wizard.h" />
<ClInclude Include="..\..\include\wx\generic\helpext.h" />
<ClInclude Include="..\..\include\wx\timectrl.h" />
<ClInclude Include="..\..\include\wx\generic\calctrlg.h" />
<ClInclude Include="..\..\include\wx\datectrl.h" />
<ClInclude Include="..\..\include\wx\bannerwindow.h" />
<ClInclude Include="..\..\include\wx\splash.h" />
<ClInclude Include="..\..\include\wx\treelist.h" />
<ClInclude Include="..\..\include\wx\generic\gridctrl.h" />
<ClInclude Include="..\..\include\wx\editlbox.h" />
<ClInclude Include="..\..\include\wx\generic\laywin.h" />
<ClInclude Include="..\..\include\wx\dateevt.h" />
<ClInclude Include="..\..\include\wx\generic\grid.h" />
<ClInclude Include="..\..\include\wx\aboutdlg.h" />
<ClInclude Include="..\..\include\wx\datetimectrl.h" />
<ClInclude Include="..\..\include\wx\bmpcbox.h" />
<ClInclude Include="..\..\include\wx\generic\dvrenderers.h" />
<ClInclude Include="..\..\include\wx\generic\wizard.h" />
<ClInclude Include="..\..\include\wx\animate.h" />
<ClInclude Include="..\..\include\wx\generic\hyperlink.h" />
<ClInclude Include="..\..\include\wx\hyperlink.h" />
<ClInclude Include="..\..\include\wx\generic\aboutdlgg.h" />
<ClInclude Include="..\..\include\wx\generic\dvrenderer.h" />
<ClInclude Include="..\..\include\wx\generic\grideditors.h" />
<ClInclude Include="..\..\include\wx\generic\timectrl.h" />
<ClInclude Include="..\..\include\wx\generic\notifmsg.h" />
<ClInclude Include="..\..\include\wx\generic\datectrl.h" />
<ClInclude Include="..\..\include\wx\propdlg.h" />
<ClInclude Include="..\..\include\wx\notifmsg.h" />
<ClInclude Include="..\..\include\wx\laywin.h" />
<ClInclude Include="..\..\include\wx\calctrl.h" />
<ClInclude Include="..\..\include\wx\tipdlg.h" />
<ClInclude Include="..\..\include\wx\joystick.h" />
<ClInclude Include="..\..\include\wx\generic\dataview.h" />
<ClInclude Include="..\..\include\wx\dvrenderers.h" />
<ClInclude Include="..\..\include\wx\generic\bmpcbox.h" />
<ClInclude Include="..\..\include\wx\addremovectrl.h" />
<ClInclude Include="..\..\include\wx\generic\splash.h" />
<ClInclude Include="..\..\include\wx\generic\propdlg.h" />
<ClInclude Include="..\..\include\wx\odcombo.h" />
<ClInclude Include="..\..\include\wx\dataview.h" />
<ClInclude Include="..\..\include\wx\activityindicator.h" />
<ClInclude Include="..\..\include\wx\richtooltip.h" />
<ClInclude Include="..\..\include\wx\generic\gridsel.h" />
<ClInclude Include="..\..\include\wx\dcbuffer.h" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">

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

@@ -33,12 +33,18 @@
<ClCompile Include="..\..\src\common\accesscmn.cpp">
<Filter>Common Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\common\addremovectrl.cpp">
<Filter>Common Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\common\affinematrix2d.cpp">
<Filter>Common Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\common\anidecod.cpp">
<Filter>Common Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\common\animatecmn.cpp">
<Filter>Common Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\common\appcmn.cpp">
<Filter>Common Sources</Filter>
</ClCompile>
@@ -57,6 +63,9 @@
<ClCompile Include="..\..\src\common\bmpbtncmn.cpp">
<Filter>Common Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\common\bmpcboxcmn.cpp">
<Filter>Common Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\common\bookctrl.cpp">
<Filter>Common Sources</Filter>
</ClCompile>
@@ -66,6 +75,9 @@
<ClCompile Include="..\..\src\common\cairo.cpp">
<Filter>Common Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\common\calctrlcmn.cpp">
<Filter>Common Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\common\checkboxcmn.cpp">
<Filter>Common Sources</Filter>
</ClCompile>
@@ -108,6 +120,9 @@
<ClCompile Include="..\..\src\common\ctrlsub.cpp">
<Filter>Common Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\common\datavcmn.cpp">
<Filter>Common Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\common\dcbase.cpp">
<Filter>Common Sources</Filter>
</ClCompile>
@@ -210,6 +225,9 @@
<ClCompile Include="..\..\src\common\graphcmn.cpp">
<Filter>Common Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\common\gridcmn.cpp">
<Filter>Common Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\common\headercolcmn.cpp">
<Filter>Common Sources</Filter>
</ClCompile>
@@ -219,6 +237,9 @@
<ClCompile Include="..\..\src\common\helpbase.cpp">
<Filter>Common Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\common\hyperlnkcmn.cpp">
<Filter>Common Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\common\iconbndl.cpp">
<Filter>Common Sources</Filter>
</ClCompile>
@@ -291,6 +312,12 @@
<ClCompile Include="..\..\src\common\nbkbase.cpp">
<Filter>Common Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\common\notifmsgcmn.cpp">
<Filter>Common Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\common\odcombocmn.cpp">
<Filter>Common Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\common\overlaycmn.cpp">
<Filter>Common Sources</Filter>
</ClCompile>
@@ -336,6 +363,9 @@
<ClCompile Include="..\..\src\common\rgncmn.cpp">
<Filter>Common Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\common\richtooltipcmn.cpp">
<Filter>Common Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\common\scrolbarcmn.cpp">
<Filter>Common Sources</Filter>
</ClCompile>
@@ -375,6 +405,9 @@
<ClCompile Include="..\..\src\common\stockitem.cpp">
<Filter>Common Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\common\taskbarcmn.cpp">
<Filter>Common Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\common\tbarbase.cpp">
<Filter>Common Sources</Filter>
</ClCompile>
@@ -423,12 +456,30 @@
<ClCompile Include="..\..\src\common\xpmdecod.cpp">
<Filter>Common Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\generic\aboutdlgg.cpp">
<Filter>Generic Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\generic\activityindicator.cpp">
<Filter>Generic Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\generic\animateg.cpp">
<Filter>Generic Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\generic\bannerwindow.cpp">
<Filter>Generic Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\generic\bmpcboxg.cpp">
<Filter>Generic Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\generic\busyinfo.cpp">
<Filter>Generic Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\generic\buttonbar.cpp">
<Filter>Generic Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\generic\calctrlg.cpp">
<Filter>Generic Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\generic\choicbkg.cpp">
<Filter>Generic Sources</Filter>
</ClCompile>
@@ -447,6 +498,15 @@
<ClCompile Include="..\..\src\generic\combog.cpp">
<Filter>Generic Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\generic\commandlinkbuttong.cpp">
<Filter>Generic Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\generic\datavgen.cpp">
<Filter>Generic Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\generic\datectlg.cpp">
<Filter>Generic Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\generic\dcpsg.cpp">
<Filter>Generic Sources</Filter>
</ClCompile>
@@ -456,6 +516,9 @@
<ClCompile Include="..\..\src\generic\dragimgg.cpp">
<Filter>Generic Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\generic\editlbox.cpp">
<Filter>Generic Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\generic\filectrlg.cpp">
<Filter>Generic Sources</Filter>
</ClCompile>
@@ -468,12 +531,33 @@
<ClCompile Include="..\..\src\generic\graphicc.cpp">
<Filter>Generic Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\generic\grid.cpp">
<Filter>Generic Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\generic\gridctrl.cpp">
<Filter>Generic Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\generic\grideditors.cpp">
<Filter>Generic Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\generic\gridsel.cpp">
<Filter>Generic Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\generic\headerctrlg.cpp">
<Filter>Generic Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\generic\helpext.cpp">
<Filter>Generic Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\generic\hyperlinkg.cpp">
<Filter>Generic Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\generic\infobar.cpp">
<Filter>Generic Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\generic\laywin.cpp">
<Filter>Generic Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\generic\listbkg.cpp">
<Filter>Generic Sources</Filter>
</ClCompile>
@@ -486,9 +570,15 @@
<ClCompile Include="..\..\src\generic\msgdlgg.cpp">
<Filter>Generic Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\generic\notifmsgg.cpp">
<Filter>Generic Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\generic\numdlgg.cpp">
<Filter>Generic Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\generic\odcombo.cpp">
<Filter>Generic Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\generic\preferencesg.cpp">
<Filter>Generic Sources</Filter>
</ClCompile>
@@ -501,12 +591,21 @@
<ClCompile Include="..\..\src\generic\progdlgg.cpp">
<Filter>Generic Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\generic\propdlg.cpp">
<Filter>Generic Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\generic\renderg.cpp">
<Filter>Generic Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\generic\richmsgdlgg.cpp">
<Filter>Generic Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\generic\richtooltipg.cpp">
<Filter>Generic Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\generic\sashwin.cpp">
<Filter>Generic Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\generic\scrlwing.cpp">
<Filter>Generic Sources</Filter>
</ClCompile>
@@ -516,6 +615,9 @@
<ClCompile Include="..\..\src\generic\spinctlg.cpp">
<Filter>Generic Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\generic\splash.cpp">
<Filter>Generic Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\generic\splitter.cpp">
<Filter>Generic Sources</Filter>
</ClCompile>
@@ -534,6 +636,12 @@
<ClCompile Include="..\..\src\generic\textdlgg.cpp">
<Filter>Generic Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\generic\timectrlg.cpp">
<Filter>Generic Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\generic\tipdlg.cpp">
<Filter>Generic Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\generic\tipwin.cpp">
<Filter>Generic Sources</Filter>
</ClCompile>
@@ -546,12 +654,21 @@
<ClCompile Include="..\..\src\generic\treectlg.cpp">
<Filter>Generic Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\generic\treelist.cpp">
<Filter>Generic Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\generic\vlbox.cpp">
<Filter>Generic Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\generic\vscroll.cpp">
<Filter>Generic Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\generic\wizard.cpp">
<Filter>Generic Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\msw\aboutdlg.cpp">
<Filter>MSW Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\msw\accel.cpp">
<Filter>MSW Sources</Filter>
</ClCompile>
@@ -573,12 +690,18 @@
<ClCompile Include="..\..\src\msw\bmpbuttn.cpp">
<Filter>MSW Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\msw\bmpcbox.cpp">
<Filter>MSW Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\msw\brush.cpp">
<Filter>MSW Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\msw\button.cpp">
<Filter>MSW Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\msw\calctrl.cpp">
<Filter>MSW Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\msw\caret.cpp">
<Filter>MSW Sources</Filter>
</ClCompile>
@@ -606,6 +729,9 @@
<ClCompile Include="..\..\src\msw\combobox.cpp">
<Filter>MSW Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\msw\commandlinkbutton.cpp">
<Filter>MSW Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\msw\control.cpp">
<Filter>MSW Sources</Filter>
</ClCompile>
@@ -618,6 +744,15 @@
<ClCompile Include="..\..\src\msw\data.cpp">
<Filter>MSW Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\msw\datecontrols.cpp">
<Filter>MSW Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\msw\datectrl.cpp">
<Filter>MSW Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\msw\datetimectrl.cpp">
<Filter>MSW Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\msw\dc.cpp">
<Filter>MSW Sources</Filter>
</ClCompile>
@@ -705,6 +840,9 @@
<ClCompile Include="..\..\src\msw\helpwin.cpp">
<Filter>MSW Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\msw\hyperlink.cpp">
<Filter>MSW Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\msw\icon.cpp">
<Filter>MSW Sources</Filter>
</ClCompile>
@@ -714,6 +852,9 @@
<ClCompile Include="..\..\src\msw\iniconf.cpp">
<Filter>MSW Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\msw\joystick.cpp">
<Filter>MSW Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\msw\listbox.cpp">
<Filter>MSW Sources</Filter>
</ClCompile>
@@ -753,6 +894,9 @@
<ClCompile Include="..\..\src\msw\notebook.cpp">
<Filter>MSW Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\msw\notifmsg.cpp">
<Filter>MSW Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\msw\ole\access.cpp">
<Filter>MSW Sources</Filter>
</ClCompile>
@@ -819,6 +963,12 @@
<ClCompile Include="..\..\src\msw\richmsgdlg.cpp">
<Filter>MSW Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\msw\richtooltip.cpp">
<Filter>MSW Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\msw\rt\notifmsgrt.cpp">
<Filter>MSW Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\msw\rt\utilsrt.cpp">
<Filter>MSW Sources</Filter>
</ClCompile>
@@ -831,6 +981,9 @@
<ClCompile Include="..\..\src\msw\slider.cpp">
<Filter>MSW Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\msw\sound.cpp">
<Filter>MSW Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\msw\spinbutt.cpp">
<Filter>MSW Sources</Filter>
</ClCompile>
@@ -855,6 +1008,9 @@
<ClCompile Include="..\..\src\msw\systhemectrl.cpp">
<Filter>MSW Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\msw\taskbar.cpp">
<Filter>MSW Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\msw\taskbarbutton.cpp">
<Filter>MSW Sources</Filter>
</ClCompile>
@@ -870,6 +1026,9 @@
<ClCompile Include="..\..\src\msw\tglbtn.cpp">
<Filter>MSW Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\msw\timectrl.cpp">
<Filter>MSW Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\msw\toolbar.cpp">
<Filter>MSW Sources</Filter>
</ClCompile>
@@ -910,12 +1069,21 @@
</ResourceCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\include\wx\aboutdlg.h">
<Filter>Common Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\accel.h">
<Filter>Common Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\access.h">
<Filter>Common Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\activityindicator.h">
<Filter>Common Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\addremovectrl.h">
<Filter>Common Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\affinematrix2d.h">
<Filter>Common Headers</Filter>
</ClInclude>
@@ -925,6 +1093,9 @@
<ClInclude Include="..\..\include\wx\anidecod.h">
<Filter>Common Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\animate.h">
<Filter>Common Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\animdecod.h">
<Filter>Common Headers</Filter>
</ClInclude>
@@ -937,12 +1108,18 @@
<ClInclude Include="..\..\include\wx\artprov.h">
<Filter>Common Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\bannerwindow.h">
<Filter>Common Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\bitmap.h">
<Filter>Common Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\bmpbuttn.h">
<Filter>Common Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\bmpcbox.h">
<Filter>Common Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\bookctrl.h">
<Filter>Common Headers</Filter>
</ClInclude>
@@ -955,6 +1132,9 @@
<ClInclude Include="..\..\include\wx\button.h">
<Filter>Common Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\calctrl.h">
<Filter>Common Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\caret.h">
<Filter>Common Headers</Filter>
</ClInclude>
@@ -1006,6 +1186,9 @@
<ClInclude Include="..\..\include\wx\combobox.h">
<Filter>Common Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\commandlinkbutton.h">
<Filter>Common Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\compositewin.h">
<Filter>Common Headers</Filter>
</ClInclude>
@@ -1027,9 +1210,24 @@
<ClInclude Include="..\..\include\wx\dataobj.h">
<Filter>Common Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\dataview.h">
<Filter>Common Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\datectrl.h">
<Filter>Common Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\dateevt.h">
<Filter>Common Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\datetimectrl.h">
<Filter>Common Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\dc.h">
<Filter>Common Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\dcbuffer.h">
<Filter>Common Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\dcclient.h">
<Filter>Common Headers</Filter>
</ClInclude>
@@ -1084,6 +1282,12 @@
<ClInclude Include="..\..\include\wx\dragimag.h">
<Filter>Common Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\dvrenderers.h">
<Filter>Common Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\editlbox.h">
<Filter>Common Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\effects.h">
<Filter>Common Headers</Filter>
</ClInclude>
@@ -1141,15 +1345,30 @@
<ClInclude Include="..\..\include\wx\gdiobj.h">
<Filter>Common Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\generic\aboutdlgg.h">
<Filter>Generic Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\generic\accel.h">
<Filter>Generic Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\generic\activityindicator.h">
<Filter>Generic Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\generic\animate.h">
<Filter>Generic Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\generic\bmpcbox.h">
<Filter>Generic Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\generic\busyinfo.h">
<Filter>Generic Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\generic\buttonbar.h">
<Filter>Generic Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\generic\calctrlg.h">
<Filter>Generic Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\generic\choicdgg.h">
<Filter>Generic Headers</Filter>
</ClInclude>
@@ -1168,6 +1387,12 @@
<ClInclude Include="..\..\include\wx\generic\custombgwin.h">
<Filter>Generic Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\generic\dataview.h">
<Filter>Generic Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\generic\datectrl.h">
<Filter>Generic Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\generic\dcpsg.h">
<Filter>Generic Headers</Filter>
</ClInclude>
@@ -1177,6 +1402,12 @@
<ClInclude Include="..\..\include\wx\generic\dragimgg.h">
<Filter>Generic Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\generic\dvrenderer.h">
<Filter>Generic Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\generic\dvrenderers.h">
<Filter>Generic Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\generic\filectrlg.h">
<Filter>Generic Headers</Filter>
</ClInclude>
@@ -1186,12 +1417,33 @@
<ClInclude Include="..\..\include\wx\generic\fontpickerg.h">
<Filter>Generic Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\generic\grid.h">
<Filter>Generic Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\generic\gridctrl.h">
<Filter>Generic Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\generic\grideditors.h">
<Filter>Generic Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\generic\gridsel.h">
<Filter>Generic Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\generic\headerctrlg.h">
<Filter>Generic Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\generic\helpext.h">
<Filter>Generic Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\generic\hyperlink.h">
<Filter>Generic Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\generic\infobar.h">
<Filter>Generic Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\generic\laywin.h">
<Filter>Generic Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\generic\logg.h">
<Filter>Generic Headers</Filter>
</ClInclude>
@@ -1201,6 +1453,9 @@
<ClInclude Include="..\..\include\wx\generic\notebook.h">
<Filter>Generic Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\generic\notifmsg.h">
<Filter>Generic Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\generic\numdlgg.h">
<Filter>Generic Headers</Filter>
</ClInclude>
@@ -1216,15 +1471,24 @@
<ClInclude Include="..\..\include\wx\generic\progdlgg.h">
<Filter>Generic Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\generic\propdlg.h">
<Filter>Generic Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\generic\richmsgdlgg.h">
<Filter>Generic Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\generic\sashwin.h">
<Filter>Generic Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\generic\scrolwin.h">
<Filter>Generic Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\generic\spinctlg.h">
<Filter>Generic Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\generic\splash.h">
<Filter>Generic Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\generic\splitter.h">
<Filter>Generic Headers</Filter>
</ClInclude>
@@ -1240,9 +1504,15 @@
<ClInclude Include="..\..\include\wx\generic\textdlgg.h">
<Filter>Generic Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\generic\timectrl.h">
<Filter>Generic Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\generic\treectlg.h">
<Filter>Generic Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\generic\wizard.h">
<Filter>Generic Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\geometry.h">
<Filter>Common Headers</Filter>
</ClInclude>
@@ -1252,6 +1522,9 @@
<ClInclude Include="..\..\include\wx\graphics.h">
<Filter>Common Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\grid.h">
<Filter>Common Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\headercol.h">
<Filter>Common Headers</Filter>
</ClInclude>
@@ -1270,6 +1543,9 @@
<ClInclude Include="..\..\include\wx\helpwin.h">
<Filter>Common Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\hyperlink.h">
<Filter>Common Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\icon.h">
<Filter>Common Headers</Filter>
</ClInclude>
@@ -1321,9 +1597,15 @@
<ClInclude Include="..\..\include\wx\itemid.h">
<Filter>Common Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\joystick.h">
<Filter>Common Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\layout.h">
<Filter>Common Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\laywin.h">
<Filter>Common Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\listbase.h">
<Filter>Common Headers</Filter>
</ClInclude>
@@ -1381,12 +1663,18 @@
<ClInclude Include="..\..\include\wx\msw\bmpbuttn.h">
<Filter>MSW Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\msw\bmpcbox.h">
<Filter>MSW Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\msw\brush.h">
<Filter>MSW Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\msw\button.h">
<Filter>MSW Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\msw\calctrl.h">
<Filter>MSW Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\msw\caret.h">
<Filter>MSW Headers</Filter>
</ClInclude>
@@ -1414,6 +1702,9 @@
<ClInclude Include="..\..\include\wx\msw\combobox.h">
<Filter>MSW Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\msw\commandlinkbutton.h">
<Filter>MSW Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\msw\control.h">
<Filter>MSW Headers</Filter>
</ClInclude>
@@ -1426,6 +1717,12 @@
<ClInclude Include="..\..\include\wx\msw\custombgwin.h">
<Filter>MSW Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\msw\datectrl.h">
<Filter>MSW Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\msw\datetimectrl.h">
<Filter>MSW Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\msw\dc.h">
<Filter>MSW Headers</Filter>
</ClInclude>
@@ -1492,6 +1789,9 @@
<ClInclude Include="..\..\include\wx\msw\htmlhelp.h">
<Filter>MSW Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\msw\hyperlink.h">
<Filter>MSW Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\msw\icon.h">
<Filter>MSW Headers</Filter>
</ClInclude>
@@ -1504,6 +1804,9 @@
<ClInclude Include="..\..\include\wx\msw\init.h">
<Filter>MSW Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\msw\joystick.h">
<Filter>MSW Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\msw\listbox.h">
<Filter>MSW Headers</Filter>
</ClInclude>
@@ -1627,6 +1930,9 @@
<ClInclude Include="..\..\include\wx\msw\slider.h">
<Filter>MSW Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\msw\sound.h">
<Filter>MSW Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\msw\spinbutt.h">
<Filter>MSW Headers</Filter>
</ClInclude>
@@ -1648,6 +1954,9 @@
<ClInclude Include="..\..\include\wx\msw\statusbar.h">
<Filter>MSW Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\msw\taskbar.h">
<Filter>MSW Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\msw\taskbarbutton.h">
<Filter>MSW Headers</Filter>
</ClInclude>
@@ -1660,6 +1969,9 @@
<ClInclude Include="..\..\include\wx\msw\tglbtn.h">
<Filter>MSW Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\msw\timectrl.h">
<Filter>MSW Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\msw\toolbar.h">
<Filter>MSW Headers</Filter>
</ClInclude>
@@ -1687,9 +1999,15 @@
<ClInclude Include="..\..\include\wx\notebook.h">
<Filter>Common Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\notifmsg.h">
<Filter>Common Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\numdlg.h">
<Filter>Common Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\odcombo.h">
<Filter>Common Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\overlay.h">
<Filter>Common Headers</Filter>
</ClInclude>
@@ -1756,6 +2074,9 @@
<ClInclude Include="..\..\include\wx\progdlg.h">
<Filter>Common Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\propdlg.h">
<Filter>Common Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\quantize.h">
<Filter>Common Headers</Filter>
</ClInclude>
@@ -1783,6 +2104,12 @@
<ClInclude Include="..\..\include\wx\richmsgdlg.h">
<Filter>Common Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\richtooltip.h">
<Filter>Common Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\sashwin.h">
<Filter>Common Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\scopeguard.h">
<Filter>Common Headers</Filter>
</ClInclude>
@@ -1807,12 +2134,18 @@
<ClInclude Include="..\..\include\wx\slider.h">
<Filter>Common Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\sound.h">
<Filter>Common Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\spinbutt.h">
<Filter>Common Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\spinctrl.h">
<Filter>Common Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\splash.h">
<Filter>Common Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\splitter.h">
<Filter>Common Headers</Filter>
</ClInclude>
@@ -1837,6 +2170,9 @@
<ClInclude Include="..\..\include\wx\systhemectrl.h">
<Filter>Common Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\taskbar.h">
<Filter>Common Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\taskbarbutton.h">
<Filter>Common Headers</Filter>
</ClInclude>
@@ -1864,6 +2200,12 @@
<ClInclude Include="..\..\include\wx\tglbtn.h">
<Filter>Common Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\timectrl.h">
<Filter>Common Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\tipdlg.h">
<Filter>Common Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\tipwin.h">
<Filter>Common Headers</Filter>
</ClInclude>
@@ -1888,6 +2230,9 @@
<ClInclude Include="..\..\include\wx\treectrl.h">
<Filter>Common Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\treelist.h">
<Filter>Common Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\uiaction.h">
<Filter>Common Headers</Filter>
</ClInclude>
@@ -1927,6 +2272,9 @@
<ClInclude Include="..\..\include\wx\withimages.h">
<Filter>Common Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\wizard.h">
<Filter>Common Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\wrapsizer.h">
<Filter>Common Headers</Filter>
</ClInclude>

360
build/msw/wx_vc7_adv.vcproj
View File

@@ -276,21 +276,6 @@
<Filter
Name="Common Sources"
UniqueIdentifier="{A6A5C30D-BDB6-5050-906D-10A96065136C}">
<File
RelativePath="..\..\src\common\addremovectrl.cpp">
</File>
<File
RelativePath="..\..\src\common\animatecmn.cpp">
</File>
<File
RelativePath="..\..\src\common\bmpcboxcmn.cpp">
</File>
<File
RelativePath="..\..\src\common\calctrlcmn.cpp">
</File>
<File
RelativePath="..\..\src\common\datavcmn.cpp">
</File>
<File
RelativePath="..\..\src\common\dummy.cpp">
<FileConfiguration
@@ -318,73 +303,10 @@
UsePrecompiledHeader="1"/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\src\common\gridcmn.cpp">
</File>
<File
RelativePath="..\..\src\common\hyperlnkcmn.cpp">
</File>
<File
RelativePath="..\..\src\common\notifmsgcmn.cpp">
</File>
<File
RelativePath="..\..\src\common\odcombocmn.cpp">
</File>
<File
RelativePath="..\..\src\common\richtooltipcmn.cpp">
</File>
<File
RelativePath="..\..\src\common\taskbarcmn.cpp">
</File>
</Filter>
<Filter
Name="MSW Sources"
UniqueIdentifier="{D030D8C2-53EE-5B96-8F89-D78157B06140}">
<File
RelativePath="..\..\src\msw\aboutdlg.cpp">
</File>
<File
RelativePath="..\..\src\msw\bmpcbox.cpp">
</File>
<File
RelativePath="..\..\src\msw\calctrl.cpp">
</File>
<File
RelativePath="..\..\src\msw\commandlinkbutton.cpp">
</File>
<File
RelativePath="..\..\src\msw\datecontrols.cpp">
</File>
<File
RelativePath="..\..\src\msw\datectrl.cpp">
</File>
<File
RelativePath="..\..\src\msw\datetimectrl.cpp">
</File>
<File
RelativePath="..\..\src\msw\hyperlink.cpp">
</File>
<File
RelativePath="..\..\src\msw\joystick.cpp">
</File>
<File
RelativePath="..\..\src\msw\notifmsg.cpp">
</File>
<File
RelativePath="..\..\src\msw\rt\notifmsgrt.cpp">
</File>
<File
RelativePath="..\..\src\msw\richtooltip.cpp">
</File>
<File
RelativePath="..\..\src\msw\sound.cpp">
</File>
<File
RelativePath="..\..\src\msw\taskbar.cpp">
</File>
<File
RelativePath="..\..\src\msw\timectrl.cpp">
</File>
<File
RelativePath="..\..\src\msw\version.rc">
<FileConfiguration
@@ -395,91 +317,6 @@
ExcludedFromBuild="TRUE"/>
</File>
</Filter>
<Filter
Name="Generic Sources"
UniqueIdentifier="{FEA0C02F-F300-53BA-B784-52A5086B8093}">
<File
RelativePath="..\..\src\generic\aboutdlgg.cpp">
</File>
<File
RelativePath="..\..\src\generic\activityindicator.cpp">
</File>
<File
RelativePath="..\..\src\generic\animateg.cpp">
</File>
<File
RelativePath="..\..\src\generic\bannerwindow.cpp">
</File>
<File
RelativePath="..\..\src\generic\bmpcboxg.cpp">
</File>
<File
RelativePath="..\..\src\generic\calctrlg.cpp">
</File>
<File
RelativePath="..\..\src\generic\commandlinkbuttong.cpp">
</File>
<File
RelativePath="..\..\src\generic\datavgen.cpp">
</File>
<File
RelativePath="..\..\src\generic\datectlg.cpp">
</File>
<File
RelativePath="..\..\src\generic\editlbox.cpp">
</File>
<File
RelativePath="..\..\src\generic\grid.cpp">
</File>
<File
RelativePath="..\..\src\generic\gridctrl.cpp">
</File>
<File
RelativePath="..\..\src\generic\grideditors.cpp">
</File>
<File
RelativePath="..\..\src\generic\gridsel.cpp">
</File>
<File
RelativePath="..\..\src\generic\helpext.cpp">
</File>
<File
RelativePath="..\..\src\generic\hyperlinkg.cpp">
</File>
<File
RelativePath="..\..\src\generic\laywin.cpp">
</File>
<File
RelativePath="..\..\src\generic\notifmsgg.cpp">
</File>
<File
RelativePath="..\..\src\generic\odcombo.cpp">
</File>
<File
RelativePath="..\..\src\generic\propdlg.cpp">
</File>
<File
RelativePath="..\..\src\generic\richtooltipg.cpp">
</File>
<File
RelativePath="..\..\src\generic\sashwin.cpp">
</File>
<File
RelativePath="..\..\src\generic\splash.cpp">
</File>
<File
RelativePath="..\..\src\generic\timectrlg.cpp">
</File>
<File
RelativePath="..\..\src\generic\tipdlg.cpp">
</File>
<File
RelativePath="..\..\src\generic\treelist.cpp">
</File>
<File
RelativePath="..\..\src\generic\wizard.cpp">
</File>
</Filter>
<Filter
Name="Setup Headers"
UniqueIdentifier="{63537534-1833-5C1F-8DBD-359A84F294C8}">
@@ -533,21 +370,6 @@
<Filter
Name="MSW Headers"
UniqueIdentifier="{5AFFF20E-29F9-512B-B80A-7DC45976CDAC}">
<File
RelativePath="..\..\include\wx\msw\bmpcbox.h">
</File>
<File
RelativePath="..\..\include\wx\msw\calctrl.h">
</File>
<File
RelativePath="..\..\include\wx\msw\commandlinkbutton.h">
</File>
<File
RelativePath="..\..\include\wx\msw\datectrl.h">
</File>
<File
RelativePath="..\..\include\wx\msw\datetimectrl.h">
</File>
<File
RelativePath="..\..\include\wx\msw\genrcdefs.h">
<FileConfiguration
@@ -587,188 +409,6 @@
AdditionalDependencies="&quot;..\..\lib\vc_dll\mswu\wx\msw&quot;"/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\include\wx\msw\hyperlink.h">
</File>
<File
RelativePath="..\..\include\wx\msw\joystick.h">
</File>
<File
RelativePath="..\..\include\wx\msw\sound.h">
</File>
<File
RelativePath="..\..\include\wx\msw\taskbar.h">
</File>
<File
RelativePath="..\..\include\wx\msw\timectrl.h">
</File>
</Filter>
<Filter
Name="Generic Headers"
UniqueIdentifier="{61C63C83-EF8C-51CA-A418-51936E7FCD4A}">
<File
RelativePath="..\..\include\wx\generic\aboutdlgg.h">
</File>
<File
RelativePath="..\..\include\wx\generic\activityindicator.h">
</File>
<File
RelativePath="..\..\include\wx\generic\animate.h">
</File>
<File
RelativePath="..\..\include\wx\generic\bmpcbox.h">
</File>
<File
RelativePath="..\..\include\wx\generic\calctrlg.h">
</File>
<File
RelativePath="..\..\include\wx\generic\dataview.h">
</File>
<File
RelativePath="..\..\include\wx\generic\datectrl.h">
</File>
<File
RelativePath="..\..\include\wx\generic\dvrenderer.h">
</File>
<File
RelativePath="..\..\include\wx\generic\dvrenderers.h">
</File>
<File
RelativePath="..\..\include\wx\generic\grid.h">
</File>
<File
RelativePath="..\..\include\wx\generic\gridctrl.h">
</File>
<File
RelativePath="..\..\include\wx\generic\grideditors.h">
</File>
<File
RelativePath="..\..\include\wx\generic\gridsel.h">
</File>
<File
RelativePath="..\..\include\wx\generic\helpext.h">
</File>
<File
RelativePath="..\..\include\wx\generic\hyperlink.h">
</File>
<File
RelativePath="..\..\include\wx\generic\laywin.h">
</File>
<File
RelativePath="..\..\include\wx\generic\notifmsg.h">
</File>
<File
RelativePath="..\..\include\wx\generic\propdlg.h">
</File>
<File
RelativePath="..\..\include\wx\generic\sashwin.h">
</File>
<File
RelativePath="..\..\include\wx\generic\splash.h">
</File>
<File
RelativePath="..\..\include\wx\generic\timectrl.h">
</File>
<File
RelativePath="..\..\include\wx\generic\wizard.h">
</File>
</Filter>
<Filter
Name="Common Headers"
UniqueIdentifier="{8C07E926-65B0-5F00-B0D6-7F40DA69BB25}">
<File
RelativePath="..\..\include\wx\aboutdlg.h">
</File>
<File
RelativePath="..\..\include\wx\activityindicator.h">
</File>
<File
RelativePath="..\..\include\wx\addremovectrl.h">
</File>
<File
RelativePath="..\..\include\wx\animate.h">
</File>
<File
RelativePath="..\..\include\wx\bannerwindow.h">
</File>
<File
RelativePath="..\..\include\wx\bmpcbox.h">
</File>
<File
RelativePath="..\..\include\wx\calctrl.h">
</File>
<File
RelativePath="..\..\include\wx\commandlinkbutton.h">
</File>
<File
RelativePath="..\..\include\wx\dataview.h">
</File>
<File
RelativePath="..\..\include\wx\datectrl.h">
</File>
<File
RelativePath="..\..\include\wx\dateevt.h">
</File>
<File
RelativePath="..\..\include\wx\datetimectrl.h">
</File>
<File
RelativePath="..\..\include\wx\dcbuffer.h">
</File>
<File
RelativePath="..\..\include\wx\dvrenderers.h">
</File>
<File
RelativePath="..\..\include\wx\editlbox.h">
</File>
<File
RelativePath="..\..\include\wx\grid.h">
</File>
<File
RelativePath="..\..\include\wx\hyperlink.h">
</File>
<File
RelativePath="..\..\include\wx\joystick.h">
</File>
<File
RelativePath="..\..\include\wx\laywin.h">
</File>
<File
RelativePath="..\..\include\wx\notifmsg.h">
</File>
<File
RelativePath="..\..\include\wx\odcombo.h">
</File>
<File
RelativePath="..\..\include\wx\propdlg.h">
</File>
<File
RelativePath="..\..\include\wx\richtooltip.h">
</File>
<File
RelativePath="..\..\include\wx\sashwin.h">
</File>
<File
RelativePath="..\..\include\wx\sound.h">
</File>
<File
RelativePath="..\..\include\wx\splash.h">
</File>
<File
RelativePath="..\..\include\wx\taskbar.h">
</File>
<File
RelativePath="..\..\include\wx\timectrl.h">
</File>
<File
RelativePath="..\..\include\wx\tipdlg.h">
</File>
<File
RelativePath="..\..\include\wx\treelist.h">
</File>
<File
RelativePath="..\..\include\wx\wizard.h">
</File>
</Filter>
</Files>
<Globals>

4
build/msw/wx_vc7_aui.vcproj
View File

@@ -166,7 +166,7 @@
<Tool
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_adv.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
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"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_aui.lib"
@@ -231,7 +231,7 @@
<Tool
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_adv.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
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"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_dll\wxmsw31u_aui.lib"

159
build/msw/wx_vc7_core.vcproj
View File

@@ -282,12 +282,18 @@
<File
RelativePath="..\..\src\common\accesscmn.cpp">
</File>
<File
RelativePath="..\..\src\common\addremovectrl.cpp">
</File>
<File
RelativePath="..\..\src\common\affinematrix2d.cpp">
</File>
<File
RelativePath="..\..\src\common\anidecod.cpp">
</File>
<File
RelativePath="..\..\src\common\animatecmn.cpp">
</File>
<File
RelativePath="..\..\src\common\appcmn.cpp">
</File>
@@ -306,6 +312,9 @@
<File
RelativePath="..\..\src\common\bmpbtncmn.cpp">
</File>
<File
RelativePath="..\..\src\common\bmpcboxcmn.cpp">
</File>
<File
RelativePath="..\..\src\common\bookctrl.cpp">
</File>
@@ -315,6 +324,9 @@
<File
RelativePath="..\..\src\common\cairo.cpp">
</File>
<File
RelativePath="..\..\src\common\calctrlcmn.cpp">
</File>
<File
RelativePath="..\..\src\common\checkboxcmn.cpp">
</File>
@@ -357,6 +369,9 @@
<File
RelativePath="..\..\src\common\ctrlsub.cpp">
</File>
<File
RelativePath="..\..\src\common\datavcmn.cpp">
</File>
<File
RelativePath="..\..\src\common\dcbase.cpp">
</File>
@@ -483,6 +498,9 @@
<File
RelativePath="..\..\src\common\graphcmn.cpp">
</File>
<File
RelativePath="..\..\src\common\gridcmn.cpp">
</File>
<File
RelativePath="..\..\src\common\headercolcmn.cpp">
</File>
@@ -492,6 +510,9 @@
<File
RelativePath="..\..\src\common\helpbase.cpp">
</File>
<File
RelativePath="..\..\src\common\hyperlnkcmn.cpp">
</File>
<File
RelativePath="..\..\src\common\iconbndl.cpp">
</File>
@@ -564,6 +585,12 @@
<File
RelativePath="..\..\src\common\nbkbase.cpp">
</File>
<File
RelativePath="..\..\src\common\notifmsgcmn.cpp">
</File>
<File
RelativePath="..\..\src\common\odcombocmn.cpp">
</File>
<File
RelativePath="..\..\src\common\overlaycmn.cpp">
</File>
@@ -609,6 +636,9 @@
<File
RelativePath="..\..\src\common\rgncmn.cpp">
</File>
<File
RelativePath="..\..\src\common\richtooltipcmn.cpp">
</File>
<File
RelativePath="..\..\src\common\scrolbarcmn.cpp">
</File>
@@ -648,6 +678,9 @@
<File
RelativePath="..\..\src\common\stockitem.cpp">
</File>
<File
RelativePath="..\..\src\common\taskbarcmn.cpp">
</File>
<File
RelativePath="..\..\src\common\tbarbase.cpp">
</File>
@@ -700,6 +733,9 @@
<Filter
Name="MSW Sources"
UniqueIdentifier="{D030D8C2-53EE-5B96-8F89-D78157B06140}">
<File
RelativePath="..\..\src\msw\aboutdlg.cpp">
</File>
<File
RelativePath="..\..\src\msw\accel.cpp">
</File>
@@ -730,12 +766,18 @@
<File
RelativePath="..\..\src\msw\bmpbuttn.cpp">
</File>
<File
RelativePath="..\..\src\msw\bmpcbox.cpp">
</File>
<File
RelativePath="..\..\src\msw\brush.cpp">
</File>
<File
RelativePath="..\..\src\msw\button.cpp">
</File>
<File
RelativePath="..\..\src\msw\calctrl.cpp">
</File>
<File
RelativePath="..\..\src\msw\caret.cpp">
</File>
@@ -766,6 +808,9 @@
<File
RelativePath="..\..\src\msw\ole\comimpl.cpp">
</File>
<File
RelativePath="..\..\src\msw\commandlinkbutton.cpp">
</File>
<File
RelativePath="..\..\src\msw\control.cpp">
</File>
@@ -781,6 +826,15 @@
<File
RelativePath="..\..\src\msw\ole\dataobj.cpp">
</File>
<File
RelativePath="..\..\src\msw\datecontrols.cpp">
</File>
<File
RelativePath="..\..\src\msw\datectrl.cpp">
</File>
<File
RelativePath="..\..\src\msw\datetimectrl.cpp">
</File>
<File
RelativePath="..\..\src\msw\dc.cpp">
</File>
@@ -874,6 +928,9 @@
<File
RelativePath="..\..\src\msw\helpwin.cpp">
</File>
<File
RelativePath="..\..\src\msw\hyperlink.cpp">
</File>
<File
RelativePath="..\..\src\msw\icon.cpp">
</File>
@@ -883,6 +940,9 @@
<File
RelativePath="..\..\src\msw\iniconf.cpp">
</File>
<File
RelativePath="..\..\src\msw\joystick.cpp">
</File>
<File
RelativePath="..\..\src\msw\listbox.cpp">
</File>
@@ -922,6 +982,12 @@
<File
RelativePath="..\..\src\msw\notebook.cpp">
</File>
<File
RelativePath="..\..\src\msw\notifmsg.cpp">
</File>
<File
RelativePath="..\..\src\msw\rt\notifmsgrt.cpp">
</File>
<File
RelativePath="..\..\src\msw\ole\oleutils.cpp">
</File>
@@ -961,6 +1027,9 @@
<File
RelativePath="..\..\src\msw\richmsgdlg.cpp">
</File>
<File
RelativePath="..\..\src\msw\richtooltip.cpp">
</File>
<File
RelativePath="..\..\src\msw\ole\safearray.cpp">
</File>
@@ -973,6 +1042,9 @@
<File
RelativePath="..\..\src\msw\slider.cpp">
</File>
<File
RelativePath="..\..\src\msw\sound.cpp">
</File>
<File
RelativePath="..\..\src\msw\spinbutt.cpp">
</File>
@@ -997,6 +1069,9 @@
<File
RelativePath="..\..\src\msw\systhemectrl.cpp">
</File>
<File
RelativePath="..\..\src\msw\taskbar.cpp">
</File>
<File
RelativePath="..\..\src\msw\taskbarbutton.cpp">
</File>
@@ -1012,6 +1087,9 @@
<File
RelativePath="..\..\src\msw\tglbtn.cpp">
</File>
<File
RelativePath="..\..\src\msw\timectrl.cpp">
</File>
<File
RelativePath="..\..\src\msw\toolbar.cpp">
</File>
@@ -1061,12 +1139,30 @@
<Filter
Name="Generic Sources"
UniqueIdentifier="{FEA0C02F-F300-53BA-B784-52A5086B8093}">
<File
RelativePath="..\..\src\generic\aboutdlgg.cpp">
</File>
<File
RelativePath="..\..\src\generic\activityindicator.cpp">
</File>
<File
RelativePath="..\..\src\generic\animateg.cpp">
</File>
<File
RelativePath="..\..\src\generic\bannerwindow.cpp">
</File>
<File
RelativePath="..\..\src\generic\bmpcboxg.cpp">
</File>
<File
RelativePath="..\..\src\generic\busyinfo.cpp">
</File>
<File
RelativePath="..\..\src\generic\buttonbar.cpp">
</File>
<File
RelativePath="..\..\src\generic\calctrlg.cpp">
</File>
<File
RelativePath="..\..\src\generic\choicbkg.cpp">
</File>
@@ -1085,6 +1181,15 @@
<File
RelativePath="..\..\src\generic\combog.cpp">
</File>
<File
RelativePath="..\..\src\generic\commandlinkbuttong.cpp">
</File>
<File
RelativePath="..\..\src\generic\datavgen.cpp">
</File>
<File
RelativePath="..\..\src\generic\datectlg.cpp">
</File>
<File
RelativePath="..\..\src\generic\dcpsg.cpp">
</File>
@@ -1094,6 +1199,9 @@
<File
RelativePath="..\..\src\generic\dragimgg.cpp">
</File>
<File
RelativePath="..\..\src\generic\editlbox.cpp">
</File>
<File
RelativePath="..\..\src\generic\filectrlg.cpp">
</File>
@@ -1106,12 +1214,33 @@
<File
RelativePath="..\..\src\generic\graphicc.cpp">
</File>
<File
RelativePath="..\..\src\generic\grid.cpp">
</File>
<File
RelativePath="..\..\src\generic\gridctrl.cpp">
</File>
<File
RelativePath="..\..\src\generic\grideditors.cpp">
</File>
<File
RelativePath="..\..\src\generic\gridsel.cpp">
</File>
<File
RelativePath="..\..\src\generic\headerctrlg.cpp">
</File>
<File
RelativePath="..\..\src\generic\helpext.cpp">
</File>
<File
RelativePath="..\..\src\generic\hyperlinkg.cpp">
</File>
<File
RelativePath="..\..\src\generic\infobar.cpp">
</File>
<File
RelativePath="..\..\src\generic\laywin.cpp">
</File>
<File
RelativePath="..\..\src\generic\listbkg.cpp">
</File>
@@ -1124,9 +1253,15 @@
<File
RelativePath="..\..\src\generic\msgdlgg.cpp">
</File>
<File
RelativePath="..\..\src\generic\notifmsgg.cpp">
</File>
<File
RelativePath="..\..\src\generic\numdlgg.cpp">
</File>
<File
RelativePath="..\..\src\generic\odcombo.cpp">
</File>
<File
RelativePath="..\..\src\generic\preferencesg.cpp">
</File>
@@ -1139,12 +1274,21 @@
<File
RelativePath="..\..\src\generic\progdlgg.cpp">
</File>
<File
RelativePath="..\..\src\generic\propdlg.cpp">
</File>
<File
RelativePath="..\..\src\generic\renderg.cpp">
</File>
<File
RelativePath="..\..\src\generic\richmsgdlgg.cpp">
</File>
<File
RelativePath="..\..\src\generic\richtooltipg.cpp">
</File>
<File
RelativePath="..\..\src\generic\sashwin.cpp">
</File>
<File
RelativePath="..\..\src\generic\scrlwing.cpp">
</File>
@@ -1154,6 +1298,9 @@
<File
RelativePath="..\..\src\generic\spinctlg.cpp">
</File>
<File
RelativePath="..\..\src\generic\splash.cpp">
</File>
<File
RelativePath="..\..\src\generic\splitter.cpp">
</File>
@@ -1172,6 +1319,12 @@
<File
RelativePath="..\..\src\generic\textdlgg.cpp">
</File>
<File
RelativePath="..\..\src\generic\timectrlg.cpp">
</File>
<File
RelativePath="..\..\src\generic\tipdlg.cpp">
</File>
<File
RelativePath="..\..\src\generic\tipwin.cpp">
</File>
@@ -1184,12 +1337,18 @@
<File
RelativePath="..\..\src\generic\treectlg.cpp">
</File>
<File
RelativePath="..\..\src\generic\treelist.cpp">
</File>
<File
RelativePath="..\..\src\generic\vlbox.cpp">
</File>
<File
RelativePath="..\..\src\generic\vscroll.cpp">
</File>
<File
RelativePath="..\..\src\generic\wizard.cpp">
</File>
</Filter>
<Filter
Name="Setup Headers"

4
build/msw/wx_vc7_propgrid.vcproj
View File

@@ -166,7 +166,7 @@
<Tool
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_adv.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
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"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_propgrid.lib"
@@ -231,7 +231,7 @@
<Tool
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_adv.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
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"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_dll\wxmsw31u_propgrid.lib"

4
build/msw/wx_vc7_ribbon.vcproj
View File

@@ -166,7 +166,7 @@
<Tool
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_adv.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
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"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_ribbon.lib"
@@ -231,7 +231,7 @@
<Tool
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_adv.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
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"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_dll\wxmsw31u_ribbon.lib"

4
build/msw/wx_vc7_richtext.vcproj
View File

@@ -166,7 +166,7 @@
<Tool
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_adv.lib ..\..\lib\vc_dll\wxmsw31ud_html.lib ..\..\lib\vc_dll\wxbase31ud_xml.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
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"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_richtext.lib"
@@ -231,7 +231,7 @@
<Tool
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_adv.lib ..\..\lib\vc_dll\wxmsw31u_html.lib ..\..\lib\vc_dll\wxbase31u_xml.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
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"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_dll\wxmsw31u_richtext.lib"

4
build/msw/wx_vc7_xrc.vcproj
View File

@@ -166,7 +166,7 @@
<Tool
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_adv.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud_xml.lib ..\..\lib\vc_dll\wxbase31ud.lib"
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"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_xrc.lib"
@@ -231,7 +231,7 @@
<Tool
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_adv.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u_xml.lib ..\..\lib\vc_dll\wxbase31u.lib"
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"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_dll\wxmsw31u_xrc.lib"

479
build/msw/wx_vc8_adv.vcproj
View File

@@ -741,26 +741,6 @@
Name="Common Sources"
UniqueIdentifier="{A6A5C30D-BDB6-5050-906D-10A96065136C}"
>
<File
RelativePath="..\..\src\common\addremovectrl.cpp"
>
</File>
<File
RelativePath="..\..\src\common\animatecmn.cpp"
>
</File>
<File
RelativePath="..\..\src\common\bmpcboxcmn.cpp"
>
</File>
<File
RelativePath="..\..\src\common\calctrlcmn.cpp"
>
</File>
<File
RelativePath="..\..\src\common\datavcmn.cpp"
>
</File>
<File
RelativePath="..\..\src\common\dummy.cpp"
>
@@ -829,95 +809,11 @@
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\src\common\gridcmn.cpp"
>
</File>
<File
RelativePath="..\..\src\common\hyperlnkcmn.cpp"
>
</File>
<File
RelativePath="..\..\src\common\notifmsgcmn.cpp"
>
</File>
<File
RelativePath="..\..\src\common\odcombocmn.cpp"
>
</File>
<File
RelativePath="..\..\src\common\richtooltipcmn.cpp"
>
</File>
<File
RelativePath="..\..\src\common\taskbarcmn.cpp"
>
</File>
</Filter>
<Filter
Name="MSW Sources"
UniqueIdentifier="{D030D8C2-53EE-5B96-8F89-D78157B06140}"
>
<File
RelativePath="..\..\src\msw\aboutdlg.cpp"
>
</File>
<File
RelativePath="..\..\src\msw\bmpcbox.cpp"
>
</File>
<File
RelativePath="..\..\src\msw\calctrl.cpp"
>
</File>
<File
RelativePath="..\..\src\msw\commandlinkbutton.cpp"
>
</File>
<File
RelativePath="..\..\src\msw\datecontrols.cpp"
>
</File>
<File
RelativePath="..\..\src\msw\datectrl.cpp"
>
</File>
<File
RelativePath="..\..\src\msw\datetimectrl.cpp"
>
</File>
<File
RelativePath="..\..\src\msw\hyperlink.cpp"
>
</File>
<File
RelativePath="..\..\src\msw\joystick.cpp"
>
</File>
<File
RelativePath="..\..\src\msw\notifmsg.cpp"
>
</File>
<File
RelativePath="..\..\src\msw\rt\notifmsgrt.cpp"
>
</File>
<File
RelativePath="..\..\src\msw\richtooltip.cpp"
>
</File>
<File
RelativePath="..\..\src\msw\sound.cpp"
>
</File>
<File
RelativePath="..\..\src\msw\taskbar.cpp"
>
</File>
<File
RelativePath="..\..\src\msw\timectrl.cpp"
>
</File>
<File
RelativePath="..\..\src\msw\version.rc"
>
@@ -939,119 +835,6 @@
/>
</File>
</Filter>
<Filter
Name="Generic Sources"
UniqueIdentifier="{FEA0C02F-F300-53BA-B784-52A5086B8093}"
>
<File
RelativePath="..\..\src\generic\aboutdlgg.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\activityindicator.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\animateg.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\bannerwindow.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\bmpcboxg.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\calctrlg.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\commandlinkbuttong.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\datavgen.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\datectlg.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\editlbox.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\grid.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\gridctrl.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\grideditors.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\gridsel.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\helpext.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\hyperlinkg.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\laywin.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\notifmsgg.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\odcombo.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\propdlg.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\richtooltipg.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\sashwin.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\splash.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\timectrlg.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\tipdlg.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\treelist.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\wizard.cpp"
>
</File>
</Filter>
<Filter
Name="Setup Headers"
UniqueIdentifier="{63537534-1833-5C1F-8DBD-359A84F294C8}"
@@ -1173,26 +956,6 @@
Name="MSW Headers"
UniqueIdentifier="{5AFFF20E-29F9-512B-B80A-7DC45976CDAC}"
>
<File
RelativePath="..\..\include\wx\msw\bmpcbox.h"
>
</File>
<File
RelativePath="..\..\include\wx\msw\calctrl.h"
>
</File>
<File
RelativePath="..\..\include\wx\msw\commandlinkbutton.h"
>
</File>
<File
RelativePath="..\..\include\wx\msw\datectrl.h"
>
</File>
<File
RelativePath="..\..\include\wx\msw\datetimectrl.h"
>
</File>
<File
RelativePath="..\..\include\wx\msw\genrcdefs.h"
>
@@ -1285,248 +1048,6 @@
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\include\wx\msw\hyperlink.h"
>
</File>
<File
RelativePath="..\..\include\wx\msw\joystick.h"
>
</File>
<File
RelativePath="..\..\include\wx\msw\sound.h"
>
</File>
<File
RelativePath="..\..\include\wx\msw\taskbar.h"
>
</File>
<File
RelativePath="..\..\include\wx\msw\timectrl.h"
>
</File>
</Filter>
<Filter
Name="Generic Headers"
UniqueIdentifier="{61C63C83-EF8C-51CA-A418-51936E7FCD4A}"
>
<File
RelativePath="..\..\include\wx\generic\aboutdlgg.h"
>
</File>
<File
RelativePath="..\..\include\wx\generic\activityindicator.h"
>
</File>
<File
RelativePath="..\..\include\wx\generic\animate.h"
>
</File>
<File
RelativePath="..\..\include\wx\generic\bmpcbox.h"
>
</File>
<File
RelativePath="..\..\include\wx\generic\calctrlg.h"
>
</File>
<File
RelativePath="..\..\include\wx\generic\dataview.h"
>
</File>
<File
RelativePath="..\..\include\wx\generic\datectrl.h"
>
</File>
<File
RelativePath="..\..\include\wx\generic\dvrenderer.h"
>
</File>
<File
RelativePath="..\..\include\wx\generic\dvrenderers.h"
>
</File>
<File
RelativePath="..\..\include\wx\generic\grid.h"
>
</File>
<File
RelativePath="..\..\include\wx\generic\gridctrl.h"
>
</File>
<File
RelativePath="..\..\include\wx\generic\grideditors.h"
>
</File>
<File
RelativePath="..\..\include\wx\generic\gridsel.h"
>
</File>
<File
RelativePath="..\..\include\wx\generic\helpext.h"
>
</File>
<File
RelativePath="..\..\include\wx\generic\hyperlink.h"
>
</File>
<File
RelativePath="..\..\include\wx\generic\laywin.h"
>
</File>
<File
RelativePath="..\..\include\wx\generic\notifmsg.h"
>
</File>
<File
RelativePath="..\..\include\wx\generic\propdlg.h"
>
</File>
<File
RelativePath="..\..\include\wx\generic\sashwin.h"
>
</File>
<File
RelativePath="..\..\include\wx\generic\splash.h"
>
</File>
<File
RelativePath="..\..\include\wx\generic\timectrl.h"
>
</File>
<File
RelativePath="..\..\include\wx\generic\wizard.h"
>
</File>
</Filter>
<Filter
Name="Common Headers"
UniqueIdentifier="{8C07E926-65B0-5F00-B0D6-7F40DA69BB25}"
>
<File
RelativePath="..\..\include\wx\aboutdlg.h"
>
</File>
<File
RelativePath="..\..\include\wx\activityindicator.h"
>
</File>
<File
RelativePath="..\..\include\wx\addremovectrl.h"
>
</File>
<File
RelativePath="..\..\include\wx\animate.h"
>
</File>
<File
RelativePath="..\..\include\wx\bannerwindow.h"
>
</File>
<File
RelativePath="..\..\include\wx\bmpcbox.h"
>
</File>
<File
RelativePath="..\..\include\wx\calctrl.h"
>
</File>
<File
RelativePath="..\..\include\wx\commandlinkbutton.h"
>
</File>
<File
RelativePath="..\..\include\wx\dataview.h"
>
</File>
<File
RelativePath="..\..\include\wx\datectrl.h"
>
</File>
<File
RelativePath="..\..\include\wx\dateevt.h"
>
</File>
<File
RelativePath="..\..\include\wx\datetimectrl.h"
>
</File>
<File
RelativePath="..\..\include\wx\dcbuffer.h"
>
</File>
<File
RelativePath="..\..\include\wx\dvrenderers.h"
>
</File>
<File
RelativePath="..\..\include\wx\editlbox.h"
>
</File>
<File
RelativePath="..\..\include\wx\grid.h"
>
</File>
<File
RelativePath="..\..\include\wx\hyperlink.h"
>
</File>
<File
RelativePath="..\..\include\wx\joystick.h"
>
</File>
<File
RelativePath="..\..\include\wx\laywin.h"
>
</File>
<File
RelativePath="..\..\include\wx\notifmsg.h"
>
</File>
<File
RelativePath="..\..\include\wx\odcombo.h"
>
</File>
<File
RelativePath="..\..\include\wx\propdlg.h"
>
</File>
<File
RelativePath="..\..\include\wx\richtooltip.h"
>
</File>
<File
RelativePath="..\..\include\wx\sashwin.h"
>
</File>
<File
RelativePath="..\..\include\wx\sound.h"
>
</File>
<File
RelativePath="..\..\include\wx\splash.h"
>
</File>
<File
RelativePath="..\..\include\wx\taskbar.h"
>
</File>
<File
RelativePath="..\..\include\wx\timectrl.h"
>
</File>
<File
RelativePath="..\..\include\wx\tipdlg.h"
>
</File>
<File
RelativePath="..\..\include\wx\treelist.h"
>
</File>
<File
RelativePath="..\..\include\wx\wizard.h"
>
</File>
</Filter>
</Files>
<Globals>

8
build/msw/wx_vc8_aui.vcproj
View File

@@ -253,7 +253,7 @@
<Tool
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_adv.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
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"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_aui.lib"
@@ -344,7 +344,7 @@
<Tool
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_adv.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
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"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_dll\wxmsw31u_aui.lib"
@@ -607,7 +607,7 @@
<Tool
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_adv.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib"
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"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31ud_aui.lib"
@@ -698,7 +698,7 @@
<Tool
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_adv.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u.lib"
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"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31u_aui.lib"

212
build/msw/wx_vc8_core.vcproj
View File

@@ -749,6 +749,10 @@
RelativePath="..\..\src\common\accesscmn.cpp"
>
</File>
<File
RelativePath="..\..\src\common\addremovectrl.cpp"
>
</File>
<File
RelativePath="..\..\src\common\affinematrix2d.cpp"
>
@@ -757,6 +761,10 @@
RelativePath="..\..\src\common\anidecod.cpp"
>
</File>
<File
RelativePath="..\..\src\common\animatecmn.cpp"
>
</File>
<File
RelativePath="..\..\src\common\appcmn.cpp"
>
@@ -781,6 +789,10 @@
RelativePath="..\..\src\common\bmpbtncmn.cpp"
>
</File>
<File
RelativePath="..\..\src\common\bmpcboxcmn.cpp"
>
</File>
<File
RelativePath="..\..\src\common\bookctrl.cpp"
>
@@ -793,6 +805,10 @@
RelativePath="..\..\src\common\cairo.cpp"
>
</File>
<File
RelativePath="..\..\src\common\calctrlcmn.cpp"
>
</File>
<File
RelativePath="..\..\src\common\checkboxcmn.cpp"
>
@@ -849,6 +865,10 @@
RelativePath="..\..\src\common\ctrlsub.cpp"
>
</File>
<File
RelativePath="..\..\src\common\datavcmn.cpp"
>
</File>
<File
RelativePath="..\..\src\common\dcbase.cpp"
>
@@ -1049,6 +1069,10 @@
RelativePath="..\..\src\common\graphcmn.cpp"
>
</File>
<File
RelativePath="..\..\src\common\gridcmn.cpp"
>
</File>
<File
RelativePath="..\..\src\common\headercolcmn.cpp"
>
@@ -1061,6 +1085,10 @@
RelativePath="..\..\src\common\helpbase.cpp"
>
</File>
<File
RelativePath="..\..\src\common\hyperlnkcmn.cpp"
>
</File>
<File
RelativePath="..\..\src\common\iconbndl.cpp"
>
@@ -1157,6 +1185,14 @@
RelativePath="..\..\src\common\nbkbase.cpp"
>
</File>
<File
RelativePath="..\..\src\common\notifmsgcmn.cpp"
>
</File>
<File
RelativePath="..\..\src\common\odcombocmn.cpp"
>
</File>
<File
RelativePath="..\..\src\common\overlaycmn.cpp"
>
@@ -1217,6 +1253,10 @@
RelativePath="..\..\src\common\rgncmn.cpp"
>
</File>
<File
RelativePath="..\..\src\common\richtooltipcmn.cpp"
>
</File>
<File
RelativePath="..\..\src\common\scrolbarcmn.cpp"
>
@@ -1269,6 +1309,10 @@
RelativePath="..\..\src\common\stockitem.cpp"
>
</File>
<File
RelativePath="..\..\src\common\taskbarcmn.cpp"
>
</File>
<File
RelativePath="..\..\src\common\tbarbase.cpp"
>
@@ -1338,6 +1382,10 @@
Name="MSW Sources"
UniqueIdentifier="{D030D8C2-53EE-5B96-8F89-D78157B06140}"
>
<File
RelativePath="..\..\src\msw\aboutdlg.cpp"
>
</File>
<File
RelativePath="..\..\src\msw\accel.cpp"
>
@@ -1378,6 +1426,10 @@
RelativePath="..\..\src\msw\bmpbuttn.cpp"
>
</File>
<File
RelativePath="..\..\src\msw\bmpcbox.cpp"
>
</File>
<File
RelativePath="..\..\src\msw\brush.cpp"
>
@@ -1386,6 +1438,10 @@
RelativePath="..\..\src\msw\button.cpp"
>
</File>
<File
RelativePath="..\..\src\msw\calctrl.cpp"
>
</File>
<File
RelativePath="..\..\src\msw\caret.cpp"
>
@@ -1426,6 +1482,10 @@
RelativePath="..\..\src\msw\ole\comimpl.cpp"
>
</File>
<File
RelativePath="..\..\src\msw\commandlinkbutton.cpp"
>
</File>
<File
RelativePath="..\..\src\msw\control.cpp"
>
@@ -1446,6 +1506,18 @@
RelativePath="..\..\src\msw\ole\dataobj.cpp"
>
</File>
<File
RelativePath="..\..\src\msw\datecontrols.cpp"
>
</File>
<File
RelativePath="..\..\src\msw\datectrl.cpp"
>
</File>
<File
RelativePath="..\..\src\msw\datetimectrl.cpp"
>
</File>
<File
RelativePath="..\..\src\msw\dc.cpp"
>
@@ -1570,6 +1642,10 @@
RelativePath="..\..\src\msw\helpwin.cpp"
>
</File>
<File
RelativePath="..\..\src\msw\hyperlink.cpp"
>
</File>
<File
RelativePath="..\..\src\msw\icon.cpp"
>
@@ -1582,6 +1658,10 @@
RelativePath="..\..\src\msw\iniconf.cpp"
>
</File>
<File
RelativePath="..\..\src\msw\joystick.cpp"
>
</File>
<File
RelativePath="..\..\src\msw\listbox.cpp"
>
@@ -1634,6 +1714,14 @@
RelativePath="..\..\src\msw\notebook.cpp"
>
</File>
<File
RelativePath="..\..\src\msw\notifmsg.cpp"
>
</File>
<File
RelativePath="..\..\src\msw\rt\notifmsgrt.cpp"
>
</File>
<File
RelativePath="..\..\src\msw\ole\oleutils.cpp"
>
@@ -1686,6 +1774,10 @@
RelativePath="..\..\src\msw\richmsgdlg.cpp"
>
</File>
<File
RelativePath="..\..\src\msw\richtooltip.cpp"
>
</File>
<File
RelativePath="..\..\src\msw\ole\safearray.cpp"
>
@@ -1702,6 +1794,10 @@
RelativePath="..\..\src\msw\slider.cpp"
>
</File>
<File
RelativePath="..\..\src\msw\sound.cpp"
>
</File>
<File
RelativePath="..\..\src\msw\spinbutt.cpp"
>
@@ -1734,6 +1830,10 @@
RelativePath="..\..\src\msw\systhemectrl.cpp"
>
</File>
<File
RelativePath="..\..\src\msw\taskbar.cpp"
>
</File>
<File
RelativePath="..\..\src\msw\taskbarbutton.cpp"
>
@@ -1754,6 +1854,10 @@
RelativePath="..\..\src\msw\tglbtn.cpp"
>
</File>
<File
RelativePath="..\..\src\msw\timectrl.cpp"
>
</File>
<File
RelativePath="..\..\src\msw\toolbar.cpp"
>
@@ -1827,6 +1931,26 @@
Name="Generic Sources"
UniqueIdentifier="{FEA0C02F-F300-53BA-B784-52A5086B8093}"
>
<File
RelativePath="..\..\src\generic\aboutdlgg.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\activityindicator.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\animateg.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\bannerwindow.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\bmpcboxg.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\busyinfo.cpp"
>
@@ -1835,6 +1959,10 @@
RelativePath="..\..\src\generic\buttonbar.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\calctrlg.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\choicbkg.cpp"
>
@@ -1859,6 +1987,18 @@
RelativePath="..\..\src\generic\combog.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\commandlinkbuttong.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\datavgen.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\datectlg.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\dcpsg.cpp"
>
@@ -1871,6 +2011,10 @@
RelativePath="..\..\src\generic\dragimgg.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\editlbox.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\filectrlg.cpp"
>
@@ -1887,14 +2031,42 @@
RelativePath="..\..\src\generic\graphicc.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\grid.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\gridctrl.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\grideditors.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\gridsel.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\headerctrlg.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\helpext.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\hyperlinkg.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\infobar.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\laywin.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\listbkg.cpp"
>
@@ -1911,10 +2083,18 @@
RelativePath="..\..\src\generic\msgdlgg.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\notifmsgg.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\numdlgg.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\odcombo.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\preferencesg.cpp"
>
@@ -1931,6 +2111,10 @@
RelativePath="..\..\src\generic\progdlgg.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\propdlg.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\renderg.cpp"
>
@@ -1939,6 +2123,14 @@
RelativePath="..\..\src\generic\richmsgdlgg.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\richtooltipg.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\sashwin.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\scrlwing.cpp"
>
@@ -1951,6 +2143,10 @@
RelativePath="..\..\src\generic\spinctlg.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\splash.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\splitter.cpp"
>
@@ -1975,6 +2171,14 @@
RelativePath="..\..\src\generic\textdlgg.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\timectrlg.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\tipdlg.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\tipwin.cpp"
>
@@ -1991,6 +2195,10 @@
RelativePath="..\..\src\generic\treectlg.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\treelist.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\vlbox.cpp"
>
@@ -1999,6 +2207,10 @@
RelativePath="..\..\src\generic\vscroll.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\wizard.cpp"
>
</File>
</Filter>
<Filter
Name="Setup Headers"

8
build/msw/wx_vc8_propgrid.vcproj
View File

@@ -253,7 +253,7 @@
<Tool
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_adv.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
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"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_propgrid.lib"
@@ -344,7 +344,7 @@
<Tool
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_adv.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
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"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_dll\wxmsw31u_propgrid.lib"
@@ -607,7 +607,7 @@
<Tool
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_adv.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib"
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"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31ud_propgrid.lib"
@@ -698,7 +698,7 @@
<Tool
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_adv.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u.lib"
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"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31u_propgrid.lib"

8
build/msw/wx_vc8_ribbon.vcproj
View File

@@ -253,7 +253,7 @@
<Tool
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_adv.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
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"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_ribbon.lib"
@@ -344,7 +344,7 @@
<Tool
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_adv.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
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"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_dll\wxmsw31u_ribbon.lib"
@@ -607,7 +607,7 @@
<Tool
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_adv.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib"
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"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31ud_ribbon.lib"
@@ -698,7 +698,7 @@
<Tool
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_adv.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u.lib"
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"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31u_ribbon.lib"

8
build/msw/wx_vc8_richtext.vcproj
View File

@@ -253,7 +253,7 @@
<Tool
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_adv.lib ..\..\lib\vc_dll\wxmsw31ud_html.lib ..\..\lib\vc_dll\wxbase31ud_xml.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
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"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_richtext.lib"
@@ -344,7 +344,7 @@
<Tool
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_adv.lib ..\..\lib\vc_dll\wxmsw31u_html.lib ..\..\lib\vc_dll\wxbase31u_xml.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
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"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_dll\wxmsw31u_richtext.lib"
@@ -607,7 +607,7 @@
<Tool
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_adv.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"
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"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31ud_richtext.lib"
@@ -698,7 +698,7 @@
<Tool
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_adv.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"
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"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31u_richtext.lib"

8
build/msw/wx_vc8_xrc.vcproj
View File

@@ -253,7 +253,7 @@
<Tool
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_adv.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud_xml.lib ..\..\lib\vc_dll\wxbase31ud.lib"
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"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_xrc.lib"
@@ -344,7 +344,7 @@
<Tool
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_adv.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u_xml.lib ..\..\lib\vc_dll\wxbase31u.lib"
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"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_dll\wxmsw31u_xrc.lib"
@@ -607,7 +607,7 @@
<Tool
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_adv.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud_xml.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib"
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"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31ud_xrc.lib"
@@ -698,7 +698,7 @@
<Tool
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_adv.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u_xml.lib ..\..\lib\vc_x64_dll\wxbase31u.lib"
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"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31u_xrc.lib"

479
build/msw/wx_vc9_adv.vcproj
View File

@@ -737,26 +737,6 @@
Name="Common Sources"
UniqueIdentifier="{A6A5C30D-BDB6-5050-906D-10A96065136C}"
>
<File
RelativePath="..\..\src\common\addremovectrl.cpp"
>
</File>
<File
RelativePath="..\..\src\common\animatecmn.cpp"
>
</File>
<File
RelativePath="..\..\src\common\bmpcboxcmn.cpp"
>
</File>
<File
RelativePath="..\..\src\common\calctrlcmn.cpp"
>
</File>
<File
RelativePath="..\..\src\common\datavcmn.cpp"
>
</File>
<File
RelativePath="..\..\src\common\dummy.cpp"
>
@@ -825,95 +805,11 @@
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\src\common\gridcmn.cpp"
>
</File>
<File
RelativePath="..\..\src\common\hyperlnkcmn.cpp"
>
</File>
<File
RelativePath="..\..\src\common\notifmsgcmn.cpp"
>
</File>
<File
RelativePath="..\..\src\common\odcombocmn.cpp"
>
</File>
<File
RelativePath="..\..\src\common\richtooltipcmn.cpp"
>
</File>
<File
RelativePath="..\..\src\common\taskbarcmn.cpp"
>
</File>
</Filter>
<Filter
Name="MSW Sources"
UniqueIdentifier="{D030D8C2-53EE-5B96-8F89-D78157B06140}"
>
<File
RelativePath="..\..\src\msw\aboutdlg.cpp"
>
</File>
<File
RelativePath="..\..\src\msw\bmpcbox.cpp"
>
</File>
<File
RelativePath="..\..\src\msw\calctrl.cpp"
>
</File>
<File
RelativePath="..\..\src\msw\commandlinkbutton.cpp"
>
</File>
<File
RelativePath="..\..\src\msw\datecontrols.cpp"
>
</File>
<File
RelativePath="..\..\src\msw\datectrl.cpp"
>
</File>
<File
RelativePath="..\..\src\msw\datetimectrl.cpp"
>
</File>
<File
RelativePath="..\..\src\msw\hyperlink.cpp"
>
</File>
<File
RelativePath="..\..\src\msw\joystick.cpp"
>
</File>
<File
RelativePath="..\..\src\msw\notifmsg.cpp"
>
</File>
<File
RelativePath="..\..\src\msw\rt\notifmsgrt.cpp"
>
</File>
<File
RelativePath="..\..\src\msw\richtooltip.cpp"
>
</File>
<File
RelativePath="..\..\src\msw\sound.cpp"
>
</File>
<File
RelativePath="..\..\src\msw\taskbar.cpp"
>
</File>
<File
RelativePath="..\..\src\msw\timectrl.cpp"
>
</File>
<File
RelativePath="..\..\src\msw\version.rc"
>
@@ -935,119 +831,6 @@
/>
</File>
</Filter>
<Filter
Name="Generic Sources"
UniqueIdentifier="{FEA0C02F-F300-53BA-B784-52A5086B8093}"
>
<File
RelativePath="..\..\src\generic\aboutdlgg.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\activityindicator.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\animateg.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\bannerwindow.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\bmpcboxg.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\calctrlg.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\commandlinkbuttong.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\datavgen.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\datectlg.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\editlbox.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\grid.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\gridctrl.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\grideditors.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\gridsel.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\helpext.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\hyperlinkg.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\laywin.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\notifmsgg.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\odcombo.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\propdlg.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\richtooltipg.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\sashwin.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\splash.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\timectrlg.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\tipdlg.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\treelist.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\wizard.cpp"
>
</File>
</Filter>
<Filter
Name="Setup Headers"
UniqueIdentifier="{63537534-1833-5C1F-8DBD-359A84F294C8}"
@@ -1169,26 +952,6 @@
Name="MSW Headers"
UniqueIdentifier="{5AFFF20E-29F9-512B-B80A-7DC45976CDAC}"
>
<File
RelativePath="..\..\include\wx\msw\bmpcbox.h"
>
</File>
<File
RelativePath="..\..\include\wx\msw\calctrl.h"
>
</File>
<File
RelativePath="..\..\include\wx\msw\commandlinkbutton.h"
>
</File>
<File
RelativePath="..\..\include\wx\msw\datectrl.h"
>
</File>
<File
RelativePath="..\..\include\wx\msw\datetimectrl.h"
>
</File>
<File
RelativePath="..\..\include\wx\msw\genrcdefs.h"
>
@@ -1281,248 +1044,6 @@
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\include\wx\msw\hyperlink.h"
>
</File>
<File
RelativePath="..\..\include\wx\msw\joystick.h"
>
</File>
<File
RelativePath="..\..\include\wx\msw\sound.h"
>
</File>
<File
RelativePath="..\..\include\wx\msw\taskbar.h"
>
</File>
<File
RelativePath="..\..\include\wx\msw\timectrl.h"
>
</File>
</Filter>
<Filter
Name="Generic Headers"
UniqueIdentifier="{61C63C83-EF8C-51CA-A418-51936E7FCD4A}"
>
<File
RelativePath="..\..\include\wx\generic\aboutdlgg.h"
>
</File>
<File
RelativePath="..\..\include\wx\generic\activityindicator.h"
>
</File>
<File
RelativePath="..\..\include\wx\generic\animate.h"
>
</File>
<File
RelativePath="..\..\include\wx\generic\bmpcbox.h"
>
</File>
<File
RelativePath="..\..\include\wx\generic\calctrlg.h"
>
</File>
<File
RelativePath="..\..\include\wx\generic\dataview.h"
>
</File>
<File
RelativePath="..\..\include\wx\generic\datectrl.h"
>
</File>
<File
RelativePath="..\..\include\wx\generic\dvrenderer.h"
>
</File>
<File
RelativePath="..\..\include\wx\generic\dvrenderers.h"
>
</File>
<File
RelativePath="..\..\include\wx\generic\grid.h"
>
</File>
<File
RelativePath="..\..\include\wx\generic\gridctrl.h"
>
</File>
<File
RelativePath="..\..\include\wx\generic\grideditors.h"
>
</File>
<File
RelativePath="..\..\include\wx\generic\gridsel.h"
>
</File>
<File
RelativePath="..\..\include\wx\generic\helpext.h"
>
</File>
<File
RelativePath="..\..\include\wx\generic\hyperlink.h"
>
</File>
<File
RelativePath="..\..\include\wx\generic\laywin.h"
>
</File>
<File
RelativePath="..\..\include\wx\generic\notifmsg.h"
>
</File>
<File
RelativePath="..\..\include\wx\generic\propdlg.h"
>
</File>
<File
RelativePath="..\..\include\wx\generic\sashwin.h"
>
</File>
<File
RelativePath="..\..\include\wx\generic\splash.h"
>
</File>
<File
RelativePath="..\..\include\wx\generic\timectrl.h"
>
</File>
<File
RelativePath="..\..\include\wx\generic\wizard.h"
>
</File>
</Filter>
<Filter
Name="Common Headers"
UniqueIdentifier="{8C07E926-65B0-5F00-B0D6-7F40DA69BB25}"
>
<File
RelativePath="..\..\include\wx\aboutdlg.h"
>
</File>
<File
RelativePath="..\..\include\wx\activityindicator.h"
>
</File>
<File
RelativePath="..\..\include\wx\addremovectrl.h"
>
</File>
<File
RelativePath="..\..\include\wx\animate.h"
>
</File>
<File
RelativePath="..\..\include\wx\bannerwindow.h"
>
</File>
<File
RelativePath="..\..\include\wx\bmpcbox.h"
>
</File>
<File
RelativePath="..\..\include\wx\calctrl.h"
>
</File>
<File
RelativePath="..\..\include\wx\commandlinkbutton.h"
>
</File>
<File
RelativePath="..\..\include\wx\dataview.h"
>
</File>
<File
RelativePath="..\..\include\wx\datectrl.h"
>
</File>
<File
RelativePath="..\..\include\wx\dateevt.h"
>
</File>
<File
RelativePath="..\..\include\wx\datetimectrl.h"
>
</File>
<File
RelativePath="..\..\include\wx\dcbuffer.h"
>
</File>
<File
RelativePath="..\..\include\wx\dvrenderers.h"
>
</File>
<File
RelativePath="..\..\include\wx\editlbox.h"
>
</File>
<File
RelativePath="..\..\include\wx\grid.h"
>
</File>
<File
RelativePath="..\..\include\wx\hyperlink.h"
>
</File>
<File
RelativePath="..\..\include\wx\joystick.h"
>
</File>
<File
RelativePath="..\..\include\wx\laywin.h"
>
</File>
<File
RelativePath="..\..\include\wx\notifmsg.h"
>
</File>
<File
RelativePath="..\..\include\wx\odcombo.h"
>
</File>
<File
RelativePath="..\..\include\wx\propdlg.h"
>
</File>
<File
RelativePath="..\..\include\wx\richtooltip.h"
>
</File>
<File
RelativePath="..\..\include\wx\sashwin.h"
>
</File>
<File
RelativePath="..\..\include\wx\sound.h"
>
</File>
<File
RelativePath="..\..\include\wx\splash.h"
>
</File>
<File
RelativePath="..\..\include\wx\taskbar.h"
>
</File>
<File
RelativePath="..\..\include\wx\timectrl.h"
>
</File>
<File
RelativePath="..\..\include\wx\tipdlg.h"
>
</File>
<File
RelativePath="..\..\include\wx\treelist.h"
>
</File>
<File
RelativePath="..\..\include\wx\wizard.h"
>
</File>
</Filter>
</Files>
<Globals>

8
build/msw/wx_vc9_aui.vcproj
View File

@@ -251,7 +251,7 @@
<Tool
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_adv.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
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"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_aui.lib"
@@ -342,7 +342,7 @@
<Tool
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_adv.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
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"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_dll\wxmsw31u_aui.lib"
@@ -603,7 +603,7 @@
<Tool
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_adv.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib"
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"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31ud_aui.lib"
@@ -694,7 +694,7 @@
<Tool
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_adv.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u.lib"
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"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31u_aui.lib"

212
build/msw/wx_vc9_core.vcproj
View File

@@ -745,6 +745,10 @@
RelativePath="..\..\src\common\accesscmn.cpp"
>
</File>
<File
RelativePath="..\..\src\common\addremovectrl.cpp"
>
</File>
<File
RelativePath="..\..\src\common\affinematrix2d.cpp"
>
@@ -753,6 +757,10 @@
RelativePath="..\..\src\common\anidecod.cpp"
>
</File>
<File
RelativePath="..\..\src\common\animatecmn.cpp"
>
</File>
<File
RelativePath="..\..\src\common\appcmn.cpp"
>
@@ -777,6 +785,10 @@
RelativePath="..\..\src\common\bmpbtncmn.cpp"
>
</File>
<File
RelativePath="..\..\src\common\bmpcboxcmn.cpp"
>
</File>
<File
RelativePath="..\..\src\common\bookctrl.cpp"
>
@@ -789,6 +801,10 @@
RelativePath="..\..\src\common\cairo.cpp"
>
</File>
<File
RelativePath="..\..\src\common\calctrlcmn.cpp"
>
</File>
<File
RelativePath="..\..\src\common\checkboxcmn.cpp"
>
@@ -845,6 +861,10 @@
RelativePath="..\..\src\common\ctrlsub.cpp"
>
</File>
<File
RelativePath="..\..\src\common\datavcmn.cpp"
>
</File>
<File
RelativePath="..\..\src\common\dcbase.cpp"
>
@@ -1045,6 +1065,10 @@
RelativePath="..\..\src\common\graphcmn.cpp"
>
</File>
<File
RelativePath="..\..\src\common\gridcmn.cpp"
>
</File>
<File
RelativePath="..\..\src\common\headercolcmn.cpp"
>
@@ -1057,6 +1081,10 @@
RelativePath="..\..\src\common\helpbase.cpp"
>
</File>
<File
RelativePath="..\..\src\common\hyperlnkcmn.cpp"
>
</File>
<File
RelativePath="..\..\src\common\iconbndl.cpp"
>
@@ -1153,6 +1181,14 @@
RelativePath="..\..\src\common\nbkbase.cpp"
>
</File>
<File
RelativePath="..\..\src\common\notifmsgcmn.cpp"
>
</File>
<File
RelativePath="..\..\src\common\odcombocmn.cpp"
>
</File>
<File
RelativePath="..\..\src\common\overlaycmn.cpp"
>
@@ -1213,6 +1249,10 @@
RelativePath="..\..\src\common\rgncmn.cpp"
>
</File>
<File
RelativePath="..\..\src\common\richtooltipcmn.cpp"
>
</File>
<File
RelativePath="..\..\src\common\scrolbarcmn.cpp"
>
@@ -1265,6 +1305,10 @@
RelativePath="..\..\src\common\stockitem.cpp"
>
</File>
<File
RelativePath="..\..\src\common\taskbarcmn.cpp"
>
</File>
<File
RelativePath="..\..\src\common\tbarbase.cpp"
>
@@ -1334,6 +1378,10 @@
Name="MSW Sources"
UniqueIdentifier="{D030D8C2-53EE-5B96-8F89-D78157B06140}"
>
<File
RelativePath="..\..\src\msw\aboutdlg.cpp"
>
</File>
<File
RelativePath="..\..\src\msw\accel.cpp"
>
@@ -1374,6 +1422,10 @@
RelativePath="..\..\src\msw\bmpbuttn.cpp"
>
</File>
<File
RelativePath="..\..\src\msw\bmpcbox.cpp"
>
</File>
<File
RelativePath="..\..\src\msw\brush.cpp"
>
@@ -1382,6 +1434,10 @@
RelativePath="..\..\src\msw\button.cpp"
>
</File>
<File
RelativePath="..\..\src\msw\calctrl.cpp"
>
</File>
<File
RelativePath="..\..\src\msw\caret.cpp"
>
@@ -1422,6 +1478,10 @@
RelativePath="..\..\src\msw\ole\comimpl.cpp"
>
</File>
<File
RelativePath="..\..\src\msw\commandlinkbutton.cpp"
>
</File>
<File
RelativePath="..\..\src\msw\control.cpp"
>
@@ -1442,6 +1502,18 @@
RelativePath="..\..\src\msw\ole\dataobj.cpp"
>
</File>
<File
RelativePath="..\..\src\msw\datecontrols.cpp"
>
</File>
<File
RelativePath="..\..\src\msw\datectrl.cpp"
>
</File>
<File
RelativePath="..\..\src\msw\datetimectrl.cpp"
>
</File>
<File
RelativePath="..\..\src\msw\dc.cpp"
>
@@ -1566,6 +1638,10 @@
RelativePath="..\..\src\msw\helpwin.cpp"
>
</File>
<File
RelativePath="..\..\src\msw\hyperlink.cpp"
>
</File>
<File
RelativePath="..\..\src\msw\icon.cpp"
>
@@ -1578,6 +1654,10 @@
RelativePath="..\..\src\msw\iniconf.cpp"
>
</File>
<File
RelativePath="..\..\src\msw\joystick.cpp"
>
</File>
<File
RelativePath="..\..\src\msw\listbox.cpp"
>
@@ -1630,6 +1710,14 @@
RelativePath="..\..\src\msw\notebook.cpp"
>
</File>
<File
RelativePath="..\..\src\msw\notifmsg.cpp"
>
</File>
<File
RelativePath="..\..\src\msw\rt\notifmsgrt.cpp"
>
</File>
<File
RelativePath="..\..\src\msw\ole\oleutils.cpp"
>
@@ -1682,6 +1770,10 @@
RelativePath="..\..\src\msw\richmsgdlg.cpp"
>
</File>
<File
RelativePath="..\..\src\msw\richtooltip.cpp"
>
</File>
<File
RelativePath="..\..\src\msw\ole\safearray.cpp"
>
@@ -1698,6 +1790,10 @@
RelativePath="..\..\src\msw\slider.cpp"
>
</File>
<File
RelativePath="..\..\src\msw\sound.cpp"
>
</File>
<File
RelativePath="..\..\src\msw\spinbutt.cpp"
>
@@ -1730,6 +1826,10 @@
RelativePath="..\..\src\msw\systhemectrl.cpp"
>
</File>
<File
RelativePath="..\..\src\msw\taskbar.cpp"
>
</File>
<File
RelativePath="..\..\src\msw\taskbarbutton.cpp"
>
@@ -1750,6 +1850,10 @@
RelativePath="..\..\src\msw\tglbtn.cpp"
>
</File>
<File
RelativePath="..\..\src\msw\timectrl.cpp"
>
</File>
<File
RelativePath="..\..\src\msw\toolbar.cpp"
>
@@ -1823,6 +1927,26 @@
Name="Generic Sources"
UniqueIdentifier="{FEA0C02F-F300-53BA-B784-52A5086B8093}"
>
<File
RelativePath="..\..\src\generic\aboutdlgg.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\activityindicator.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\animateg.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\bannerwindow.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\bmpcboxg.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\busyinfo.cpp"
>
@@ -1831,6 +1955,10 @@
RelativePath="..\..\src\generic\buttonbar.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\calctrlg.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\choicbkg.cpp"
>
@@ -1855,6 +1983,18 @@
RelativePath="..\..\src\generic\combog.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\commandlinkbuttong.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\datavgen.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\datectlg.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\dcpsg.cpp"
>
@@ -1867,6 +2007,10 @@
RelativePath="..\..\src\generic\dragimgg.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\editlbox.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\filectrlg.cpp"
>
@@ -1883,14 +2027,42 @@
RelativePath="..\..\src\generic\graphicc.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\grid.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\gridctrl.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\grideditors.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\gridsel.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\headerctrlg.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\helpext.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\hyperlinkg.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\infobar.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\laywin.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\listbkg.cpp"
>
@@ -1907,10 +2079,18 @@
RelativePath="..\..\src\generic\msgdlgg.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\notifmsgg.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\numdlgg.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\odcombo.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\preferencesg.cpp"
>
@@ -1927,6 +2107,10 @@
RelativePath="..\..\src\generic\progdlgg.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\propdlg.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\renderg.cpp"
>
@@ -1935,6 +2119,14 @@
RelativePath="..\..\src\generic\richmsgdlgg.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\richtooltipg.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\sashwin.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\scrlwing.cpp"
>
@@ -1947,6 +2139,10 @@
RelativePath="..\..\src\generic\spinctlg.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\splash.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\splitter.cpp"
>
@@ -1971,6 +2167,14 @@
RelativePath="..\..\src\generic\textdlgg.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\timectrlg.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\tipdlg.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\tipwin.cpp"
>
@@ -1987,6 +2191,10 @@
RelativePath="..\..\src\generic\treectlg.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\treelist.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\vlbox.cpp"
>
@@ -1995,6 +2203,10 @@
RelativePath="..\..\src\generic\vscroll.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\wizard.cpp"
>
</File>
</Filter>
<Filter
Name="Setup Headers"

8
build/msw/wx_vc9_propgrid.vcproj
View File

@@ -251,7 +251,7 @@
<Tool
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_adv.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
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"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_propgrid.lib"
@@ -342,7 +342,7 @@
<Tool
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_adv.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
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"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_dll\wxmsw31u_propgrid.lib"
@@ -603,7 +603,7 @@
<Tool
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_adv.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib"
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"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31ud_propgrid.lib"
@@ -694,7 +694,7 @@
<Tool
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_adv.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u.lib"
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"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31u_propgrid.lib"

8
build/msw/wx_vc9_ribbon.vcproj
View File

@@ -251,7 +251,7 @@
<Tool
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_adv.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
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"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_ribbon.lib"
@@ -342,7 +342,7 @@
<Tool
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_adv.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
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"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_dll\wxmsw31u_ribbon.lib"
@@ -603,7 +603,7 @@
<Tool
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_adv.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib"
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"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31ud_ribbon.lib"
@@ -694,7 +694,7 @@
<Tool
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_adv.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u.lib"
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"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31u_ribbon.lib"

8
build/msw/wx_vc9_richtext.vcproj
View File

@@ -251,7 +251,7 @@
<Tool
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_adv.lib ..\..\lib\vc_dll\wxmsw31ud_html.lib ..\..\lib\vc_dll\wxbase31ud_xml.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
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"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_richtext.lib"
@@ -342,7 +342,7 @@
<Tool
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_adv.lib ..\..\lib\vc_dll\wxmsw31u_html.lib ..\..\lib\vc_dll\wxbase31u_xml.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
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"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_dll\wxmsw31u_richtext.lib"
@@ -603,7 +603,7 @@
<Tool
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_adv.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"
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"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31ud_richtext.lib"
@@ -694,7 +694,7 @@
<Tool
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_adv.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"
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"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31u_richtext.lib"

8
build/msw/wx_vc9_xrc.vcproj
View File

@@ -251,7 +251,7 @@
<Tool
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_adv.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud_xml.lib ..\..\lib\vc_dll\wxbase31ud.lib"
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"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_xrc.lib"
@@ -342,7 +342,7 @@
<Tool
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_adv.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u_xml.lib ..\..\lib\vc_dll\wxbase31u.lib"
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"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_dll\wxmsw31u_xrc.lib"
@@ -603,7 +603,7 @@
<Tool
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_adv.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud_xml.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib"
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"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31ud_xrc.lib"
@@ -694,7 +694,7 @@
<Tool
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_adv.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u_xml.lib ..\..\lib\vc_x64_dll\wxbase31u.lib"
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"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31u_xrc.lib"