Move wxAdv library contents into wxCore

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 21:13:04 +02:00
parent b38813a5e9
commit 3ffa651a34
314 changed files with 9761 additions and 11422 deletions
+2956 -3611
View File
File diff suppressed because it is too large Load Diff
+6 -102
View File
File diff suppressed because one or more lines are too long
+243 -401
View File
File diff suppressed because it is too large Load Diff
-5
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
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
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
+423 -480
View File
File diff suppressed because it is too large Load Diff
+1294 -1150
View File
File diff suppressed because it is too large Load Diff
+1286 -1138
View File
File diff suppressed because it is too large Load Diff
+1294 -1150
View File
File diff suppressed because it is too large Load Diff
-116
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
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
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">
File diff suppressed because it is too large Load Diff
-360
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>
+2 -2
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
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"
+2 -2
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"
+2 -2
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"
+2 -2
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"
+2 -2
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"
File diff suppressed because it is too large Load Diff
+4 -4
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
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"
+4 -4
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"
+4 -4
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"
+4 -4
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"
+4 -4
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"
File diff suppressed because it is too large Load Diff
+4 -4
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
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"
+4 -4
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"
+4 -4
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"
+4 -4
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"
+4 -4
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"
Vendored
+6 -102
View File
@@ -665,7 +665,6 @@ COND_wxUSE_LIBPNG_builtin
COND_wxUSE_LIBJPEG_builtin
COND_wxUSE_EXPAT_builtin
COND_WXUNIV_1
COND_WXUNIV_0
COND_WITH_PLUGIN_SDL_1
COND_WINDOWS_IMPLIB_1
COND_USE_XRC_1
@@ -696,18 +695,17 @@ COND_USE_EXCEPTIONS_1
COND_USE_EXCEPTIONS_0
COND_USE_CAIRO_1
COND_UNICODE_1
COND_TOOLKIT_X11_WXUNIV_1
COND_TOOLKIT_X11_USE_GUI_1_WXUNIV_1
COND_TOOLKIT_X11_USE_GUI_1
COND_TOOLKIT_X11
COND_TOOLKIT_Qt
COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0
COND_TOOLKIT_QT_USE_GUI_1
COND_TOOLKIT_QT
COND_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0
COND_TOOLKIT_OSX_IPHONE_USE_GUI_1
COND_TOOLKIT_OSX_IPHONE
COND_TOOLKIT_OSX_COCOA_WXUNIV_0
COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0
COND_TOOLKIT_OSX_COCOA_USE_GUI_1
COND_TOOLKIT_OSX_COCOA
COND_TOOLKIT_OSX_CARBON
@@ -721,16 +719,12 @@ COND_TOOLKIT_MAC
COND_TOOLKIT_GTK_USE_GUI_1
COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0
COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1
COND_TOOLKIT_GTK_TOOLKIT_VERSION_4_WXUNIV_0
COND_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1_WXUNIV_0
COND_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1
COND_TOOLKIT_GTK_TOOLKIT_VERSION_4
COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_WXUNIV_0
COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1_WXUNIV_0
COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1
COND_TOOLKIT_GTK_TOOLKIT_VERSION_3
COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_1
COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_0
COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_1
COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0
COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1
@@ -739,7 +733,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_
COND_TOOLKIT_GTK
COND_TOOLKIT_DFB_USE_GUI_1
COND_TOOLKIT_DFB
COND_TOOLKIT_COCOA_USE_GUI_1
COND_TOOLKIT_COCOA
COND_TOOLKIT_
COND_SHARED_1_USE_GUI_1_USE_OPENGL_1
@@ -758,11 +751,8 @@ COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0
COND_SHARED_0_TOOLKIT_MAC_WXUNIV_0
COND_SHARED_0
COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1
COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_4
COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1
COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_3
COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1
COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_2
COND_PLATFORM_WIN32_1_SHARED_0
COND_PLATFORM_WIN32_1
COND_PLATFORM_WIN32_0_TOOLKIT_GTK_TOOLKIT_VERSION_4
@@ -771,11 +761,8 @@ COND_PLATFORM_WIN32_0
COND_PLATFORM_UNIX_1_USE_PLUGINS_0
COND_PLATFORM_UNIX_1_USE_GUI_1
COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1
COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4
COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1
COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3
COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1
COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2
COND_PLATFORM_UNIX_1
COND_PLATFORM_UNIX_0
COND_PLATFORM_OS2_1
@@ -787,11 +774,8 @@ COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1
COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0
COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1
COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1
COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4
COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1
COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3
COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1
COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2
COND_PLATFORM_MACOSX_1_PLATFORM_WIN32_1_SHARED_0
COND_PLATFORM_MACOSX_1
COND_PLATFORM_MACOSX_0_USE_SOVERSION_1
@@ -40992,31 +40976,16 @@ EOF
COND_PLATFORM_MACOSX_1_PLATFORM_WIN32_1_SHARED_0=""
fi
COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2="#"
if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x2" ; then
COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2=""
fi
COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1="#"
if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x2" -a "x$USE_GUI" = "x1" ; then
COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1=""
fi
COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3="#"
if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x3" ; then
COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3=""
fi
COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1="#"
if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x3" -a "x$USE_GUI" = "x1" ; then
COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1=""
fi
COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4="#"
if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x4" ; then
COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4=""
fi
COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1="#"
if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x4" -a "x$USE_GUI" = "x1" ; then
COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1=""
@@ -41072,31 +41041,16 @@ EOF
COND_PLATFORM_UNIX_1=""
fi
COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2="#"
if test "x$PLATFORM_UNIX" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x2" ; then
COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2=""
fi
COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1="#"
if test "x$PLATFORM_UNIX" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x2" -a "x$USE_GUI" = "x1" ; then
COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1=""
fi
COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3="#"
if test "x$PLATFORM_UNIX" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x3" ; then
COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3=""
fi
COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1="#"
if test "x$PLATFORM_UNIX" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x3" -a "x$USE_GUI" = "x1" ; then
COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1=""
fi
COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4="#"
if test "x$PLATFORM_UNIX" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x4" ; then
COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4=""
fi
COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1="#"
if test "x$PLATFORM_UNIX" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x4" -a "x$USE_GUI" = "x1" ; then
COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1=""
@@ -41137,31 +41091,16 @@ EOF
COND_PLATFORM_WIN32_1_SHARED_0=""
fi
COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_2="#"
if test "x$PLATFORM_WIN32" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x2" ; then
COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_2=""
fi
COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1="#"
if test "x$PLATFORM_WIN32" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x2" -a "x$USE_GUI" = "x1" ; then
COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1=""
fi
COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_3="#"
if test "x$PLATFORM_WIN32" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x3" ; then
COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_3=""
fi
COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1="#"
if test "x$PLATFORM_WIN32" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x3" -a "x$USE_GUI" = "x1" ; then
COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1=""
fi
COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_4="#"
if test "x$PLATFORM_WIN32" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x4" ; then
COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_4=""
fi
COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1="#"
if test "x$PLATFORM_WIN32" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x4" -a "x$USE_GUI" = "x1" ; then
COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1=""
@@ -41252,11 +41191,6 @@ EOF
COND_TOOLKIT_COCOA=""
fi
COND_TOOLKIT_COCOA_USE_GUI_1="#"
if test "x$TOOLKIT" = "xCOCOA" -a "x$USE_GUI" = "x1" ; then
COND_TOOLKIT_COCOA_USE_GUI_1=""
fi
COND_TOOLKIT_DFB="#"
if test "x$TOOLKIT" = "xDFB" ; then
COND_TOOLKIT_DFB=""
@@ -41297,16 +41231,6 @@ EOF
COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_1=""
fi
COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_0="#"
if test "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x2" -a "x$WXUNIV" = "x0" ; then
COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_0=""
fi
COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_1="#"
if test "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x2" -a "x$WXUNIV" = "x1" ; then
COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_1=""
fi
COND_TOOLKIT_GTK_TOOLKIT_VERSION_3="#"
if test "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x3" ; then
COND_TOOLKIT_GTK_TOOLKIT_VERSION_3=""
@@ -41322,11 +41246,6 @@ EOF
COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1_WXUNIV_0=""
fi
COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_WXUNIV_0="#"
if test "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x3" -a "x$WXUNIV" = "x0" ; then
COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_WXUNIV_0=""
fi
COND_TOOLKIT_GTK_TOOLKIT_VERSION_4="#"
if test "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x4" ; then
COND_TOOLKIT_GTK_TOOLKIT_VERSION_4=""
@@ -41342,11 +41261,6 @@ EOF
COND_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1_WXUNIV_0=""
fi
COND_TOOLKIT_GTK_TOOLKIT_VERSION_4_WXUNIV_0="#"
if test "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x4" -a "x$WXUNIV" = "x0" ; then
COND_TOOLKIT_GTK_TOOLKIT_VERSION_4_WXUNIV_0=""
fi
COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1="#"
if test "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x" -a "x$USE_GUI" = "x1" ; then
COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1=""
@@ -41412,6 +41326,11 @@ EOF
COND_TOOLKIT_OSX_COCOA_USE_GUI_1=""
fi
COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0="#"
if test "x$TOOLKIT" = "xOSX_COCOA" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then
COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0=""
fi
COND_TOOLKIT_OSX_COCOA_WXUNIV_0="#"
if test "x$TOOLKIT" = "xOSX_COCOA" -a "x$WXUNIV" = "x0" ; then
COND_TOOLKIT_OSX_COCOA_WXUNIV_0=""
@@ -41437,11 +41356,6 @@ EOF
COND_TOOLKIT_QT=""
fi
COND_TOOLKIT_QT_USE_GUI_1="#"
if test "x$TOOLKIT" = "xQT" -a "x$USE_GUI" = "x1" ; then
COND_TOOLKIT_QT_USE_GUI_1=""
fi
COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0="#"
if test "x$TOOLKIT" = "xQT" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then
COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0=""
@@ -41467,11 +41381,6 @@ EOF
COND_TOOLKIT_X11_USE_GUI_1_WXUNIV_1=""
fi
COND_TOOLKIT_X11_WXUNIV_1="#"
if test "x$TOOLKIT" = "xX11" -a "x$WXUNIV" = "x1" ; then
COND_TOOLKIT_X11_WXUNIV_1=""
fi
COND_UNICODE_1="#"
if test "x$UNICODE" = "x1" ; then
COND_UNICODE_1=""
@@ -41622,11 +41531,6 @@ EOF
COND_WITH_PLUGIN_SDL_1=""
fi
COND_WXUNIV_0="#"
if test "x$WXUNIV" = "x0" ; then
COND_WXUNIV_0=""
fi
COND_WXUNIV_1="#"
if test "x$WXUNIV" = "x1" ; then
COND_WXUNIV_1=""
+1 -6
View File
@@ -32,7 +32,6 @@ EXTRALIBS = @EXTRALIBS@
EXTRALIBS_XML = @EXTRALIBS_XML@
EXTRALIBS_HTML = @EXTRALIBS_HTML@
EXTRALIBS_GUI = @EXTRALIBS_GUI@
EXTRALIBS_SDL = @EXTRALIBS_SDL@
CXXWARNINGS = @CXXWARNINGS@
HOST_SUFFIX = @HOST_SUFFIX@
SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
@@ -64,7 +63,6 @@ FORTY_OBJECTS = \
@COND_DEPS_TRACKING_0@CXXC = $(CXX)
@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
@COND_USE_PLUGINS_0@PLUGIN_ADV_EXTRALIBS = $(EXTRALIBS_SDL)
@COND_USE_GUI_0@PORTNAME = base
@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@@ -109,9 +107,6 @@ COND_PLATFORM_OS2_1___forty___os2_emxbindcmd = $(NM) forty$(EXEEXT) | if grep -q
COND_MONOLITHIC_0___WXLIB_HTML_p = \
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_MONOLITHIC_0@__WXLIB_HTML_p = $(COND_MONOLITHIC_0___WXLIB_HTML_p)
COND_MONOLITHIC_0___WXLIB_ADV_p = \
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_MONOLITHIC_0@__WXLIB_ADV_p = $(COND_MONOLITHIC_0___WXLIB_ADV_p)
COND_MONOLITHIC_0___WXLIB_XML_p = \
-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_MONOLITHIC_0@__WXLIB_XML_p = $(COND_MONOLITHIC_0___WXLIB_XML_p)
@@ -165,7 +160,7 @@ distclean: clean
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
forty$(EXEEXT): $(FORTY_OBJECTS) $(__forty___win32rc)
$(CXX) -o $@ $(FORTY_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
$(CXX) -o $@ $(FORTY_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
$(__forty___os2_emxbindcmd)
@COND_PLATFORM_MACOSX_1@forty.app/Contents/PkgInfo: forty$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
-1
View File
@@ -15,7 +15,6 @@
scorefil.cpp
</sources>
<wx-lib>html</wx-lib>
<wx-lib>adv</wx-lib>
<wx-lib>xml</wx-lib>
<wx-lib>core</wx-lib>
<wx-lib>base</wx-lib>
+4 -4
View File
@@ -46,7 +46,7 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalDependencies="wxmsw31ud_html.lib wxmsw31ud_adv.lib wxbase31ud_xml.lib wxmsw31ud_core.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
AdditionalDependencies="wxmsw31ud_html.lib wxbase31ud_xml.lib wxmsw31ud_core.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="vc_mswud\forty.exe"
LinkIncremental="2"
SuppressStartupBanner="TRUE"
@@ -108,7 +108,7 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalDependencies="wxmsw31u_html.lib wxmsw31u_adv.lib wxbase31u_xml.lib wxmsw31u_core.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
AdditionalDependencies="wxmsw31u_html.lib wxbase31u_xml.lib wxmsw31u_core.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="vc_mswu\forty.exe"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
@@ -175,7 +175,7 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalDependencies="wxmsw31ud_html.lib wxmsw31ud_adv.lib wxbase31ud_xml.lib wxmsw31ud_core.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
AdditionalDependencies="wxmsw31ud_html.lib wxbase31ud_xml.lib wxmsw31ud_core.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="vc_mswuddll\forty.exe"
LinkIncremental="2"
SuppressStartupBanner="TRUE"
@@ -237,7 +237,7 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalDependencies="wxmsw31u_html.lib wxmsw31u_adv.lib wxbase31u_xml.lib wxmsw31u_core.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
AdditionalDependencies="wxmsw31u_html.lib wxbase31u_xml.lib wxmsw31u_core.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="vc_mswudll\forty.exe"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
+8 -8
View File
@@ -83,7 +83,7 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalDependencies="wxmsw31ud_html.lib wxmsw31ud_adv.lib wxbase31ud_xml.lib wxmsw31ud_core.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
AdditionalDependencies="wxmsw31ud_html.lib wxbase31ud_xml.lib wxmsw31ud_core.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="vc_mswud\forty.exe"
LinkIncremental="2"
SuppressStartupBanner="true"
@@ -177,7 +177,7 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalDependencies="wxmsw31u_html.lib wxmsw31u_adv.lib wxbase31u_xml.lib wxmsw31u_core.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
AdditionalDependencies="wxmsw31u_html.lib wxbase31u_xml.lib wxmsw31u_core.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="vc_mswu\forty.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
@@ -276,7 +276,7 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalDependencies="wxmsw31ud_html.lib wxmsw31ud_adv.lib wxbase31ud_xml.lib wxmsw31ud_core.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
AdditionalDependencies="wxmsw31ud_html.lib wxbase31ud_xml.lib wxmsw31ud_core.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="vc_mswuddll\forty.exe"
LinkIncremental="2"
SuppressStartupBanner="true"
@@ -370,7 +370,7 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalDependencies="wxmsw31u_html.lib wxmsw31u_adv.lib wxbase31u_xml.lib wxmsw31u_core.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
AdditionalDependencies="wxmsw31u_html.lib wxbase31u_xml.lib wxmsw31u_core.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="vc_mswudll\forty.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
@@ -469,7 +469,7 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalDependencies="wxmsw31ud_html.lib wxmsw31ud_adv.lib wxbase31ud_xml.lib wxmsw31ud_core.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
AdditionalDependencies="wxmsw31ud_html.lib wxbase31ud_xml.lib wxmsw31ud_core.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="vc_mswud_x64\forty.exe"
LinkIncremental="2"
SuppressStartupBanner="true"
@@ -563,7 +563,7 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalDependencies="wxmsw31u_html.lib wxmsw31u_adv.lib wxbase31u_xml.lib wxmsw31u_core.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
AdditionalDependencies="wxmsw31u_html.lib wxbase31u_xml.lib wxmsw31u_core.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="vc_mswu_x64\forty.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
@@ -662,7 +662,7 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalDependencies="wxmsw31ud_html.lib wxmsw31ud_adv.lib wxbase31ud_xml.lib wxmsw31ud_core.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
AdditionalDependencies="wxmsw31ud_html.lib wxbase31ud_xml.lib wxmsw31ud_core.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="vc_mswuddll_x64\forty.exe"
LinkIncremental="2"
SuppressStartupBanner="true"
@@ -756,7 +756,7 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalDependencies="wxmsw31u_html.lib wxmsw31u_adv.lib wxbase31u_xml.lib wxmsw31u_core.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
AdditionalDependencies="wxmsw31u_html.lib wxbase31u_xml.lib wxmsw31u_core.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="vc_mswudll_x64\forty.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
+8 -8
View File
@@ -82,7 +82,7 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalDependencies="wxmsw31ud_html.lib wxmsw31ud_adv.lib wxbase31ud_xml.lib wxmsw31ud_core.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
AdditionalDependencies="wxmsw31ud_html.lib wxbase31ud_xml.lib wxmsw31ud_core.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="vc_mswud\forty.exe"
LinkIncremental="2"
SuppressStartupBanner="true"
@@ -173,7 +173,7 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalDependencies="wxmsw31u_html.lib wxmsw31u_adv.lib wxbase31u_xml.lib wxmsw31u_core.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
AdditionalDependencies="wxmsw31u_html.lib wxbase31u_xml.lib wxmsw31u_core.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="vc_mswu\forty.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
@@ -268,7 +268,7 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalDependencies="wxmsw31ud_html.lib wxmsw31ud_adv.lib wxbase31ud_xml.lib wxmsw31ud_core.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
AdditionalDependencies="wxmsw31ud_html.lib wxbase31ud_xml.lib wxmsw31ud_core.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="vc_mswuddll\forty.exe"
LinkIncremental="2"
SuppressStartupBanner="true"
@@ -359,7 +359,7 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalDependencies="wxmsw31u_html.lib wxmsw31u_adv.lib wxbase31u_xml.lib wxmsw31u_core.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
AdditionalDependencies="wxmsw31u_html.lib wxbase31u_xml.lib wxmsw31u_core.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="vc_mswudll\forty.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
@@ -454,7 +454,7 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalDependencies="wxmsw31ud_html.lib wxmsw31ud_adv.lib wxbase31ud_xml.lib wxmsw31ud_core.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
AdditionalDependencies="wxmsw31ud_html.lib wxbase31ud_xml.lib wxmsw31ud_core.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="vc_mswud_x64\forty.exe"
LinkIncremental="2"
SuppressStartupBanner="true"
@@ -545,7 +545,7 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalDependencies="wxmsw31u_html.lib wxmsw31u_adv.lib wxbase31u_xml.lib wxmsw31u_core.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
AdditionalDependencies="wxmsw31u_html.lib wxbase31u_xml.lib wxmsw31u_core.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="vc_mswu_x64\forty.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
@@ -640,7 +640,7 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalDependencies="wxmsw31ud_html.lib wxmsw31ud_adv.lib wxbase31ud_xml.lib wxmsw31ud_core.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
AdditionalDependencies="wxmsw31ud_html.lib wxbase31ud_xml.lib wxmsw31ud_core.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="vc_mswuddll_x64\forty.exe"
LinkIncremental="2"
SuppressStartupBanner="true"
@@ -731,7 +731,7 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalDependencies="wxmsw31u_html.lib wxmsw31u_adv.lib wxbase31u_xml.lib wxmsw31u_core.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
AdditionalDependencies="wxmsw31u_html.lib wxbase31u_xml.lib wxmsw31u_core.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="vc_mswudll_x64\forty.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
+1 -5
View File
@@ -175,10 +175,6 @@ __WXLIB_HTML_p = \
wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
!endif
!if "$(MONOLITHIC)" == "0"
__WXLIB_ADV_p = \
wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
!endif
!if "$(MONOLITHIC)" == "0"
__WXLIB_XML_p = \
wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib
!endif
@@ -247,7 +243,7 @@ clean:
$(OBJS)\forty.exe: $(FORTY_OBJECTS) $(OBJS)\forty_forty.res
ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
c0w32.obj $(FORTY_OBJECTS),$@,, $(__WXLIB_HTML_p) $(__WXLIB_ADV_p) $(__WXLIB_XML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\forty_forty.res
c0w32.obj $(FORTY_OBJECTS),$@,, $(__WXLIB_HTML_p) $(__WXLIB_XML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\forty_forty.res
|
data:
+1 -5
View File
@@ -160,10 +160,6 @@ __WXLIB_HTML_p = \
-lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html
endif
ifeq ($(MONOLITHIC),0)
__WXLIB_ADV_p = \
-lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv
endif
ifeq ($(MONOLITHIC),0)
__WXLIB_XML_p = \
-lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml
endif
@@ -237,7 +233,7 @@ clean:
-if exist $(OBJS)\forty.exe del $(OBJS)\forty.exe
$(OBJS)\forty.exe: $(FORTY_OBJECTS) $(OBJS)\forty_forty_rc.o
$(CXX) -o $@ $(FORTY_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_HTML_p) $(__WXLIB_ADV_p) $(__WXLIB_XML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
$(CXX) -o $@ $(FORTY_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_HTML_p) $(__WXLIB_XML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
data:
if not exist $(OBJS) mkdir $(OBJS)
+1 -5
View File
@@ -313,10 +313,6 @@ __WXLIB_HTML_p = \
wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
!endif
!if "$(MONOLITHIC)" == "0"
__WXLIB_ADV_p = \
wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
!endif
!if "$(MONOLITHIC)" == "0"
__WXLIB_XML_p = \
wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib
!endif
@@ -370,7 +366,7 @@ clean:
$(OBJS)\forty.exe: $(FORTY_OBJECTS) $(OBJS)\forty_forty.res
link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\forty.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<
$(FORTY_OBJECTS) $(FORTY_RESOURCES) $(__WXLIB_HTML_p) $(__WXLIB_ADV_p) $(__WXLIB_XML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib
$(FORTY_OBJECTS) $(FORTY_RESOURCES) $(__WXLIB_HTML_p) $(__WXLIB_XML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib
<<
data:
+2
View File
@@ -101,6 +101,8 @@ All:
All (GUI):
- wxAdvanced library was merged into wxCore, simply remove all references
to "adv" from your build system, it is not needed any longer.
- Add wxDataViewToggleRenderer::ShowAsRadio().
- Improve stock items consistency and aesthetics (dhowland).
- Fix bug with missing items in overflowing AUI toolbar (Maarten Bent).
+12 -29
View File
@@ -29,7 +29,6 @@ digraph Dependencies
wxNet [fillcolor = deepskyblue, URL = "\ref page_libs_wxnet"];
wxXML [fillcolor = deepskyblue, URL = "\ref page_libs_wxxml"];
wxAdvanced [fillcolor = green, URL = "\ref page_libs_wxadv"];
wxAUI [fillcolor = green, URL = "\ref page_libs_wxaui"];
wxGL [fillcolor = green, URL = "\ref page_libs_wxgl"];
wxHTML [fillcolor = green, URL = "\ref page_libs_wxhtml"];
@@ -46,17 +45,16 @@ digraph Dependencies
wxNet -> wxBase;
wxXML -> wxBase;
wxAdvanced -> wxCore;
wxAUI -> wxAdvanced; wxAUI -> wxHTML;
wxAUI -> wxCore; wxAUI -> wxHTML;
wxGL -> wxCore;
wxHTML -> wxCore;
wxMedia -> wxCore;
wxPropertyGrid -> wxAdvanced;
wxPropertyGrid -> wxCore;
wxQA -> wxCore; wxQA -> wxXML;
wxRibbon -> wxCore;
wxRichText -> wxAdvanced; wxRichText -> wxHTML; wxRichText -> wxXML;
wxRichText -> wxCore; wxRichText -> wxHTML; wxRichText -> wxXML;
wxSTC -> wxCore;
wxXRC -> wxAdvanced; wxXRC -> wxHTML; wxXRC -> wxXML;
wxXRC -> wxCore; wxXRC -> wxHTML; wxXRC -> wxXML;
wxWebView -> wxCore;
}
@enddot
@@ -66,32 +64,17 @@ libraries depend on the @ref page_libs_wxbase library (i.e. they are non-GUI
libraries), and all green libraries depend on the @ref page_libs_wxcore library
(i.e. they are GUI libraries).
@section page_libs_wxadv wxAdvanced
Advanced or rarely used GUI classes:
@li wxCalendarCtrl
@li wxGrid classes
@li wxJoystick
@li wxLayoutAlgorithm
@li wxSplashScreen
@li wxTaskBarIcon
@li wxSound
@li wxWizard
@li wxSashLayoutWindow
@li wxSashWindow
@li ...others
Requires @ref page_libs_wxcore and @ref page_libs_wxbase.
@note Until wxWidgets 3.1.2 some core GUI classes were in a separate wxAdvanced
library, but this library was merged into wxCore and, while it's still
preserved as an empty library for compatibility, should be never used any
longer and will disappear completely in the future.
@section page_libs_wxaui wxAui
This contains the Advanced User Interface docking library.
Requires @ref page_libs_wxadv, @ref page_libs_wxhtml, @ref page_libs_wxxml,
Requires @ref page_libs_wxhtml, @ref page_libs_wxxml,
@ref page_libs_wxcore, @ref page_libs_wxbase.
@@ -156,7 +139,7 @@ Requires @ref page_libs_wxbase.
This contains the wxPropertyGrid control.
Requires @ref page_libs_wxadv, @ref page_libs_wxcore, @ref page_libs_wxbase.
Requires @ref page_libs_wxcore, @ref page_libs_wxbase.
@section page_libs_wxqa wxQA
@@ -179,7 +162,7 @@ Requires @ref page_libs_wxcore, @ref page_libs_wxbase.
This contains generic rich text control functionality.
Requires @ref page_libs_wxadv, @ref page_libs_wxhtml, @ref page_libs_wxxml,
Requires @ref page_libs_wxhtml, @ref page_libs_wxxml,
@ref page_libs_wxcore, @ref page_libs_wxbase.
@@ -209,7 +192,7 @@ Requires @ref page_libs_wxbase.
This library contains wxXmlResource class that provides access to XML resource
files in XRC format.
Requires @ref page_libs_wxadv, @ref page_libs_wxhtml, @ref page_libs_wxxml,
Requires @ref page_libs_wxhtml, @ref page_libs_wxxml,
@ref page_libs_wxcore, @ref page_libs_wxbase.
*/
+3 -3
View File
@@ -14,13 +14,13 @@
#if wxUSE_ADDREMOVECTRL
extern WXDLLIMPEXP_DATA_ADV(const char) wxAddRemoveCtrlNameStr[];
extern WXDLLIMPEXP_DATA_CORE(const char) wxAddRemoveCtrlNameStr[];
// ----------------------------------------------------------------------------
// wxAddRemoveAdaptor: used by wxAddRemoveCtrl to work with the list control
// ----------------------------------------------------------------------------
class WXDLLIMPEXP_ADV wxAddRemoveAdaptor
class WXDLLIMPEXP_CORE wxAddRemoveAdaptor
{
public:
// Default ctor and trivial but virtual dtor.
@@ -53,7 +53,7 @@ private:
// wxAddRemoveCtrl: a list-like control combined with add/remove buttons
// ----------------------------------------------------------------------------
class WXDLLIMPEXP_ADV wxAddRemoveCtrl : public wxPanel
class WXDLLIMPEXP_CORE wxAddRemoveCtrl : public wxPanel
{
public:
wxAddRemoveCtrl()
+5 -5
View File
@@ -20,17 +20,17 @@
#include "wx/timer.h"
#include "wx/bitmap.h"
class WXDLLIMPEXP_FWD_ADV wxAnimation;
class WXDLLIMPEXP_FWD_CORE wxAnimation;
extern WXDLLIMPEXP_DATA_ADV(wxAnimation) wxNullAnimation;
extern WXDLLIMPEXP_DATA_ADV(const char) wxAnimationCtrlNameStr[];
extern WXDLLIMPEXP_DATA_CORE(wxAnimation) wxNullAnimation;
extern WXDLLIMPEXP_DATA_CORE(const char) wxAnimationCtrlNameStr[];
// ----------------------------------------------------------------------------
// wxAnimationBase
// ----------------------------------------------------------------------------
class WXDLLIMPEXP_ADV wxAnimationBase : public wxObject
class WXDLLIMPEXP_CORE wxAnimationBase : public wxObject
{
public:
wxAnimationBase() {}
@@ -66,7 +66,7 @@ protected:
// auto-resizes by default to fit the new animation when SetAnimation() is called
#define wxAC_DEFAULT_STYLE (wxBORDER_NONE)
class WXDLLIMPEXP_ADV wxAnimationCtrlBase : public wxControl
class WXDLLIMPEXP_CORE wxAnimationCtrlBase : public wxControl
{
public:
wxAnimationCtrlBase() { }
+2 -2
View File
@@ -22,13 +22,13 @@ class WXDLLIMPEXP_FWD_CORE wxBitmap;
class WXDLLIMPEXP_FWD_CORE wxColour;
class WXDLLIMPEXP_FWD_CORE wxDC;
extern WXDLLIMPEXP_DATA_ADV(const char) wxBannerWindowNameStr[];
extern WXDLLIMPEXP_DATA_CORE(const char) wxBannerWindowNameStr[];
// ----------------------------------------------------------------------------
// A simple banner window showing either a bitmap or text.
// ----------------------------------------------------------------------------
class WXDLLIMPEXP_ADV wxBannerWindow : public wxWindow
class WXDLLIMPEXP_CORE wxBannerWindow : public wxWindow
{
public:
// Default constructor, use Create() later.
+2 -2
View File
@@ -31,10 +31,10 @@ class WXDLLIMPEXP_FWD_CORE wxItemContainer;
class WXDLLIMPEXP_FWD_CORE wxDC;
#endif
extern WXDLLIMPEXP_DATA_ADV(const char) wxBitmapComboBoxNameStr[];
extern WXDLLIMPEXP_DATA_CORE(const char) wxBitmapComboBoxNameStr[];
class WXDLLIMPEXP_ADV wxBitmapComboBoxBase
class WXDLLIMPEXP_CORE wxBitmapComboBoxBase
{
public:
// ctors and such

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