Add DPI Awareness option to nmake makefiles and MSVC projects.

See https://github.com/wxWidgets/wxWidgets/pull/1664
This commit is contained in:
Vadim Zeitlin
2019-12-03 02:29:25 +01:00
894 changed files with 8517 additions and 3909 deletions

View File

@@ -417,22 +417,22 @@ distclean: clean
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
test$(EXEEXT): $(TEST_OBJECTS)
$(CXX) -o $@ $(TEST_OBJECTS) -L$(LIBDIRNAME) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_NET_p) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
$(CXX) -o $@ $(TEST_OBJECTS) -L$(LIBDIRNAME) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_NET_p) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
@COND_USE_PCH_1@./.pch/testprec_test/testprec.h.gch:
@COND_USE_PCH_1@ $(BK_MAKE_PCH) ./.pch/testprec_test/testprec.h.gch testprec.h $(CXX) $(TEST_CXXFLAGS)
@COND_USE_GUI_1@test_drawing$(EXEEXT): $(TEST_DRAWING_OBJECTS)
@COND_USE_GUI_1@ $(CXX) -o $@ $(TEST_DRAWING_OBJECTS) -L$(LIBDIRNAME) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_NET_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)
@COND_USE_GUI_1@ $(CXX) -o $@ $(TEST_DRAWING_OBJECTS) -L$(LIBDIRNAME) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_NET_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)
@COND_USE_PCH_1@./.pch/testprec_test_drawing/testprec.h.gch:
@COND_USE_PCH_1@ $(BK_MAKE_PCH) ./.pch/testprec_test_drawing/testprec.h.gch testprec.h $(CXX) $(TEST_DRAWING_CXXFLAGS)
@COND_SHARED_1_USE_GUI_1@$(DLLPREFIX_MODULE)test_drawingplugin.$(SO_SUFFIX_MODULE): $(TEST_DRAWINGPLUGIN_OBJECTS)
@COND_SHARED_1_USE_GUI_1@ $(SHARED_LD_MODULE_CXX) $@ $(TEST_DRAWINGPLUGIN_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS) $(__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)
@COND_SHARED_1_USE_GUI_1@ $(SHARED_LD_MODULE_CXX) $@ $(TEST_DRAWINGPLUGIN_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS) $(__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)
@COND_USE_GUI_1@test_gui$(EXEEXT): $(TEST_GUI_OBJECTS) $(__test_gui___win32rc)
@COND_USE_GUI_1@ $(CXX) -o $@ $(TEST_GUI_OBJECTS) -L$(LIBDIRNAME) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_WEBVIEW_p) $(__WXLIB_STC_p) $(__WXLIB_AUI_p) $(__WXLIB_RICHTEXT_p) $(__WXLIB_MEDIA_p) $(EXTRALIBS_MEDIA) $(__WXLIB_XRC_p) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p) $(__WXLIB_NET_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)
@COND_USE_GUI_1@ $(CXX) -o $@ $(TEST_GUI_OBJECTS) -L$(LIBDIRNAME) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_WEBVIEW_p) $(__WXLIB_STC_p) $(__WXLIB_AUI_p) $(__WXLIB_RICHTEXT_p) $(__WXLIB_MEDIA_p) $(EXTRALIBS_MEDIA) $(__WXLIB_XRC_p) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p) $(__WXLIB_NET_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)
@COND_PLATFORM_MACOSX_1_USE_GUI_1@test_gui.app/Contents/PkgInfo: $(__test_gui___depname) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
@COND_PLATFORM_MACOSX_1_USE_GUI_1@ mkdir -p test_gui.app/Contents

View File

@@ -199,7 +199,7 @@ distclean: clean
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
bench$(EXEEXT): $(BENCH_OBJECTS)
$(CXX) -o $@ $(BENCH_OBJECTS) -L$(LIBDIRNAME) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
$(CXX) -o $@ $(BENCH_OBJECTS) -L$(LIBDIRNAME) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
data:
@mkdir -p .
@@ -214,7 +214,7 @@ data:
done
@COND_USE_GUI_1@bench_gui$(EXEEXT): $(BENCH_GUI_OBJECTS) $(__bench_gui___win32rc)
@COND_USE_GUI_1@ $(CXX) -o $@ $(BENCH_GUI_OBJECTS) -L$(LIBDIRNAME) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__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)
@COND_USE_GUI_1@ $(CXX) -o $@ $(BENCH_GUI_OBJECTS) -L$(LIBDIRNAME) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__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)
@COND_PLATFORM_MACOSX_1_USE_GUI_1@bench_gui.app/Contents/PkgInfo: $(__bench_gui___depname) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
@COND_PLATFORM_MACOSX_1_USE_GUI_1@ mkdir -p bench_gui.app/Contents
@@ -239,7 +239,7 @@ data:
@COND_PLATFORM_MACOSX_1_USE_GUI_1@bench_gui_bundle: $(____bench_gui_BUNDLE_TGT_REF_DEP)
@COND_USE_GUI_1@bench_graphics$(EXEEXT): $(BENCH_GRAPHICS_OBJECTS) $(__bench_graphics___win32rc)
@COND_USE_GUI_1@ $(CXX) -o $@ $(BENCH_GRAPHICS_OBJECTS) -L$(LIBDIRNAME) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX) $(EXTRALIBS_OPENGL) $(__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)
@COND_USE_GUI_1@ $(CXX) -o $@ $(BENCH_GRAPHICS_OBJECTS) -L$(LIBDIRNAME) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX) $(EXTRALIBS_OPENGL) $(__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)
@COND_PLATFORM_MACOSX_1_USE_GUI_1@bench_graphics.app/Contents/PkgInfo: $(__bench_graphics___depname) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
@COND_PLATFORM_MACOSX_1_USE_GUI_1@ mkdir -p bench_graphics.app/Contents

View File

@@ -45,7 +45,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/wx-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxbase31ud_net.lib wxbase31ud.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\bench.exe"
LinkIncremental="2"
@@ -107,7 +107,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/wx-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxbase31u_net.lib wxbase31u.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\bench.exe"
LinkIncremental="1"
@@ -174,7 +174,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/wx-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxbase31ud_net.lib wxbase31ud.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\bench.exe"
LinkIncremental="2"
@@ -236,7 +236,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/wx-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxbase31u_net.lib wxbase31u.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\bench.exe"
LinkIncremental="1"

View File

@@ -45,7 +45,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/wx-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxmsw31ud_core.lib wxbase31ud.lib wxmsw31ud_gl.lib opengl32.lib glu32.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\bench_graphics.exe"
LinkIncremental="2"
@@ -107,7 +107,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/wx-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxmsw31u_core.lib wxbase31u.lib wxmsw31u_gl.lib opengl32.lib glu32.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\bench_graphics.exe"
LinkIncremental="1"
@@ -174,7 +174,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/wx-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxmsw31ud_core.lib wxbase31ud.lib wxmsw31ud_gl.lib opengl32.lib glu32.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\bench_graphics.exe"
LinkIncremental="2"
@@ -236,7 +236,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/wx-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxmsw31u_core.lib wxbase31u.lib wxmsw31u_gl.lib opengl32.lib glu32.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\bench_graphics.exe"
LinkIncremental="1"

View File

@@ -45,7 +45,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/wx-dpi-aware-pmv2.manifest"
AdditionalDependencies="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\bench_gui.exe"
LinkIncremental="2"
@@ -107,7 +107,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/wx-dpi-aware-pmv2.manifest"
AdditionalDependencies="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\bench_gui.exe"
LinkIncremental="1"
@@ -174,7 +174,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/wx-dpi-aware-pmv2.manifest"
AdditionalDependencies="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\bench_gui.exe"
LinkIncremental="2"
@@ -236,7 +236,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/wx-dpi-aware-pmv2.manifest"
AdditionalDependencies="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\bench_gui.exe"
LinkIncremental="1"

View File

@@ -82,7 +82,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/wx-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxbase31ud_net.lib wxbase31ud.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\bench.exe"
LinkIncremental="2"
@@ -176,7 +176,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/wx-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxbase31u_net.lib wxbase31u.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\bench.exe"
LinkIncremental="1"
@@ -275,7 +275,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/wx-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxbase31ud_net.lib wxbase31ud.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\bench.exe"
LinkIncremental="2"
@@ -369,7 +369,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/wx-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxbase31u_net.lib wxbase31u.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\bench.exe"
LinkIncremental="1"
@@ -468,7 +468,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/amd64-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxbase31ud_net.lib wxbase31ud.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\bench.exe"
LinkIncremental="2"
@@ -562,7 +562,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/amd64-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxbase31u_net.lib wxbase31u.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\bench.exe"
LinkIncremental="1"
@@ -661,7 +661,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/amd64-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxbase31ud_net.lib wxbase31ud.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\bench.exe"
LinkIncremental="2"
@@ -755,7 +755,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/amd64-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxbase31u_net.lib wxbase31u.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\bench.exe"
LinkIncremental="1"

View File

@@ -82,7 +82,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/wx-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxmsw31ud_core.lib wxbase31ud.lib wxmsw31ud_gl.lib opengl32.lib glu32.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\bench_graphics.exe"
LinkIncremental="2"
@@ -176,7 +176,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/wx-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxmsw31u_core.lib wxbase31u.lib wxmsw31u_gl.lib opengl32.lib glu32.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\bench_graphics.exe"
LinkIncremental="1"
@@ -275,7 +275,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/wx-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxmsw31ud_core.lib wxbase31ud.lib wxmsw31ud_gl.lib opengl32.lib glu32.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\bench_graphics.exe"
LinkIncremental="2"
@@ -369,7 +369,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/wx-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxmsw31u_core.lib wxbase31u.lib wxmsw31u_gl.lib opengl32.lib glu32.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\bench_graphics.exe"
LinkIncremental="1"
@@ -468,7 +468,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/amd64-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxmsw31ud_core.lib wxbase31ud.lib wxmsw31ud_gl.lib opengl32.lib glu32.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\bench_graphics.exe"
LinkIncremental="2"
@@ -562,7 +562,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/amd64-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxmsw31u_core.lib wxbase31u.lib wxmsw31u_gl.lib opengl32.lib glu32.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\bench_graphics.exe"
LinkIncremental="1"
@@ -661,7 +661,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/amd64-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxmsw31ud_core.lib wxbase31ud.lib wxmsw31ud_gl.lib opengl32.lib glu32.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\bench_graphics.exe"
LinkIncremental="2"
@@ -755,7 +755,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/amd64-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxmsw31u_core.lib wxbase31u.lib wxmsw31u_gl.lib opengl32.lib glu32.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\bench_graphics.exe"
LinkIncremental="1"

View File

@@ -82,7 +82,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/wx-dpi-aware-pmv2.manifest"
AdditionalDependencies="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\bench_gui.exe"
LinkIncremental="2"
@@ -176,7 +176,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/wx-dpi-aware-pmv2.manifest"
AdditionalDependencies="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\bench_gui.exe"
LinkIncremental="1"
@@ -275,7 +275,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/wx-dpi-aware-pmv2.manifest"
AdditionalDependencies="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\bench_gui.exe"
LinkIncremental="2"
@@ -369,7 +369,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/wx-dpi-aware-pmv2.manifest"
AdditionalDependencies="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\bench_gui.exe"
LinkIncremental="1"
@@ -468,7 +468,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/amd64-dpi-aware-pmv2.manifest"
AdditionalDependencies="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\bench_gui.exe"
LinkIncremental="2"
@@ -562,7 +562,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/amd64-dpi-aware-pmv2.manifest"
AdditionalDependencies="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\bench_gui.exe"
LinkIncremental="1"
@@ -661,7 +661,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/amd64-dpi-aware-pmv2.manifest"
AdditionalDependencies="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\bench_gui.exe"
LinkIncremental="2"
@@ -755,7 +755,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/amd64-dpi-aware-pmv2.manifest"
AdditionalDependencies="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\bench_gui.exe"
LinkIncremental="1"

View File

@@ -81,7 +81,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/wx-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxbase31ud_net.lib wxbase31ud.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\bench.exe"
LinkIncremental="2"
@@ -172,7 +172,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/wx-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxbase31u_net.lib wxbase31u.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\bench.exe"
LinkIncremental="1"
@@ -267,7 +267,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/wx-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxbase31ud_net.lib wxbase31ud.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\bench.exe"
LinkIncremental="2"
@@ -358,7 +358,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/wx-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxbase31u_net.lib wxbase31u.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\bench.exe"
LinkIncremental="1"
@@ -453,7 +453,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/amd64-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxbase31ud_net.lib wxbase31ud.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\bench.exe"
LinkIncremental="2"
@@ -544,7 +544,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/amd64-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxbase31u_net.lib wxbase31u.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\bench.exe"
LinkIncremental="1"
@@ -639,7 +639,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/amd64-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxbase31ud_net.lib wxbase31ud.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\bench.exe"
LinkIncremental="2"
@@ -730,7 +730,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/amd64-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxbase31u_net.lib wxbase31u.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\bench.exe"
LinkIncremental="1"

View File

@@ -81,7 +81,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/wx-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxmsw31ud_core.lib wxbase31ud.lib wxmsw31ud_gl.lib opengl32.lib glu32.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\bench_graphics.exe"
LinkIncremental="2"
@@ -172,7 +172,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/wx-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxmsw31u_core.lib wxbase31u.lib wxmsw31u_gl.lib opengl32.lib glu32.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\bench_graphics.exe"
LinkIncremental="1"
@@ -267,7 +267,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/wx-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxmsw31ud_core.lib wxbase31ud.lib wxmsw31ud_gl.lib opengl32.lib glu32.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\bench_graphics.exe"
LinkIncremental="2"
@@ -358,7 +358,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/wx-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxmsw31u_core.lib wxbase31u.lib wxmsw31u_gl.lib opengl32.lib glu32.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\bench_graphics.exe"
LinkIncremental="1"
@@ -453,7 +453,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/amd64-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxmsw31ud_core.lib wxbase31ud.lib wxmsw31ud_gl.lib opengl32.lib glu32.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\bench_graphics.exe"
LinkIncremental="2"
@@ -544,7 +544,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/amd64-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxmsw31u_core.lib wxbase31u.lib wxmsw31u_gl.lib opengl32.lib glu32.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\bench_graphics.exe"
LinkIncremental="1"
@@ -639,7 +639,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/amd64-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxmsw31ud_core.lib wxbase31ud.lib wxmsw31ud_gl.lib opengl32.lib glu32.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\bench_graphics.exe"
LinkIncremental="2"
@@ -730,7 +730,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/amd64-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxmsw31u_core.lib wxbase31u.lib wxmsw31u_gl.lib opengl32.lib glu32.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\bench_graphics.exe"
LinkIncremental="1"

View File

@@ -81,7 +81,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/wx-dpi-aware-pmv2.manifest"
AdditionalDependencies="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\bench_gui.exe"
LinkIncremental="2"
@@ -172,7 +172,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/wx-dpi-aware-pmv2.manifest"
AdditionalDependencies="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\bench_gui.exe"
LinkIncremental="1"
@@ -267,7 +267,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/wx-dpi-aware-pmv2.manifest"
AdditionalDependencies="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\bench_gui.exe"
LinkIncremental="2"
@@ -358,7 +358,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/wx-dpi-aware-pmv2.manifest"
AdditionalDependencies="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\bench_gui.exe"
LinkIncremental="1"
@@ -453,7 +453,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/amd64-dpi-aware-pmv2.manifest"
AdditionalDependencies="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\bench_gui.exe"
LinkIncremental="2"
@@ -544,7 +544,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/amd64-dpi-aware-pmv2.manifest"
AdditionalDependencies="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\bench_gui.exe"
LinkIncremental="1"
@@ -639,7 +639,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/amd64-dpi-aware-pmv2.manifest"
AdditionalDependencies="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\bench_gui.exe"
LinkIncremental="2"
@@ -730,7 +730,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/amd64-dpi-aware-pmv2.manifest"
AdditionalDependencies="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\bench_gui.exe"
LinkIncremental="1"

View File

@@ -279,7 +279,7 @@ clean:
-if exist $(OBJS)\bench_graphics.ils del $(OBJS)\bench_graphics.ils
$(OBJS)\bench.exe: $(BENCH_OBJECTS)
ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -ap $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @&&|
ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -ap $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @&&|
c0x32.obj $(BENCH_OBJECTS),$@,, $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_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)$(__RUNTIME_LIBS_1).lib,,
|
@@ -289,14 +289,14 @@ data:
!if "$(USE_GUI)" == "1"
$(OBJS)\bench_gui.exe: $(BENCH_GUI_OBJECTS) $(OBJS)\bench_gui_sample.res
ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -ap $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @&&|
ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -ap $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @&&|
c0x32.obj $(BENCH_GUI_OBJECTS),$@,, $(__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)$(__RUNTIME_LIBS_1).lib,, $(OBJS)\bench_gui_sample.res
|
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\bench_graphics.exe: $(BENCH_GRAPHICS_OBJECTS) $(OBJS)\bench_graphics_sample.res
ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -ap $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @&&|
ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -ap $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @&&|
c0x32.obj $(BENCH_GRAPHICS_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib $(__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)$(__RUNTIME_LIBS_1).lib,, $(OBJS)\bench_graphics_sample.res
|
!endif

View File

@@ -265,7 +265,7 @@ clean:
$(OBJS)\bench.exe: $(BENCH_OBJECTS)
$(foreach f,$(subst \,/,$(BENCH_OBJECTS)),$(shell echo $f >> $(subst \,/,$@).rsp.tmp))
@move /y $@.rsp.tmp $@.rsp >nul
$(CXX) -o $@ @$@.rsp $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_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 $@ @$@.rsp $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_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
@-del $@.rsp
data:
@@ -276,7 +276,7 @@ ifeq ($(USE_GUI),1)
$(OBJS)\bench_gui.exe: $(BENCH_GUI_OBJECTS) $(OBJS)\bench_gui_sample_rc.o
$(foreach f,$(subst \,/,$(BENCH_GUI_OBJECTS)),$(shell echo $f >> $(subst \,/,$@).rsp.tmp))
@move /y $@.rsp.tmp $@.rsp >nul
$(CXX) -o $@ @$@.rsp $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) $(__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 $@ @$@.rsp $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) $(__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
@-del $@.rsp
endif
@@ -284,7 +284,7 @@ ifeq ($(USE_GUI),1)
$(OBJS)\bench_graphics.exe: $(BENCH_GRAPHICS_OBJECTS) $(OBJS)\bench_graphics_sample_rc.o
$(foreach f,$(subst \,/,$(BENCH_GRAPHICS_OBJECTS)),$(shell echo $f >> $(subst \,/,$@).rsp.tmp))
@move /y $@.rsp.tmp $@.rsp >nul
$(CXX) -o $@ @$@.rsp $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl -lopengl32 -lglu32 $(__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 $@ @$@.rsp $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl -lopengl32 -lglu32 $(__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
@-del $@.rsp
endif

View File

@@ -149,6 +149,46 @@ LINK_TARGET_CPU = /MACHINE:IA64
!if "$(TARGET_CPU)" == "x64"
LINK_TARGET_CPU = /MACHINE:X64
!endif
!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1"
WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
/MANIFESTINPUT:./../../include/wx/msw/wx-dpi-aware.manifest
!endif
!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1"
WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
/MANIFESTINPUT:./../../include/wx/msw/amd64-dpi-aware.manifest
!endif
!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1"
WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
/MANIFESTINPUT:./../../include/wx/msw/amd64-dpi-aware.manifest
!endif
!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1"
WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
/MANIFESTINPUT:./../../include/wx/msw/amd64-dpi-aware.manifest
!endif
!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1"
WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
/MANIFESTINPUT:./../../include/wx/msw/amd64-dpi-aware.manifest
!endif
!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2"
WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
/MANIFESTINPUT:./../../include/wx/msw/wx-dpi-aware-pmv2.manifest
!endif
!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2"
WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
/MANIFESTINPUT:./../../include/wx/msw/amd64-dpi-aware-pmv2.manifest
!endif
!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2"
WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
/MANIFESTINPUT:./../../include/wx/msw/amd64-dpi-aware-pmv2.manifest
!endif
!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2"
WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
/MANIFESTINPUT:./../../include/wx/msw/amd64-dpi-aware-pmv2.manifest
!endif
!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2"
WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
/MANIFESTINPUT:./../../include/wx/msw/amd64-dpi-aware-pmv2.manifest
!endif
!if "$(MONOLITHIC)" == "0"
EXTRALIBS_FOR_BASE =
!endif
@@ -451,7 +491,7 @@ clean:
-if exist $(OBJS)\bench_graphics.pdb del $(OBJS)\bench_graphics.pdb
$(OBJS)\bench.exe: $(BENCH_OBJECTS)
link /NOLOGO /OUT:$@ $(__DEBUGINFO_3) /pdb:"$(OBJS)\bench.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<<
link /NOLOGO /OUT:$@ $(__DEBUGINFO_3) /pdb:"$(OBJS)\bench.pdb" $(__DEBUGINFO_2) $(WIN32_DPI_LINKFLAG) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<<
$(BENCH_OBJECTS) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_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
<<
@@ -461,14 +501,14 @@ data:
!if "$(USE_GUI)" == "1"
$(OBJS)\bench_gui.exe: $(BENCH_GUI_OBJECTS) $(OBJS)\bench_gui_sample.res
link /NOLOGO /OUT:$@ $(__DEBUGINFO_3) /pdb:"$(OBJS)\bench_gui.pdb" $(__DEBUGINFO_18) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<<
link /NOLOGO /OUT:$@ $(__DEBUGINFO_3) /pdb:"$(OBJS)\bench_gui.pdb" $(__DEBUGINFO_18) $(WIN32_DPI_LINKFLAG) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<<
$(BENCH_GUI_OBJECTS) $(BENCH_GUI_RESOURCES) $(__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
<<
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\bench_graphics.exe: $(BENCH_GRAPHICS_OBJECTS) $(OBJS)\bench_graphics_sample.res
link /NOLOGO /OUT:$@ $(__DEBUGINFO_3) /pdb:"$(OBJS)\bench_graphics.pdb" $(__DEBUGINFO_34) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<<
link /NOLOGO /OUT:$@ $(__DEBUGINFO_3) /pdb:"$(OBJS)\bench_graphics.pdb" $(__DEBUGINFO_34) $(WIN32_DPI_LINKFLAG) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<<
$(BENCH_GRAPHICS_OBJECTS) $(BENCH_GRAPHICS_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib opengl32.lib glu32.lib $(__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
<<
!endif

View File

@@ -509,27 +509,27 @@ clean:
-if exist $(OBJS)\test_gui.ils del $(OBJS)\test_gui.ils
$(OBJS)\test.exe: $(OBJS)\test_dummy.obj $(TEST_OBJECTS)
ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -ap $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @&&|
ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -ap $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @&&|
c0x32.obj $(TEST_OBJECTS),$@,, $(__WXLIB_NET_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_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)$(__RUNTIME_LIBS_2).lib,,
|
!if "$(USE_GUI)" == "1"
$(OBJS)\test_drawing.exe: $(OBJS)\test_drawing_dummy.obj $(TEST_DRAWING_OBJECTS)
ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -ap $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @&&|
ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -ap $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @&&|
c0x32.obj $(TEST_DRAWING_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_NET_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)$(__RUNTIME_LIBS_2).lib,,
|
!endif
!if "$(SHARED)" == "1" && "$(USE_GUI)" == "1"
$(OBJS)\test_drawingplugin.dll: $(TEST_DRAWINGPLUGIN_OBJECTS)
ilink32 -Tpd -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @&&|
ilink32 -Tpd -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @&&|
c0d32.obj $(TEST_DRAWINGPLUGIN_OBJECTS),$@,, $(__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)$(__RUNTIME_LIBS_2).lib,,
|
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\test_gui.exe: $(OBJS)\test_gui_dummy.obj $(TEST_GUI_OBJECTS) $(OBJS)\test_gui_sample.res
ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -ap $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @&&|
ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -ap $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @&&|
c0x32.obj $(TEST_GUI_OBJECTS),$@,, $(__WXLIB_WEBVIEW_p) $(__WXLIB_STC_p) $(__WXLIB_AUI_p) $(__WXLIB_RICHTEXT_p) $(__WXLIB_MEDIA_p) $(__WXLIB_XRC_p) $(__WXLIB_XML_p) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_NET_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)$(__RUNTIME_LIBS_2).lib,, $(OBJS)\test_gui_sample.res
|
!endif

View File

@@ -496,21 +496,21 @@ clean:
$(OBJS)\test.exe: $(TEST_OBJECTS)
$(foreach f,$(subst \,/,$(TEST_OBJECTS)),$(shell echo $f >> $(subst \,/,$@).rsp.tmp))
@move /y $@.rsp.tmp $@.rsp >nul
$(CXX) -o $@ @$@.rsp $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) $(__WXLIB_NET_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_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 $@ @$@.rsp $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) $(__WXLIB_NET_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_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
@-del $@.rsp
ifeq ($(USE_GUI),1)
$(OBJS)\test_drawing.exe: $(TEST_DRAWING_OBJECTS)
$(foreach f,$(subst \,/,$(TEST_DRAWING_OBJECTS)),$(shell echo $f >> $(subst \,/,$@).rsp.tmp))
@move /y $@.rsp.tmp $@.rsp >nul
$(CXX) -o $@ @$@.rsp $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_NET_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 $@ @$@.rsp $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_NET_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
@-del $@.rsp
endif
ifeq ($(SHARED),1)
ifeq ($(USE_GUI),1)
$(OBJS)\test_drawingplugin.dll: $(TEST_DRAWINGPLUGIN_OBJECTS)
$(CXX) $(LINK_MODULE_FLAGS) -fPIC -o $@ $(TEST_DRAWINGPLUGIN_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) $(__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) $(LINK_MODULE_FLAGS) -fPIC -o $@ $(TEST_DRAWINGPLUGIN_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) $(__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
endif
endif
@@ -518,7 +518,7 @@ ifeq ($(USE_GUI),1)
$(OBJS)\test_gui.exe: $(TEST_GUI_OBJECTS) $(OBJS)\test_gui_sample_rc.o
$(foreach f,$(subst \,/,$(TEST_GUI_OBJECTS)),$(shell echo $f >> $(subst \,/,$@).rsp.tmp))
@move /y $@.rsp.tmp $@.rsp >nul
$(CXX) -o $@ @$@.rsp $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) $(__WXLIB_WEBVIEW_p) $(__WXLIB_STC_p) $(__WXLIB_AUI_p) $(__WXLIB_RICHTEXT_p) $(__WXLIB_MEDIA_p) $(__WXLIB_XRC_p) $(__WXLIB_XML_p) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_NET_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 $@ @$@.rsp $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) $(__WXLIB_WEBVIEW_p) $(__WXLIB_STC_p) $(__WXLIB_AUI_p) $(__WXLIB_RICHTEXT_p) $(__WXLIB_MEDIA_p) $(__WXLIB_XRC_p) $(__WXLIB_XML_p) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_NET_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
@-del $@.rsp
endif

View File

@@ -342,6 +342,46 @@ LINK_TARGET_CPU = /MACHINE:IA64
!if "$(TARGET_CPU)" == "x64"
LINK_TARGET_CPU = /MACHINE:X64
!endif
!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1"
WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
/MANIFESTINPUT:./../include/wx/msw/wx-dpi-aware.manifest
!endif
!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1"
WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
/MANIFESTINPUT:./../include/wx/msw/amd64-dpi-aware.manifest
!endif
!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1"
WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
/MANIFESTINPUT:./../include/wx/msw/amd64-dpi-aware.manifest
!endif
!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1"
WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
/MANIFESTINPUT:./../include/wx/msw/amd64-dpi-aware.manifest
!endif
!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1"
WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
/MANIFESTINPUT:./../include/wx/msw/amd64-dpi-aware.manifest
!endif
!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2"
WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
/MANIFESTINPUT:./../include/wx/msw/wx-dpi-aware-pmv2.manifest
!endif
!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2"
WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
/MANIFESTINPUT:./../include/wx/msw/amd64-dpi-aware-pmv2.manifest
!endif
!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2"
WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
/MANIFESTINPUT:./../include/wx/msw/amd64-dpi-aware-pmv2.manifest
!endif
!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2"
WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
/MANIFESTINPUT:./../include/wx/msw/amd64-dpi-aware-pmv2.manifest
!endif
!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2"
WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
/MANIFESTINPUT:./../include/wx/msw/amd64-dpi-aware-pmv2.manifest
!endif
!if "$(MONOLITHIC)" == "0"
EXTRALIBS_FOR_BASE =
!endif
@@ -700,27 +740,27 @@ clean:
-if exist $(OBJS)\test_gui.pdb del $(OBJS)\test_gui.pdb
$(OBJS)\test.exe: $(OBJS)\test_dummy.obj $(TEST_OBJECTS)
link /NOLOGO /OUT:$@ $(__DEBUGINFO_4) /pdb:"$(OBJS)\test.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<<
link /NOLOGO /OUT:$@ $(__DEBUGINFO_4) /pdb:"$(OBJS)\test.pdb" $(__DEBUGINFO_2) $(WIN32_DPI_LINKFLAG) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<<
$(TEST_OBJECTS) $(__WXLIB_NET_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_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
<<
!if "$(USE_GUI)" == "1"
$(OBJS)\test_drawing.exe: $(OBJS)\test_drawing_dummy.obj $(TEST_DRAWING_OBJECTS)
link /NOLOGO /OUT:$@ $(__DEBUGINFO_4) /pdb:"$(OBJS)\test_drawing.pdb" $(__DEBUGINFO_19) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<<
link /NOLOGO /OUT:$@ $(__DEBUGINFO_4) /pdb:"$(OBJS)\test_drawing.pdb" $(__DEBUGINFO_19) $(WIN32_DPI_LINKFLAG) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<<
$(TEST_DRAWING_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_NET_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
<<
!endif
!if "$(SHARED)" == "1" && "$(USE_GUI)" == "1"
$(OBJS)\test_drawingplugin.dll: $(TEST_DRAWINGPLUGIN_OBJECTS)
link /DLL /NOLOGO /OUT:$@ $(__DEBUGINFO_4) /pdb:"$(OBJS)\test_drawingplugin.pdb" $(__DEBUGINFO_37) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<<
link /DLL /NOLOGO /OUT:$@ $(__DEBUGINFO_4) /pdb:"$(OBJS)\test_drawingplugin.pdb" $(__DEBUGINFO_37) $(WIN32_DPI_LINKFLAG) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<<
$(TEST_DRAWINGPLUGIN_OBJECTS) $(__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
<<
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\test_gui.exe: $(OBJS)\test_gui_dummy.obj $(TEST_GUI_OBJECTS) $(OBJS)\test_gui_sample.res
link /NOLOGO /OUT:$@ $(__DEBUGINFO_4) /pdb:"$(OBJS)\test_gui.pdb" $(__DEBUGINFO_51) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<<
link /NOLOGO /OUT:$@ $(__DEBUGINFO_4) /pdb:"$(OBJS)\test_gui.pdb" $(__DEBUGINFO_51) $(WIN32_DPI_LINKFLAG) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<<
$(TEST_GUI_OBJECTS) $(TEST_GUI_RESOURCES) $(__WXLIB_WEBVIEW_p) $(__WXLIB_STC_p) $(__WXLIB_AUI_p) $(__WXLIB_RICHTEXT_p) $(__WXLIB_MEDIA_p) $(__WXLIB_XRC_p) $(__WXLIB_XML_p) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_NET_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
<<
!endif

View File

@@ -165,6 +165,9 @@
<Bscmake>
<SuppressStartupBanner>true</SuppressStartupBanner>
</Bscmake>
<Manifest>
<AdditionalManifestFiles>./../include/wx/msw/wx-dpi-aware-pmv2.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
</Manifest>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Midl>
@@ -205,6 +208,9 @@
<Bscmake>
<SuppressStartupBanner>true</SuppressStartupBanner>
</Bscmake>
<Manifest>
<AdditionalManifestFiles>./../include/wx/msw/wx-dpi-aware-pmv2.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
</Manifest>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">
<Midl>
@@ -245,6 +251,9 @@
<Bscmake>
<SuppressStartupBanner>true</SuppressStartupBanner>
</Bscmake>
<Manifest>
<AdditionalManifestFiles>./../include/wx/msw/wx-dpi-aware-pmv2.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
</Manifest>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">
<Midl>
@@ -285,6 +294,9 @@
<Bscmake>
<SuppressStartupBanner>true</SuppressStartupBanner>
</Bscmake>
<Manifest>
<AdditionalManifestFiles>./../include/wx/msw/wx-dpi-aware-pmv2.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
</Manifest>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<Midl>
@@ -325,6 +337,9 @@
<Bscmake>
<SuppressStartupBanner>true</SuppressStartupBanner>
</Bscmake>
<Manifest>
<AdditionalManifestFiles>./../include/wx/msw/amd64-dpi-aware-pmv2.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
</Manifest>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<Midl>
@@ -365,6 +380,9 @@
<Bscmake>
<SuppressStartupBanner>true</SuppressStartupBanner>
</Bscmake>
<Manifest>
<AdditionalManifestFiles>./../include/wx/msw/amd64-dpi-aware-pmv2.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
</Manifest>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">
<Midl>
@@ -405,6 +423,9 @@
<Bscmake>
<SuppressStartupBanner>true</SuppressStartupBanner>
</Bscmake>
<Manifest>
<AdditionalManifestFiles>./../include/wx/msw/amd64-dpi-aware-pmv2.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
</Manifest>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">
<Midl>
@@ -445,6 +466,9 @@
<Bscmake>
<SuppressStartupBanner>true</SuppressStartupBanner>
</Bscmake>
<Manifest>
<AdditionalManifestFiles>./../include/wx/msw/amd64-dpi-aware-pmv2.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
</Manifest>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="any\anytest.cpp" />

View File

@@ -164,6 +164,9 @@
<Bscmake>
<SuppressStartupBanner>true</SuppressStartupBanner>
</Bscmake>
<Manifest>
<AdditionalManifestFiles>./../include/wx/msw/wx-dpi-aware-pmv2.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
</Manifest>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Midl>
@@ -204,6 +207,9 @@
<Bscmake>
<SuppressStartupBanner>true</SuppressStartupBanner>
</Bscmake>
<Manifest>
<AdditionalManifestFiles>./../include/wx/msw/wx-dpi-aware-pmv2.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
</Manifest>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">
<Midl>
@@ -244,6 +250,9 @@
<Bscmake>
<SuppressStartupBanner>true</SuppressStartupBanner>
</Bscmake>
<Manifest>
<AdditionalManifestFiles>./../include/wx/msw/wx-dpi-aware-pmv2.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
</Manifest>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">
<Midl>
@@ -284,6 +293,9 @@
<Bscmake>
<SuppressStartupBanner>true</SuppressStartupBanner>
</Bscmake>
<Manifest>
<AdditionalManifestFiles>./../include/wx/msw/wx-dpi-aware-pmv2.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
</Manifest>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<Midl>
@@ -324,6 +336,9 @@
<Bscmake>
<SuppressStartupBanner>true</SuppressStartupBanner>
</Bscmake>
<Manifest>
<AdditionalManifestFiles>./../include/wx/msw/amd64-dpi-aware-pmv2.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
</Manifest>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<Midl>
@@ -364,6 +379,9 @@
<Bscmake>
<SuppressStartupBanner>true</SuppressStartupBanner>
</Bscmake>
<Manifest>
<AdditionalManifestFiles>./../include/wx/msw/amd64-dpi-aware-pmv2.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
</Manifest>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">
<Midl>
@@ -404,6 +422,9 @@
<Bscmake>
<SuppressStartupBanner>true</SuppressStartupBanner>
</Bscmake>
<Manifest>
<AdditionalManifestFiles>./../include/wx/msw/amd64-dpi-aware-pmv2.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
</Manifest>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">
<Midl>
@@ -444,6 +465,9 @@
<Bscmake>
<SuppressStartupBanner>true</SuppressStartupBanner>
</Bscmake>
<Manifest>
<AdditionalManifestFiles>./../include/wx/msw/amd64-dpi-aware-pmv2.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
</Manifest>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="asserthelper.cpp" />

View File

@@ -37,28 +37,16 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "aui", "..\build\msw\wx_aui.
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug Static|Win32 = Debug Static|Win32
Debug Static|x64 = Debug Static|x64
Debug Unicode|Win32 = Debug Unicode|Win32
Debug Unicode|x64 = Debug Unicode|x64
Debug|Win32 = Debug|Win32
Debug|x64 = Debug|x64
DLL Debug|Win32 = DLL Debug|Win32
DLL Debug|x64 = DLL Debug|x64
DLL Release|Win32 = DLL Release|Win32
DLL Release|x64 = DLL Release|x64
Release Static|Win32 = Release Static|Win32
Release Static|x64 = Release Static|x64
Release Unicode|Win32 = Release Unicode|Win32
Release Unicode|x64 = Release Unicode|x64
Release|Win32 = Release|Win32
Release|x64 = Release|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Debug Static|Win32.ActiveCfg = Debug|Win32
{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Debug Static|x64.ActiveCfg = Debug|x64
{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Debug Unicode|x64.ActiveCfg = Debug|x64
{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Debug|Win32.ActiveCfg = Debug|Win32
{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Debug|Win32.Build.0 = Debug|Win32
{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Debug|x64.ActiveCfg = Debug|x64
@@ -71,18 +59,10 @@ Global
{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.DLL Release|Win32.Build.0 = DLL Release|Win32
{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.DLL Release|x64.ActiveCfg = DLL Release|x64
{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.DLL Release|x64.Build.0 = DLL Release|x64
{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Release Static|Win32.ActiveCfg = Release|Win32
{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Release Static|x64.ActiveCfg = Release|x64
{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Release Unicode|Win32.ActiveCfg = Release|Win32
{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Release Unicode|x64.ActiveCfg = Release|x64
{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Release|Win32.ActiveCfg = Release|Win32
{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Release|Win32.Build.0 = Release|Win32
{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Release|x64.ActiveCfg = Release|x64
{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Release|x64.Build.0 = Release|x64
{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Debug Static|Win32.ActiveCfg = Debug|Win32
{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Debug Static|x64.ActiveCfg = Debug|x64
{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Debug Unicode|x64.ActiveCfg = Debug|x64
{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Debug|Win32.ActiveCfg = Debug|Win32
{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Debug|Win32.Build.0 = Debug|Win32
{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Debug|x64.ActiveCfg = Debug|x64
@@ -95,18 +75,10 @@ Global
{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Release|Win32.Build.0 = DLL Release|Win32
{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Release|x64.ActiveCfg = DLL Release|x64
{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Release|x64.Build.0 = DLL Release|x64
{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release Static|Win32.ActiveCfg = Release|Win32
{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release Static|x64.ActiveCfg = Release|x64
{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release Unicode|Win32.ActiveCfg = Release|Win32
{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release Unicode|x64.ActiveCfg = Release|x64
{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release|Win32.ActiveCfg = Release|Win32
{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release|Win32.Build.0 = Release|Win32
{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release|x64.ActiveCfg = Release|x64
{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release|x64.Build.0 = Release|x64
{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Debug Static|Win32.ActiveCfg = Debug|Win32
{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Debug Static|x64.ActiveCfg = Debug|x64
{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Debug Unicode|x64.ActiveCfg = Debug|x64
{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Debug|Win32.ActiveCfg = Debug|Win32
{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Debug|Win32.Build.0 = Debug|Win32
{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Debug|x64.ActiveCfg = Debug|x64
@@ -119,18 +91,10 @@ Global
{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Release|Win32.Build.0 = DLL Release|Win32
{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Release|x64.ActiveCfg = DLL Release|x64
{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Release|x64.Build.0 = DLL Release|x64
{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release Static|Win32.ActiveCfg = Release|Win32
{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release Static|x64.ActiveCfg = Release|x64
{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release Unicode|Win32.ActiveCfg = Release|Win32
{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release Unicode|x64.ActiveCfg = Release|x64
{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release|Win32.ActiveCfg = Release|Win32
{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release|Win32.Build.0 = Release|Win32
{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release|x64.ActiveCfg = Release|x64
{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release|x64.Build.0 = Release|x64
{7FB0902D-8579-5DCE-B883-DAF66A885005}.Debug Static|Win32.ActiveCfg = Debug|Win32
{7FB0902D-8579-5DCE-B883-DAF66A885005}.Debug Static|x64.ActiveCfg = Debug|x64
{7FB0902D-8579-5DCE-B883-DAF66A885005}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
{7FB0902D-8579-5DCE-B883-DAF66A885005}.Debug Unicode|x64.ActiveCfg = Debug|x64
{7FB0902D-8579-5DCE-B883-DAF66A885005}.Debug|Win32.ActiveCfg = Debug|Win32
{7FB0902D-8579-5DCE-B883-DAF66A885005}.Debug|Win32.Build.0 = Debug|Win32
{7FB0902D-8579-5DCE-B883-DAF66A885005}.Debug|x64.ActiveCfg = Debug|x64
@@ -143,18 +107,10 @@ Global
{7FB0902D-8579-5DCE-B883-DAF66A885005}.DLL Release|Win32.Build.0 = DLL Release|Win32
{7FB0902D-8579-5DCE-B883-DAF66A885005}.DLL Release|x64.ActiveCfg = DLL Release|x64
{7FB0902D-8579-5DCE-B883-DAF66A885005}.DLL Release|x64.Build.0 = DLL Release|x64
{7FB0902D-8579-5DCE-B883-DAF66A885005}.Release Static|Win32.ActiveCfg = Release|Win32
{7FB0902D-8579-5DCE-B883-DAF66A885005}.Release Static|x64.ActiveCfg = Release|x64
{7FB0902D-8579-5DCE-B883-DAF66A885005}.Release Unicode|Win32.ActiveCfg = Release|Win32
{7FB0902D-8579-5DCE-B883-DAF66A885005}.Release Unicode|x64.ActiveCfg = Release|x64
{7FB0902D-8579-5DCE-B883-DAF66A885005}.Release|Win32.ActiveCfg = Release|Win32
{7FB0902D-8579-5DCE-B883-DAF66A885005}.Release|Win32.Build.0 = Release|Win32
{7FB0902D-8579-5DCE-B883-DAF66A885005}.Release|x64.ActiveCfg = Release|x64
{7FB0902D-8579-5DCE-B883-DAF66A885005}.Release|x64.Build.0 = Release|x64
{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Debug Static|Win32.ActiveCfg = Debug|Win32
{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Debug Static|x64.ActiveCfg = Debug|x64
{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Debug Unicode|x64.ActiveCfg = Debug|x64
{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Debug|Win32.ActiveCfg = Debug|Win32
{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Debug|Win32.Build.0 = Debug|Win32
{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Debug|x64.ActiveCfg = Debug|x64
@@ -167,18 +123,10 @@ Global
{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.DLL Release|Win32.Build.0 = DLL Release|Win32
{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.DLL Release|x64.ActiveCfg = DLL Release|x64
{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.DLL Release|x64.Build.0 = DLL Release|x64
{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Release Static|Win32.ActiveCfg = Release|Win32
{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Release Static|x64.ActiveCfg = Release|x64
{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Release Unicode|Win32.ActiveCfg = Release|Win32
{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Release Unicode|x64.ActiveCfg = Release|x64
{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Release|Win32.ActiveCfg = Release|Win32
{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Release|Win32.Build.0 = Release|Win32
{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Release|x64.ActiveCfg = Release|x64
{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Release|x64.Build.0 = Release|x64
{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Debug Static|Win32.ActiveCfg = Debug|Win32
{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Debug Static|x64.ActiveCfg = Debug|x64
{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Debug Unicode|x64.ActiveCfg = Debug|x64
{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Debug|Win32.ActiveCfg = Debug|Win32
{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Debug|Win32.Build.0 = Debug|Win32
{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Debug|x64.ActiveCfg = Debug|x64
@@ -191,18 +139,10 @@ Global
{33CC42F9-7756-5587-863C-8D4461B7C5DD}.DLL Release|Win32.Build.0 = DLL Release|Win32
{33CC42F9-7756-5587-863C-8D4461B7C5DD}.DLL Release|x64.ActiveCfg = DLL Release|x64
{33CC42F9-7756-5587-863C-8D4461B7C5DD}.DLL Release|x64.Build.0 = DLL Release|x64
{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Release Static|Win32.ActiveCfg = Release|Win32
{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Release Static|x64.ActiveCfg = Release|x64
{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Release Unicode|Win32.ActiveCfg = Release|Win32
{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Release Unicode|x64.ActiveCfg = Release|x64
{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Release|Win32.ActiveCfg = Release|Win32
{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Release|Win32.Build.0 = Release|Win32
{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Release|x64.ActiveCfg = Release|x64
{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Release|x64.Build.0 = Release|x64
{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Debug Static|Win32.ActiveCfg = Debug|Win32
{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Debug Static|x64.ActiveCfg = Debug|x64
{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Debug Unicode|x64.ActiveCfg = Debug|x64
{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Debug|Win32.ActiveCfg = Debug|Win32
{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Debug|Win32.Build.0 = Debug|Win32
{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Debug|x64.ActiveCfg = Debug|x64
@@ -215,18 +155,10 @@ Global
{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.DLL Release|Win32.Build.0 = DLL Release|Win32
{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.DLL Release|x64.ActiveCfg = DLL Release|x64
{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.DLL Release|x64.Build.0 = DLL Release|x64
{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Release Static|Win32.ActiveCfg = Release|Win32
{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Release Static|x64.ActiveCfg = Release|x64
{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Release Unicode|Win32.ActiveCfg = Release|Win32
{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Release Unicode|x64.ActiveCfg = Release|x64
{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Release|Win32.ActiveCfg = Release|Win32
{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Release|Win32.Build.0 = Release|Win32
{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Release|x64.ActiveCfg = Release|x64
{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Release|x64.Build.0 = Release|x64
{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Debug Static|Win32.ActiveCfg = Debug|Win32
{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Debug Static|x64.ActiveCfg = Debug|x64
{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Debug Unicode|x64.ActiveCfg = Debug|x64
{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Debug|Win32.ActiveCfg = Debug|Win32
{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Debug|Win32.Build.0 = Debug|Win32
{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Debug|x64.ActiveCfg = Debug|x64
@@ -239,18 +171,10 @@ Global
{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.DLL Release|Win32.Build.0 = DLL Release|Win32
{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.DLL Release|x64.ActiveCfg = DLL Release|x64
{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.DLL Release|x64.Build.0 = DLL Release|x64
{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Release Static|Win32.ActiveCfg = Release|Win32
{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Release Static|x64.ActiveCfg = Release|x64
{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Release Unicode|Win32.ActiveCfg = Release|Win32
{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Release Unicode|x64.ActiveCfg = Release|x64
{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Release|Win32.ActiveCfg = Release|Win32
{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Release|Win32.Build.0 = Release|Win32
{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Release|x64.ActiveCfg = Release|x64
{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Release|x64.Build.0 = Release|x64
{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Debug Static|Win32.ActiveCfg = Debug|Win32
{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Debug Static|x64.ActiveCfg = Debug|x64
{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Debug Unicode|x64.ActiveCfg = Debug|x64
{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Debug|Win32.ActiveCfg = Debug|Win32
{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Debug|Win32.Build.0 = Debug|Win32
{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Debug|x64.ActiveCfg = Debug|x64
@@ -263,22 +187,10 @@ Global
{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.DLL Release|Win32.Build.0 = DLL Release|Win32
{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.DLL Release|x64.ActiveCfg = DLL Release|x64
{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.DLL Release|x64.Build.0 = DLL Release|x64
{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Release Static|Win32.ActiveCfg = Release|Win32
{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Release Static|x64.ActiveCfg = Release|x64
{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Release Unicode|Win32.ActiveCfg = Release|Win32
{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Release Unicode|x64.ActiveCfg = Release|x64
{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Release|Win32.ActiveCfg = Release|Win32
{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Release|Win32.Build.0 = Release|Win32
{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Release|x64.ActiveCfg = Release|x64
{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Release|x64.Build.0 = Release|x64
{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug Static|Win32.ActiveCfg = Debug|Win32
{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug Static|Win32.Build.0 = Debug|Win32
{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug Static|x64.ActiveCfg = Debug|x64
{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug Static|x64.Build.0 = Debug|x64
{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug Unicode|Win32.Build.0 = Debug|Win32
{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug Unicode|x64.ActiveCfg = Debug|x64
{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug Unicode|x64.Build.0 = Debug|x64
{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug|Win32.ActiveCfg = Debug|Win32
{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug|Win32.Build.0 = Debug|Win32
{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug|x64.ActiveCfg = Debug|x64
@@ -291,26 +203,10 @@ Global
{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.DLL Release|Win32.Build.0 = DLL Release|Win32
{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.DLL Release|x64.ActiveCfg = DLL Release|x64
{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.DLL Release|x64.Build.0 = DLL Release|x64
{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release Static|Win32.ActiveCfg = Release|Win32
{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release Static|Win32.Build.0 = Release|Win32
{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release Static|x64.ActiveCfg = Release|x64
{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release Static|x64.Build.0 = Release|x64
{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release Unicode|Win32.ActiveCfg = Release|Win32
{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release Unicode|Win32.Build.0 = Release|Win32
{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release Unicode|x64.ActiveCfg = Release|x64
{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release Unicode|x64.Build.0 = Release|x64
{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release|Win32.ActiveCfg = Release|Win32
{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release|Win32.Build.0 = Release|Win32
{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release|x64.ActiveCfg = Release|x64
{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release|x64.Build.0 = Release|x64
{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug Static|Win32.ActiveCfg = Debug|Win32
{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug Static|Win32.Build.0 = Debug|Win32
{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug Static|x64.ActiveCfg = Debug|x64
{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug Static|x64.Build.0 = Debug|x64
{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug Unicode|Win32.Build.0 = Debug|Win32
{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug Unicode|x64.ActiveCfg = Debug|x64
{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug Unicode|x64.Build.0 = Debug|x64
{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug|Win32.ActiveCfg = Debug|Win32
{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug|Win32.Build.0 = Debug|Win32
{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug|x64.ActiveCfg = Debug|x64
@@ -323,14 +219,6 @@ Global
{A16D3832-0F42-57CE-8F48-50E06649ADE8}.DLL Release|Win32.Build.0 = DLL Release|Win32
{A16D3832-0F42-57CE-8F48-50E06649ADE8}.DLL Release|x64.ActiveCfg = DLL Release|x64
{A16D3832-0F42-57CE-8F48-50E06649ADE8}.DLL Release|x64.Build.0 = DLL Release|x64
{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release Static|Win32.ActiveCfg = Release|Win32
{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release Static|Win32.Build.0 = Release|Win32
{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release Static|x64.ActiveCfg = Release|x64
{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release Static|x64.Build.0 = Release|x64
{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release Unicode|Win32.ActiveCfg = Release|Win32
{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release Unicode|Win32.Build.0 = Release|Win32
{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release Unicode|x64.ActiveCfg = Release|x64
{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release Unicode|x64.Build.0 = Release|x64
{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release|Win32.ActiveCfg = Release|Win32
{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release|Win32.Build.0 = Release|Win32
{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release|x64.ActiveCfg = Release|x64

View File

@@ -37,28 +37,16 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "aui", "..\build\msw\wx_aui.
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug Static|Win32 = Debug Static|Win32
Debug Static|x64 = Debug Static|x64
Debug Unicode|Win32 = Debug Unicode|Win32
Debug Unicode|x64 = Debug Unicode|x64
Debug|Win32 = Debug|Win32
Debug|x64 = Debug|x64
DLL Debug|Win32 = DLL Debug|Win32
DLL Debug|x64 = DLL Debug|x64
DLL Release|Win32 = DLL Release|Win32
DLL Release|x64 = DLL Release|x64
Release Static|Win32 = Release Static|Win32
Release Static|x64 = Release Static|x64
Release Unicode|Win32 = Release Unicode|Win32
Release Unicode|x64 = Release Unicode|x64
Release|Win32 = Release|Win32
Release|x64 = Release|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Debug Static|Win32.ActiveCfg = Debug|Win32
{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Debug Static|x64.ActiveCfg = Debug|x64
{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Debug Unicode|x64.ActiveCfg = Debug|x64
{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Debug|Win32.ActiveCfg = Debug|Win32
{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Debug|Win32.Build.0 = Debug|Win32
{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Debug|x64.ActiveCfg = Debug|x64
@@ -71,18 +59,10 @@ Global
{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.DLL Release|Win32.Build.0 = DLL Release|Win32
{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.DLL Release|x64.ActiveCfg = DLL Release|x64
{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.DLL Release|x64.Build.0 = DLL Release|x64
{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Release Static|Win32.ActiveCfg = Release|Win32
{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Release Static|x64.ActiveCfg = Release|x64
{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Release Unicode|Win32.ActiveCfg = Release|Win32
{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Release Unicode|x64.ActiveCfg = Release|x64
{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Release|Win32.ActiveCfg = Release|Win32
{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Release|Win32.Build.0 = Release|Win32
{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Release|x64.ActiveCfg = Release|x64
{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Release|x64.Build.0 = Release|x64
{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Debug Static|Win32.ActiveCfg = Debug|Win32
{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Debug Static|x64.ActiveCfg = Debug|x64
{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Debug Unicode|x64.ActiveCfg = Debug|x64
{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Debug|Win32.ActiveCfg = Debug|Win32
{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Debug|Win32.Build.0 = Debug|Win32
{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Debug|x64.ActiveCfg = Debug|x64
@@ -95,18 +75,10 @@ Global
{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Release|Win32.Build.0 = DLL Release|Win32
{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Release|x64.ActiveCfg = DLL Release|x64
{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Release|x64.Build.0 = DLL Release|x64
{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release Static|Win32.ActiveCfg = Release|Win32
{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release Static|x64.ActiveCfg = Release|x64
{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release Unicode|Win32.ActiveCfg = Release|Win32
{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release Unicode|x64.ActiveCfg = Release|x64
{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release|Win32.ActiveCfg = Release|Win32
{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release|Win32.Build.0 = Release|Win32
{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release|x64.ActiveCfg = Release|x64
{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release|x64.Build.0 = Release|x64
{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Debug Static|Win32.ActiveCfg = Debug|Win32
{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Debug Static|x64.ActiveCfg = Debug|x64
{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Debug Unicode|x64.ActiveCfg = Debug|x64
{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Debug|Win32.ActiveCfg = Debug|Win32
{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Debug|Win32.Build.0 = Debug|Win32
{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Debug|x64.ActiveCfg = Debug|x64
@@ -119,18 +91,10 @@ Global
{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Release|Win32.Build.0 = DLL Release|Win32
{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Release|x64.ActiveCfg = DLL Release|x64
{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Release|x64.Build.0 = DLL Release|x64
{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release Static|Win32.ActiveCfg = Release|Win32
{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release Static|x64.ActiveCfg = Release|x64
{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release Unicode|Win32.ActiveCfg = Release|Win32
{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release Unicode|x64.ActiveCfg = Release|x64
{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release|Win32.ActiveCfg = Release|Win32
{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release|Win32.Build.0 = Release|Win32
{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release|x64.ActiveCfg = Release|x64
{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release|x64.Build.0 = Release|x64
{7FB0902D-8579-5DCE-B883-DAF66A885005}.Debug Static|Win32.ActiveCfg = Debug|Win32
{7FB0902D-8579-5DCE-B883-DAF66A885005}.Debug Static|x64.ActiveCfg = Debug|x64
{7FB0902D-8579-5DCE-B883-DAF66A885005}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
{7FB0902D-8579-5DCE-B883-DAF66A885005}.Debug Unicode|x64.ActiveCfg = Debug|x64
{7FB0902D-8579-5DCE-B883-DAF66A885005}.Debug|Win32.ActiveCfg = Debug|Win32
{7FB0902D-8579-5DCE-B883-DAF66A885005}.Debug|Win32.Build.0 = Debug|Win32
{7FB0902D-8579-5DCE-B883-DAF66A885005}.Debug|x64.ActiveCfg = Debug|x64
@@ -143,18 +107,10 @@ Global
{7FB0902D-8579-5DCE-B883-DAF66A885005}.DLL Release|Win32.Build.0 = DLL Release|Win32
{7FB0902D-8579-5DCE-B883-DAF66A885005}.DLL Release|x64.ActiveCfg = DLL Release|x64
{7FB0902D-8579-5DCE-B883-DAF66A885005}.DLL Release|x64.Build.0 = DLL Release|x64
{7FB0902D-8579-5DCE-B883-DAF66A885005}.Release Static|Win32.ActiveCfg = Release|Win32
{7FB0902D-8579-5DCE-B883-DAF66A885005}.Release Static|x64.ActiveCfg = Release|x64
{7FB0902D-8579-5DCE-B883-DAF66A885005}.Release Unicode|Win32.ActiveCfg = Release|Win32
{7FB0902D-8579-5DCE-B883-DAF66A885005}.Release Unicode|x64.ActiveCfg = Release|x64
{7FB0902D-8579-5DCE-B883-DAF66A885005}.Release|Win32.ActiveCfg = Release|Win32
{7FB0902D-8579-5DCE-B883-DAF66A885005}.Release|Win32.Build.0 = Release|Win32
{7FB0902D-8579-5DCE-B883-DAF66A885005}.Release|x64.ActiveCfg = Release|x64
{7FB0902D-8579-5DCE-B883-DAF66A885005}.Release|x64.Build.0 = Release|x64
{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Debug Static|Win32.ActiveCfg = Debug|Win32
{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Debug Static|x64.ActiveCfg = Debug|x64
{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Debug Unicode|x64.ActiveCfg = Debug|x64
{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Debug|Win32.ActiveCfg = Debug|Win32
{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Debug|Win32.Build.0 = Debug|Win32
{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Debug|x64.ActiveCfg = Debug|x64
@@ -167,18 +123,10 @@ Global
{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.DLL Release|Win32.Build.0 = DLL Release|Win32
{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.DLL Release|x64.ActiveCfg = DLL Release|x64
{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.DLL Release|x64.Build.0 = DLL Release|x64
{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Release Static|Win32.ActiveCfg = Release|Win32
{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Release Static|x64.ActiveCfg = Release|x64
{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Release Unicode|Win32.ActiveCfg = Release|Win32
{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Release Unicode|x64.ActiveCfg = Release|x64
{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Release|Win32.ActiveCfg = Release|Win32
{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Release|Win32.Build.0 = Release|Win32
{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Release|x64.ActiveCfg = Release|x64
{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Release|x64.Build.0 = Release|x64
{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Debug Static|Win32.ActiveCfg = Debug|Win32
{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Debug Static|x64.ActiveCfg = Debug|x64
{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Debug Unicode|x64.ActiveCfg = Debug|x64
{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Debug|Win32.ActiveCfg = Debug|Win32
{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Debug|Win32.Build.0 = Debug|Win32
{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Debug|x64.ActiveCfg = Debug|x64
@@ -191,18 +139,10 @@ Global
{33CC42F9-7756-5587-863C-8D4461B7C5DD}.DLL Release|Win32.Build.0 = DLL Release|Win32
{33CC42F9-7756-5587-863C-8D4461B7C5DD}.DLL Release|x64.ActiveCfg = DLL Release|x64
{33CC42F9-7756-5587-863C-8D4461B7C5DD}.DLL Release|x64.Build.0 = DLL Release|x64
{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Release Static|Win32.ActiveCfg = Release|Win32
{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Release Static|x64.ActiveCfg = Release|x64
{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Release Unicode|Win32.ActiveCfg = Release|Win32
{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Release Unicode|x64.ActiveCfg = Release|x64
{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Release|Win32.ActiveCfg = Release|Win32
{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Release|Win32.Build.0 = Release|Win32
{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Release|x64.ActiveCfg = Release|x64
{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Release|x64.Build.0 = Release|x64
{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Debug Static|Win32.ActiveCfg = Debug|Win32
{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Debug Static|x64.ActiveCfg = Debug|x64
{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Debug Unicode|x64.ActiveCfg = Debug|x64
{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Debug|Win32.ActiveCfg = Debug|Win32
{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Debug|Win32.Build.0 = Debug|Win32
{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Debug|x64.ActiveCfg = Debug|x64
@@ -215,18 +155,10 @@ Global
{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.DLL Release|Win32.Build.0 = DLL Release|Win32
{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.DLL Release|x64.ActiveCfg = DLL Release|x64
{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.DLL Release|x64.Build.0 = DLL Release|x64
{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Release Static|Win32.ActiveCfg = Release|Win32
{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Release Static|x64.ActiveCfg = Release|x64
{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Release Unicode|Win32.ActiveCfg = Release|Win32
{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Release Unicode|x64.ActiveCfg = Release|x64
{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Release|Win32.ActiveCfg = Release|Win32
{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Release|Win32.Build.0 = Release|Win32
{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Release|x64.ActiveCfg = Release|x64
{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Release|x64.Build.0 = Release|x64
{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Debug Static|Win32.ActiveCfg = Debug|Win32
{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Debug Static|x64.ActiveCfg = Debug|x64
{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Debug Unicode|x64.ActiveCfg = Debug|x64
{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Debug|Win32.ActiveCfg = Debug|Win32
{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Debug|Win32.Build.0 = Debug|Win32
{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Debug|x64.ActiveCfg = Debug|x64
@@ -239,18 +171,10 @@ Global
{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.DLL Release|Win32.Build.0 = DLL Release|Win32
{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.DLL Release|x64.ActiveCfg = DLL Release|x64
{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.DLL Release|x64.Build.0 = DLL Release|x64
{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Release Static|Win32.ActiveCfg = Release|Win32
{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Release Static|x64.ActiveCfg = Release|x64
{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Release Unicode|Win32.ActiveCfg = Release|Win32
{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Release Unicode|x64.ActiveCfg = Release|x64
{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Release|Win32.ActiveCfg = Release|Win32
{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Release|Win32.Build.0 = Release|Win32
{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Release|x64.ActiveCfg = Release|x64
{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Release|x64.Build.0 = Release|x64
{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Debug Static|Win32.ActiveCfg = Debug|Win32
{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Debug Static|x64.ActiveCfg = Debug|x64
{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Debug Unicode|x64.ActiveCfg = Debug|x64
{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Debug|Win32.ActiveCfg = Debug|Win32
{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Debug|Win32.Build.0 = Debug|Win32
{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Debug|x64.ActiveCfg = Debug|x64
@@ -263,22 +187,10 @@ Global
{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.DLL Release|Win32.Build.0 = DLL Release|Win32
{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.DLL Release|x64.ActiveCfg = DLL Release|x64
{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.DLL Release|x64.Build.0 = DLL Release|x64
{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Release Static|Win32.ActiveCfg = Release|Win32
{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Release Static|x64.ActiveCfg = Release|x64
{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Release Unicode|Win32.ActiveCfg = Release|Win32
{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Release Unicode|x64.ActiveCfg = Release|x64
{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Release|Win32.ActiveCfg = Release|Win32
{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Release|Win32.Build.0 = Release|Win32
{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Release|x64.ActiveCfg = Release|x64
{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Release|x64.Build.0 = Release|x64
{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug Static|Win32.ActiveCfg = Debug|Win32
{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug Static|Win32.Build.0 = Debug|Win32
{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug Static|x64.ActiveCfg = Debug|x64
{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug Static|x64.Build.0 = Debug|x64
{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug Unicode|Win32.Build.0 = Debug|Win32
{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug Unicode|x64.ActiveCfg = Debug|x64
{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug Unicode|x64.Build.0 = Debug|x64
{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug|Win32.ActiveCfg = Debug|Win32
{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug|Win32.Build.0 = Debug|Win32
{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug|x64.ActiveCfg = Debug|x64
@@ -291,26 +203,10 @@ Global
{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.DLL Release|Win32.Build.0 = DLL Release|Win32
{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.DLL Release|x64.ActiveCfg = DLL Release|x64
{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.DLL Release|x64.Build.0 = DLL Release|x64
{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release Static|Win32.ActiveCfg = Release|Win32
{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release Static|Win32.Build.0 = Release|Win32
{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release Static|x64.ActiveCfg = Release|x64
{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release Static|x64.Build.0 = Release|x64
{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release Unicode|Win32.ActiveCfg = Release|Win32
{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release Unicode|Win32.Build.0 = Release|Win32
{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release Unicode|x64.ActiveCfg = Release|x64
{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release Unicode|x64.Build.0 = Release|x64
{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release|Win32.ActiveCfg = Release|Win32
{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release|Win32.Build.0 = Release|Win32
{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release|x64.ActiveCfg = Release|x64
{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release|x64.Build.0 = Release|x64
{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug Static|Win32.ActiveCfg = Debug|Win32
{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug Static|Win32.Build.0 = Debug|Win32
{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug Static|x64.ActiveCfg = Debug|x64
{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug Static|x64.Build.0 = Debug|x64
{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug Unicode|Win32.Build.0 = Debug|Win32
{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug Unicode|x64.ActiveCfg = Debug|x64
{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug Unicode|x64.Build.0 = Debug|x64
{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug|Win32.ActiveCfg = Debug|Win32
{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug|Win32.Build.0 = Debug|Win32
{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug|x64.ActiveCfg = Debug|x64
@@ -323,14 +219,6 @@ Global
{A16D3832-0F42-57CE-8F48-50E06649ADE8}.DLL Release|Win32.Build.0 = DLL Release|Win32
{A16D3832-0F42-57CE-8F48-50E06649ADE8}.DLL Release|x64.ActiveCfg = DLL Release|x64
{A16D3832-0F42-57CE-8F48-50E06649ADE8}.DLL Release|x64.Build.0 = DLL Release|x64
{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release Static|Win32.ActiveCfg = Release|Win32
{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release Static|Win32.Build.0 = Release|Win32
{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release Static|x64.ActiveCfg = Release|x64
{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release Static|x64.Build.0 = Release|x64
{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release Unicode|Win32.ActiveCfg = Release|Win32
{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release Unicode|Win32.Build.0 = Release|Win32
{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release Unicode|x64.ActiveCfg = Release|x64
{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release Unicode|x64.Build.0 = Release|x64
{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release|Win32.ActiveCfg = Release|Win32
{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release|Win32.Build.0 = Release|Win32
{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release|x64.ActiveCfg = Release|x64

View File

@@ -39,28 +39,16 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "aui", "..\build\msw\wx_aui.
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug Static|Win32 = Debug Static|Win32
Debug Static|x64 = Debug Static|x64
Debug Unicode|Win32 = Debug Unicode|Win32
Debug Unicode|x64 = Debug Unicode|x64
Debug|Win32 = Debug|Win32
Debug|x64 = Debug|x64
DLL Debug|Win32 = DLL Debug|Win32
DLL Debug|x64 = DLL Debug|x64
DLL Release|Win32 = DLL Release|Win32
DLL Release|x64 = DLL Release|x64
Release Static|Win32 = Release Static|Win32
Release Static|x64 = Release Static|x64
Release Unicode|Win32 = Release Unicode|Win32
Release Unicode|x64 = Release Unicode|x64
Release|Win32 = Release|Win32
Release|x64 = Release|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Debug Static|Win32.ActiveCfg = Debug|Win32
{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Debug Static|x64.ActiveCfg = Debug|x64
{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Debug Unicode|x64.ActiveCfg = Debug|x64
{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Debug|Win32.ActiveCfg = Debug|Win32
{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Debug|Win32.Build.0 = Debug|Win32
{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Debug|x64.ActiveCfg = Debug|x64
@@ -73,18 +61,10 @@ Global
{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.DLL Release|Win32.Build.0 = DLL Release|Win32
{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.DLL Release|x64.ActiveCfg = DLL Release|x64
{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.DLL Release|x64.Build.0 = DLL Release|x64
{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Release Static|Win32.ActiveCfg = Release|Win32
{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Release Static|x64.ActiveCfg = Release|x64
{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Release Unicode|Win32.ActiveCfg = Release|Win32
{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Release Unicode|x64.ActiveCfg = Release|x64
{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Release|Win32.ActiveCfg = Release|Win32
{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Release|Win32.Build.0 = Release|Win32
{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Release|x64.ActiveCfg = Release|x64
{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Release|x64.Build.0 = Release|x64
{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Debug Static|Win32.ActiveCfg = Debug|Win32
{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Debug Static|x64.ActiveCfg = Debug|x64
{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Debug Unicode|x64.ActiveCfg = Debug|x64
{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Debug|Win32.ActiveCfg = Debug|Win32
{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Debug|Win32.Build.0 = Debug|Win32
{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Debug|x64.ActiveCfg = Debug|x64
@@ -97,18 +77,10 @@ Global
{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Release|Win32.Build.0 = DLL Release|Win32
{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Release|x64.ActiveCfg = DLL Release|x64
{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Release|x64.Build.0 = DLL Release|x64
{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release Static|Win32.ActiveCfg = Release|Win32
{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release Static|x64.ActiveCfg = Release|x64
{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release Unicode|Win32.ActiveCfg = Release|Win32
{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release Unicode|x64.ActiveCfg = Release|x64
{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release|Win32.ActiveCfg = Release|Win32
{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release|Win32.Build.0 = Release|Win32
{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release|x64.ActiveCfg = Release|x64
{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release|x64.Build.0 = Release|x64
{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Debug Static|Win32.ActiveCfg = Debug|Win32
{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Debug Static|x64.ActiveCfg = Debug|x64
{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Debug Unicode|x64.ActiveCfg = Debug|x64
{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Debug|Win32.ActiveCfg = Debug|Win32
{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Debug|Win32.Build.0 = Debug|Win32
{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Debug|x64.ActiveCfg = Debug|x64
@@ -121,18 +93,10 @@ Global
{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Release|Win32.Build.0 = DLL Release|Win32
{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Release|x64.ActiveCfg = DLL Release|x64
{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Release|x64.Build.0 = DLL Release|x64
{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release Static|Win32.ActiveCfg = Release|Win32
{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release Static|x64.ActiveCfg = Release|x64
{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release Unicode|Win32.ActiveCfg = Release|Win32
{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release Unicode|x64.ActiveCfg = Release|x64
{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release|Win32.ActiveCfg = Release|Win32
{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release|Win32.Build.0 = Release|Win32
{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release|x64.ActiveCfg = Release|x64
{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release|x64.Build.0 = Release|x64
{7FB0902D-8579-5DCE-B883-DAF66A885005}.Debug Static|Win32.ActiveCfg = Debug|Win32
{7FB0902D-8579-5DCE-B883-DAF66A885005}.Debug Static|x64.ActiveCfg = Debug|x64
{7FB0902D-8579-5DCE-B883-DAF66A885005}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
{7FB0902D-8579-5DCE-B883-DAF66A885005}.Debug Unicode|x64.ActiveCfg = Debug|x64
{7FB0902D-8579-5DCE-B883-DAF66A885005}.Debug|Win32.ActiveCfg = Debug|Win32
{7FB0902D-8579-5DCE-B883-DAF66A885005}.Debug|Win32.Build.0 = Debug|Win32
{7FB0902D-8579-5DCE-B883-DAF66A885005}.Debug|x64.ActiveCfg = Debug|x64
@@ -145,18 +109,10 @@ Global
{7FB0902D-8579-5DCE-B883-DAF66A885005}.DLL Release|Win32.Build.0 = DLL Release|Win32
{7FB0902D-8579-5DCE-B883-DAF66A885005}.DLL Release|x64.ActiveCfg = DLL Release|x64
{7FB0902D-8579-5DCE-B883-DAF66A885005}.DLL Release|x64.Build.0 = DLL Release|x64
{7FB0902D-8579-5DCE-B883-DAF66A885005}.Release Static|Win32.ActiveCfg = Release|Win32
{7FB0902D-8579-5DCE-B883-DAF66A885005}.Release Static|x64.ActiveCfg = Release|x64
{7FB0902D-8579-5DCE-B883-DAF66A885005}.Release Unicode|Win32.ActiveCfg = Release|Win32
{7FB0902D-8579-5DCE-B883-DAF66A885005}.Release Unicode|x64.ActiveCfg = Release|x64
{7FB0902D-8579-5DCE-B883-DAF66A885005}.Release|Win32.ActiveCfg = Release|Win32
{7FB0902D-8579-5DCE-B883-DAF66A885005}.Release|Win32.Build.0 = Release|Win32
{7FB0902D-8579-5DCE-B883-DAF66A885005}.Release|x64.ActiveCfg = Release|x64
{7FB0902D-8579-5DCE-B883-DAF66A885005}.Release|x64.Build.0 = Release|x64
{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Debug Static|Win32.ActiveCfg = Debug|Win32
{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Debug Static|x64.ActiveCfg = Debug|x64
{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Debug Unicode|x64.ActiveCfg = Debug|x64
{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Debug|Win32.ActiveCfg = Debug|Win32
{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Debug|Win32.Build.0 = Debug|Win32
{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Debug|x64.ActiveCfg = Debug|x64
@@ -169,18 +125,10 @@ Global
{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.DLL Release|Win32.Build.0 = DLL Release|Win32
{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.DLL Release|x64.ActiveCfg = DLL Release|x64
{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.DLL Release|x64.Build.0 = DLL Release|x64
{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Release Static|Win32.ActiveCfg = Release|Win32
{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Release Static|x64.ActiveCfg = Release|x64
{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Release Unicode|Win32.ActiveCfg = Release|Win32
{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Release Unicode|x64.ActiveCfg = Release|x64
{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Release|Win32.ActiveCfg = Release|Win32
{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Release|Win32.Build.0 = Release|Win32
{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Release|x64.ActiveCfg = Release|x64
{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Release|x64.Build.0 = Release|x64
{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Debug Static|Win32.ActiveCfg = Debug|Win32
{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Debug Static|x64.ActiveCfg = Debug|x64
{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Debug Unicode|x64.ActiveCfg = Debug|x64
{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Debug|Win32.ActiveCfg = Debug|Win32
{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Debug|Win32.Build.0 = Debug|Win32
{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Debug|x64.ActiveCfg = Debug|x64
@@ -193,18 +141,10 @@ Global
{33CC42F9-7756-5587-863C-8D4461B7C5DD}.DLL Release|Win32.Build.0 = DLL Release|Win32
{33CC42F9-7756-5587-863C-8D4461B7C5DD}.DLL Release|x64.ActiveCfg = DLL Release|x64
{33CC42F9-7756-5587-863C-8D4461B7C5DD}.DLL Release|x64.Build.0 = DLL Release|x64
{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Release Static|Win32.ActiveCfg = Release|Win32
{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Release Static|x64.ActiveCfg = Release|x64
{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Release Unicode|Win32.ActiveCfg = Release|Win32
{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Release Unicode|x64.ActiveCfg = Release|x64
{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Release|Win32.ActiveCfg = Release|Win32
{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Release|Win32.Build.0 = Release|Win32
{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Release|x64.ActiveCfg = Release|x64
{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Release|x64.Build.0 = Release|x64
{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Debug Static|Win32.ActiveCfg = Debug|Win32
{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Debug Static|x64.ActiveCfg = Debug|x64
{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Debug Unicode|x64.ActiveCfg = Debug|x64
{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Debug|Win32.ActiveCfg = Debug|Win32
{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Debug|Win32.Build.0 = Debug|Win32
{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Debug|x64.ActiveCfg = Debug|x64
@@ -217,18 +157,10 @@ Global
{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.DLL Release|Win32.Build.0 = DLL Release|Win32
{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.DLL Release|x64.ActiveCfg = DLL Release|x64
{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.DLL Release|x64.Build.0 = DLL Release|x64
{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Release Static|Win32.ActiveCfg = Release|Win32
{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Release Static|x64.ActiveCfg = Release|x64
{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Release Unicode|Win32.ActiveCfg = Release|Win32
{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Release Unicode|x64.ActiveCfg = Release|x64
{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Release|Win32.ActiveCfg = Release|Win32
{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Release|Win32.Build.0 = Release|Win32
{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Release|x64.ActiveCfg = Release|x64
{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Release|x64.Build.0 = Release|x64
{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Debug Static|Win32.ActiveCfg = Debug|Win32
{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Debug Static|x64.ActiveCfg = Debug|x64
{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Debug Unicode|x64.ActiveCfg = Debug|x64
{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Debug|Win32.ActiveCfg = Debug|Win32
{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Debug|Win32.Build.0 = Debug|Win32
{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Debug|x64.ActiveCfg = Debug|x64
@@ -241,18 +173,10 @@ Global
{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.DLL Release|Win32.Build.0 = DLL Release|Win32
{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.DLL Release|x64.ActiveCfg = DLL Release|x64
{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.DLL Release|x64.Build.0 = DLL Release|x64
{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Release Static|Win32.ActiveCfg = Release|Win32
{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Release Static|x64.ActiveCfg = Release|x64
{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Release Unicode|Win32.ActiveCfg = Release|Win32
{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Release Unicode|x64.ActiveCfg = Release|x64
{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Release|Win32.ActiveCfg = Release|Win32
{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Release|Win32.Build.0 = Release|Win32
{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Release|x64.ActiveCfg = Release|x64
{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Release|x64.Build.0 = Release|x64
{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Debug Static|Win32.ActiveCfg = Debug|Win32
{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Debug Static|x64.ActiveCfg = Debug|x64
{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Debug Unicode|x64.ActiveCfg = Debug|x64
{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Debug|Win32.ActiveCfg = Debug|Win32
{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Debug|Win32.Build.0 = Debug|Win32
{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Debug|x64.ActiveCfg = Debug|x64
@@ -265,22 +189,10 @@ Global
{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.DLL Release|Win32.Build.0 = DLL Release|Win32
{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.DLL Release|x64.ActiveCfg = DLL Release|x64
{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.DLL Release|x64.Build.0 = DLL Release|x64
{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Release Static|Win32.ActiveCfg = Release|Win32
{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Release Static|x64.ActiveCfg = Release|x64
{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Release Unicode|Win32.ActiveCfg = Release|Win32
{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Release Unicode|x64.ActiveCfg = Release|x64
{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Release|Win32.ActiveCfg = Release|Win32
{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Release|Win32.Build.0 = Release|Win32
{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Release|x64.ActiveCfg = Release|x64
{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Release|x64.Build.0 = Release|x64
{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug Static|Win32.ActiveCfg = Debug|Win32
{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug Static|Win32.Build.0 = Debug|Win32
{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug Static|x64.ActiveCfg = Debug|x64
{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug Static|x64.Build.0 = Debug|x64
{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug Unicode|Win32.Build.0 = Debug|Win32
{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug Unicode|x64.ActiveCfg = Debug|x64
{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug Unicode|x64.Build.0 = Debug|x64
{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug|Win32.ActiveCfg = Debug|Win32
{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug|Win32.Build.0 = Debug|Win32
{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug|x64.ActiveCfg = Debug|x64
@@ -293,26 +205,10 @@ Global
{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.DLL Release|Win32.Build.0 = DLL Release|Win32
{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.DLL Release|x64.ActiveCfg = DLL Release|x64
{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.DLL Release|x64.Build.0 = DLL Release|x64
{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release Static|Win32.ActiveCfg = Release|Win32
{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release Static|Win32.Build.0 = Release|Win32
{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release Static|x64.ActiveCfg = Release|x64
{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release Static|x64.Build.0 = Release|x64
{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release Unicode|Win32.ActiveCfg = Release|Win32
{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release Unicode|Win32.Build.0 = Release|Win32
{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release Unicode|x64.ActiveCfg = Release|x64
{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release Unicode|x64.Build.0 = Release|x64
{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release|Win32.ActiveCfg = Release|Win32
{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release|Win32.Build.0 = Release|Win32
{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release|x64.ActiveCfg = Release|x64
{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release|x64.Build.0 = Release|x64
{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug Static|Win32.ActiveCfg = Debug|Win32
{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug Static|Win32.Build.0 = Debug|Win32
{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug Static|x64.ActiveCfg = Debug|x64
{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug Static|x64.Build.0 = Debug|x64
{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug Unicode|Win32.Build.0 = Debug|Win32
{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug Unicode|x64.ActiveCfg = Debug|x64
{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug Unicode|x64.Build.0 = Debug|x64
{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug|Win32.ActiveCfg = Debug|Win32
{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug|Win32.Build.0 = Debug|Win32
{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug|x64.ActiveCfg = Debug|x64
@@ -325,14 +221,6 @@ Global
{A16D3832-0F42-57CE-8F48-50E06649ADE8}.DLL Release|Win32.Build.0 = DLL Release|Win32
{A16D3832-0F42-57CE-8F48-50E06649ADE8}.DLL Release|x64.ActiveCfg = DLL Release|x64
{A16D3832-0F42-57CE-8F48-50E06649ADE8}.DLL Release|x64.Build.0 = DLL Release|x64
{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release Static|Win32.ActiveCfg = Release|Win32
{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release Static|Win32.Build.0 = Release|Win32
{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release Static|x64.ActiveCfg = Release|x64
{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release Static|x64.Build.0 = Release|x64
{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release Unicode|Win32.ActiveCfg = Release|Win32
{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release Unicode|Win32.Build.0 = Release|Win32
{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release Unicode|x64.ActiveCfg = Release|x64
{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release Unicode|x64.Build.0 = Release|x64
{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release|Win32.ActiveCfg = Release|Win32
{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release|Win32.Build.0 = Release|Win32
{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release|x64.ActiveCfg = Release|x64

View File

@@ -39,28 +39,16 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "aui", "..\build\msw\wx_aui.
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug Static|Win32 = Debug Static|Win32
Debug Static|x64 = Debug Static|x64
Debug Unicode|Win32 = Debug Unicode|Win32
Debug Unicode|x64 = Debug Unicode|x64
Debug|Win32 = Debug|Win32
Debug|x64 = Debug|x64
DLL Debug|Win32 = DLL Debug|Win32
DLL Debug|x64 = DLL Debug|x64
DLL Release|Win32 = DLL Release|Win32
DLL Release|x64 = DLL Release|x64
Release Static|Win32 = Release Static|Win32
Release Static|x64 = Release Static|x64
Release Unicode|Win32 = Release Unicode|Win32
Release Unicode|x64 = Release Unicode|x64
Release|Win32 = Release|Win32
Release|x64 = Release|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Debug Static|Win32.ActiveCfg = Debug|Win32
{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Debug Static|x64.ActiveCfg = Debug|x64
{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Debug Unicode|x64.ActiveCfg = Debug|x64
{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Debug|Win32.ActiveCfg = Debug|Win32
{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Debug|Win32.Build.0 = Debug|Win32
{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Debug|x64.ActiveCfg = Debug|x64
@@ -73,18 +61,10 @@ Global
{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.DLL Release|Win32.Build.0 = DLL Release|Win32
{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.DLL Release|x64.ActiveCfg = DLL Release|x64
{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.DLL Release|x64.Build.0 = DLL Release|x64
{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Release Static|Win32.ActiveCfg = Release|Win32
{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Release Static|x64.ActiveCfg = Release|x64
{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Release Unicode|Win32.ActiveCfg = Release|Win32
{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Release Unicode|x64.ActiveCfg = Release|x64
{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Release|Win32.ActiveCfg = Release|Win32
{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Release|Win32.Build.0 = Release|Win32
{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Release|x64.ActiveCfg = Release|x64
{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Release|x64.Build.0 = Release|x64
{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Debug Static|Win32.ActiveCfg = Debug|Win32
{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Debug Static|x64.ActiveCfg = Debug|x64
{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Debug Unicode|x64.ActiveCfg = Debug|x64
{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Debug|Win32.ActiveCfg = Debug|Win32
{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Debug|Win32.Build.0 = Debug|Win32
{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Debug|x64.ActiveCfg = Debug|x64
@@ -97,18 +77,10 @@ Global
{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Release|Win32.Build.0 = DLL Release|Win32
{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Release|x64.ActiveCfg = DLL Release|x64
{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Release|x64.Build.0 = DLL Release|x64
{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release Static|Win32.ActiveCfg = Release|Win32
{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release Static|x64.ActiveCfg = Release|x64
{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release Unicode|Win32.ActiveCfg = Release|Win32
{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release Unicode|x64.ActiveCfg = Release|x64
{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release|Win32.ActiveCfg = Release|Win32
{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release|Win32.Build.0 = Release|Win32
{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release|x64.ActiveCfg = Release|x64
{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release|x64.Build.0 = Release|x64
{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Debug Static|Win32.ActiveCfg = Debug|Win32
{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Debug Static|x64.ActiveCfg = Debug|x64
{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Debug Unicode|x64.ActiveCfg = Debug|x64
{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Debug|Win32.ActiveCfg = Debug|Win32
{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Debug|Win32.Build.0 = Debug|Win32
{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Debug|x64.ActiveCfg = Debug|x64
@@ -121,18 +93,10 @@ Global
{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Release|Win32.Build.0 = DLL Release|Win32
{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Release|x64.ActiveCfg = DLL Release|x64
{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Release|x64.Build.0 = DLL Release|x64
{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release Static|Win32.ActiveCfg = Release|Win32
{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release Static|x64.ActiveCfg = Release|x64
{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release Unicode|Win32.ActiveCfg = Release|Win32
{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release Unicode|x64.ActiveCfg = Release|x64
{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release|Win32.ActiveCfg = Release|Win32
{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release|Win32.Build.0 = Release|Win32
{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release|x64.ActiveCfg = Release|x64
{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release|x64.Build.0 = Release|x64
{7FB0902D-8579-5DCE-B883-DAF66A885005}.Debug Static|Win32.ActiveCfg = Debug|Win32
{7FB0902D-8579-5DCE-B883-DAF66A885005}.Debug Static|x64.ActiveCfg = Debug|x64
{7FB0902D-8579-5DCE-B883-DAF66A885005}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
{7FB0902D-8579-5DCE-B883-DAF66A885005}.Debug Unicode|x64.ActiveCfg = Debug|x64
{7FB0902D-8579-5DCE-B883-DAF66A885005}.Debug|Win32.ActiveCfg = Debug|Win32
{7FB0902D-8579-5DCE-B883-DAF66A885005}.Debug|Win32.Build.0 = Debug|Win32
{7FB0902D-8579-5DCE-B883-DAF66A885005}.Debug|x64.ActiveCfg = Debug|x64
@@ -145,18 +109,10 @@ Global
{7FB0902D-8579-5DCE-B883-DAF66A885005}.DLL Release|Win32.Build.0 = DLL Release|Win32
{7FB0902D-8579-5DCE-B883-DAF66A885005}.DLL Release|x64.ActiveCfg = DLL Release|x64
{7FB0902D-8579-5DCE-B883-DAF66A885005}.DLL Release|x64.Build.0 = DLL Release|x64
{7FB0902D-8579-5DCE-B883-DAF66A885005}.Release Static|Win32.ActiveCfg = Release|Win32
{7FB0902D-8579-5DCE-B883-DAF66A885005}.Release Static|x64.ActiveCfg = Release|x64
{7FB0902D-8579-5DCE-B883-DAF66A885005}.Release Unicode|Win32.ActiveCfg = Release|Win32
{7FB0902D-8579-5DCE-B883-DAF66A885005}.Release Unicode|x64.ActiveCfg = Release|x64
{7FB0902D-8579-5DCE-B883-DAF66A885005}.Release|Win32.ActiveCfg = Release|Win32
{7FB0902D-8579-5DCE-B883-DAF66A885005}.Release|Win32.Build.0 = Release|Win32
{7FB0902D-8579-5DCE-B883-DAF66A885005}.Release|x64.ActiveCfg = Release|x64
{7FB0902D-8579-5DCE-B883-DAF66A885005}.Release|x64.Build.0 = Release|x64
{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Debug Static|Win32.ActiveCfg = Debug|Win32
{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Debug Static|x64.ActiveCfg = Debug|x64
{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Debug Unicode|x64.ActiveCfg = Debug|x64
{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Debug|Win32.ActiveCfg = Debug|Win32
{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Debug|Win32.Build.0 = Debug|Win32
{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Debug|x64.ActiveCfg = Debug|x64
@@ -169,18 +125,10 @@ Global
{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.DLL Release|Win32.Build.0 = DLL Release|Win32
{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.DLL Release|x64.ActiveCfg = DLL Release|x64
{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.DLL Release|x64.Build.0 = DLL Release|x64
{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Release Static|Win32.ActiveCfg = Release|Win32
{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Release Static|x64.ActiveCfg = Release|x64
{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Release Unicode|Win32.ActiveCfg = Release|Win32
{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Release Unicode|x64.ActiveCfg = Release|x64
{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Release|Win32.ActiveCfg = Release|Win32
{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Release|Win32.Build.0 = Release|Win32
{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Release|x64.ActiveCfg = Release|x64
{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Release|x64.Build.0 = Release|x64
{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Debug Static|Win32.ActiveCfg = Debug|Win32
{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Debug Static|x64.ActiveCfg = Debug|x64
{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Debug Unicode|x64.ActiveCfg = Debug|x64
{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Debug|Win32.ActiveCfg = Debug|Win32
{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Debug|Win32.Build.0 = Debug|Win32
{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Debug|x64.ActiveCfg = Debug|x64
@@ -193,18 +141,10 @@ Global
{33CC42F9-7756-5587-863C-8D4461B7C5DD}.DLL Release|Win32.Build.0 = DLL Release|Win32
{33CC42F9-7756-5587-863C-8D4461B7C5DD}.DLL Release|x64.ActiveCfg = DLL Release|x64
{33CC42F9-7756-5587-863C-8D4461B7C5DD}.DLL Release|x64.Build.0 = DLL Release|x64
{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Release Static|Win32.ActiveCfg = Release|Win32
{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Release Static|x64.ActiveCfg = Release|x64
{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Release Unicode|Win32.ActiveCfg = Release|Win32
{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Release Unicode|x64.ActiveCfg = Release|x64
{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Release|Win32.ActiveCfg = Release|Win32
{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Release|Win32.Build.0 = Release|Win32
{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Release|x64.ActiveCfg = Release|x64
{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Release|x64.Build.0 = Release|x64
{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Debug Static|Win32.ActiveCfg = Debug|Win32
{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Debug Static|x64.ActiveCfg = Debug|x64
{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Debug Unicode|x64.ActiveCfg = Debug|x64
{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Debug|Win32.ActiveCfg = Debug|Win32
{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Debug|Win32.Build.0 = Debug|Win32
{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Debug|x64.ActiveCfg = Debug|x64
@@ -217,18 +157,10 @@ Global
{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.DLL Release|Win32.Build.0 = DLL Release|Win32
{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.DLL Release|x64.ActiveCfg = DLL Release|x64
{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.DLL Release|x64.Build.0 = DLL Release|x64
{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Release Static|Win32.ActiveCfg = Release|Win32
{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Release Static|x64.ActiveCfg = Release|x64
{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Release Unicode|Win32.ActiveCfg = Release|Win32
{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Release Unicode|x64.ActiveCfg = Release|x64
{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Release|Win32.ActiveCfg = Release|Win32
{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Release|Win32.Build.0 = Release|Win32
{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Release|x64.ActiveCfg = Release|x64
{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Release|x64.Build.0 = Release|x64
{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Debug Static|Win32.ActiveCfg = Debug|Win32
{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Debug Static|x64.ActiveCfg = Debug|x64
{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Debug Unicode|x64.ActiveCfg = Debug|x64
{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Debug|Win32.ActiveCfg = Debug|Win32
{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Debug|Win32.Build.0 = Debug|Win32
{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Debug|x64.ActiveCfg = Debug|x64
@@ -241,18 +173,10 @@ Global
{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.DLL Release|Win32.Build.0 = DLL Release|Win32
{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.DLL Release|x64.ActiveCfg = DLL Release|x64
{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.DLL Release|x64.Build.0 = DLL Release|x64
{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Release Static|Win32.ActiveCfg = Release|Win32
{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Release Static|x64.ActiveCfg = Release|x64
{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Release Unicode|Win32.ActiveCfg = Release|Win32
{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Release Unicode|x64.ActiveCfg = Release|x64
{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Release|Win32.ActiveCfg = Release|Win32
{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Release|Win32.Build.0 = Release|Win32
{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Release|x64.ActiveCfg = Release|x64
{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Release|x64.Build.0 = Release|x64
{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Debug Static|Win32.ActiveCfg = Debug|Win32
{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Debug Static|x64.ActiveCfg = Debug|x64
{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Debug Unicode|x64.ActiveCfg = Debug|x64
{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Debug|Win32.ActiveCfg = Debug|Win32
{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Debug|Win32.Build.0 = Debug|Win32
{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Debug|x64.ActiveCfg = Debug|x64
@@ -265,22 +189,10 @@ Global
{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.DLL Release|Win32.Build.0 = DLL Release|Win32
{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.DLL Release|x64.ActiveCfg = DLL Release|x64
{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.DLL Release|x64.Build.0 = DLL Release|x64
{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Release Static|Win32.ActiveCfg = Release|Win32
{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Release Static|x64.ActiveCfg = Release|x64
{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Release Unicode|Win32.ActiveCfg = Release|Win32
{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Release Unicode|x64.ActiveCfg = Release|x64
{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Release|Win32.ActiveCfg = Release|Win32
{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Release|Win32.Build.0 = Release|Win32
{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Release|x64.ActiveCfg = Release|x64
{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Release|x64.Build.0 = Release|x64
{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug Static|Win32.ActiveCfg = Debug|Win32
{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug Static|Win32.Build.0 = Debug|Win32
{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug Static|x64.ActiveCfg = Debug|x64
{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug Static|x64.Build.0 = Debug|x64
{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug Unicode|Win32.Build.0 = Debug|Win32
{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug Unicode|x64.ActiveCfg = Debug|x64
{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug Unicode|x64.Build.0 = Debug|x64
{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug|Win32.ActiveCfg = Debug|Win32
{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug|Win32.Build.0 = Debug|Win32
{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug|x64.ActiveCfg = Debug|x64
@@ -293,26 +205,10 @@ Global
{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.DLL Release|Win32.Build.0 = DLL Release|Win32
{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.DLL Release|x64.ActiveCfg = DLL Release|x64
{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.DLL Release|x64.Build.0 = DLL Release|x64
{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release Static|Win32.ActiveCfg = Release|Win32
{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release Static|Win32.Build.0 = Release|Win32
{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release Static|x64.ActiveCfg = Release|x64
{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release Static|x64.Build.0 = Release|x64
{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release Unicode|Win32.ActiveCfg = Release|Win32
{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release Unicode|Win32.Build.0 = Release|Win32
{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release Unicode|x64.ActiveCfg = Release|x64
{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release Unicode|x64.Build.0 = Release|x64
{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release|Win32.ActiveCfg = Release|Win32
{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release|Win32.Build.0 = Release|Win32
{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release|x64.ActiveCfg = Release|x64
{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release|x64.Build.0 = Release|x64
{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug Static|Win32.ActiveCfg = Debug|Win32
{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug Static|Win32.Build.0 = Debug|Win32
{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug Static|x64.ActiveCfg = Debug|x64
{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug Static|x64.Build.0 = Debug|x64
{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug Unicode|Win32.Build.0 = Debug|Win32
{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug Unicode|x64.ActiveCfg = Debug|x64
{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug Unicode|x64.Build.0 = Debug|x64
{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug|Win32.ActiveCfg = Debug|Win32
{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug|Win32.Build.0 = Debug|Win32
{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug|x64.ActiveCfg = Debug|x64
@@ -325,14 +221,6 @@ Global
{A16D3832-0F42-57CE-8F48-50E06649ADE8}.DLL Release|Win32.Build.0 = DLL Release|Win32
{A16D3832-0F42-57CE-8F48-50E06649ADE8}.DLL Release|x64.ActiveCfg = DLL Release|x64
{A16D3832-0F42-57CE-8F48-50E06649ADE8}.DLL Release|x64.Build.0 = DLL Release|x64
{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release Static|Win32.ActiveCfg = Release|Win32
{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release Static|Win32.Build.0 = Release|Win32
{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release Static|x64.ActiveCfg = Release|x64
{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release Static|x64.Build.0 = Release|x64
{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release Unicode|Win32.ActiveCfg = Release|Win32
{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release Unicode|Win32.Build.0 = Release|Win32
{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release Unicode|x64.ActiveCfg = Release|x64
{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release Unicode|x64.Build.0 = Release|x64
{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release|Win32.ActiveCfg = Release|Win32
{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release|Win32.Build.0 = Release|Win32
{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release|x64.ActiveCfg = Release|x64

View File

@@ -39,28 +39,16 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "aui", "..\build\msw\wx_aui.
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug Static|Win32 = Debug Static|Win32
Debug Static|x64 = Debug Static|x64
Debug Unicode|Win32 = Debug Unicode|Win32
Debug Unicode|x64 = Debug Unicode|x64
Debug|Win32 = Debug|Win32
Debug|x64 = Debug|x64
DLL Debug|Win32 = DLL Debug|Win32
DLL Debug|x64 = DLL Debug|x64
DLL Release|Win32 = DLL Release|Win32
DLL Release|x64 = DLL Release|x64
Release Static|Win32 = Release Static|Win32
Release Static|x64 = Release Static|x64
Release Unicode|Win32 = Release Unicode|Win32
Release Unicode|x64 = Release Unicode|x64
Release|Win32 = Release|Win32
Release|x64 = Release|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Debug Static|Win32.ActiveCfg = Debug|Win32
{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Debug Static|x64.ActiveCfg = Debug|x64
{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Debug Unicode|x64.ActiveCfg = Debug|x64
{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Debug|Win32.ActiveCfg = Debug|Win32
{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Debug|Win32.Build.0 = Debug|Win32
{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Debug|x64.ActiveCfg = Debug|x64
@@ -73,18 +61,10 @@ Global
{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.DLL Release|Win32.Build.0 = DLL Release|Win32
{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.DLL Release|x64.ActiveCfg = DLL Release|x64
{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.DLL Release|x64.Build.0 = DLL Release|x64
{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Release Static|Win32.ActiveCfg = Release|Win32
{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Release Static|x64.ActiveCfg = Release|x64
{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Release Unicode|Win32.ActiveCfg = Release|Win32
{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Release Unicode|x64.ActiveCfg = Release|x64
{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Release|Win32.ActiveCfg = Release|Win32
{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Release|Win32.Build.0 = Release|Win32
{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Release|x64.ActiveCfg = Release|x64
{9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Release|x64.Build.0 = Release|x64
{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Debug Static|Win32.ActiveCfg = Debug|Win32
{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Debug Static|x64.ActiveCfg = Debug|x64
{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Debug Unicode|x64.ActiveCfg = Debug|x64
{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Debug|Win32.ActiveCfg = Debug|Win32
{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Debug|Win32.Build.0 = Debug|Win32
{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Debug|x64.ActiveCfg = Debug|x64
@@ -97,18 +77,10 @@ Global
{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Release|Win32.Build.0 = DLL Release|Win32
{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Release|x64.ActiveCfg = DLL Release|x64
{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Release|x64.Build.0 = DLL Release|x64
{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release Static|Win32.ActiveCfg = Release|Win32
{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release Static|x64.ActiveCfg = Release|x64
{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release Unicode|Win32.ActiveCfg = Release|Win32
{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release Unicode|x64.ActiveCfg = Release|x64
{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release|Win32.ActiveCfg = Release|Win32
{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release|Win32.Build.0 = Release|Win32
{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release|x64.ActiveCfg = Release|x64
{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release|x64.Build.0 = Release|x64
{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Debug Static|Win32.ActiveCfg = Debug|Win32
{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Debug Static|x64.ActiveCfg = Debug|x64
{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Debug Unicode|x64.ActiveCfg = Debug|x64
{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Debug|Win32.ActiveCfg = Debug|Win32
{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Debug|Win32.Build.0 = Debug|Win32
{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Debug|x64.ActiveCfg = Debug|x64
@@ -121,18 +93,10 @@ Global
{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Release|Win32.Build.0 = DLL Release|Win32
{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Release|x64.ActiveCfg = DLL Release|x64
{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Release|x64.Build.0 = DLL Release|x64
{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release Static|Win32.ActiveCfg = Release|Win32
{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release Static|x64.ActiveCfg = Release|x64
{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release Unicode|Win32.ActiveCfg = Release|Win32
{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release Unicode|x64.ActiveCfg = Release|x64
{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release|Win32.ActiveCfg = Release|Win32
{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release|Win32.Build.0 = Release|Win32
{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release|x64.ActiveCfg = Release|x64
{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release|x64.Build.0 = Release|x64
{7FB0902D-8579-5DCE-B883-DAF66A885005}.Debug Static|Win32.ActiveCfg = Debug|Win32
{7FB0902D-8579-5DCE-B883-DAF66A885005}.Debug Static|x64.ActiveCfg = Debug|x64
{7FB0902D-8579-5DCE-B883-DAF66A885005}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
{7FB0902D-8579-5DCE-B883-DAF66A885005}.Debug Unicode|x64.ActiveCfg = Debug|x64
{7FB0902D-8579-5DCE-B883-DAF66A885005}.Debug|Win32.ActiveCfg = Debug|Win32
{7FB0902D-8579-5DCE-B883-DAF66A885005}.Debug|Win32.Build.0 = Debug|Win32
{7FB0902D-8579-5DCE-B883-DAF66A885005}.Debug|x64.ActiveCfg = Debug|x64
@@ -145,18 +109,10 @@ Global
{7FB0902D-8579-5DCE-B883-DAF66A885005}.DLL Release|Win32.Build.0 = DLL Release|Win32
{7FB0902D-8579-5DCE-B883-DAF66A885005}.DLL Release|x64.ActiveCfg = DLL Release|x64
{7FB0902D-8579-5DCE-B883-DAF66A885005}.DLL Release|x64.Build.0 = DLL Release|x64
{7FB0902D-8579-5DCE-B883-DAF66A885005}.Release Static|Win32.ActiveCfg = Release|Win32
{7FB0902D-8579-5DCE-B883-DAF66A885005}.Release Static|x64.ActiveCfg = Release|x64
{7FB0902D-8579-5DCE-B883-DAF66A885005}.Release Unicode|Win32.ActiveCfg = Release|Win32
{7FB0902D-8579-5DCE-B883-DAF66A885005}.Release Unicode|x64.ActiveCfg = Release|x64
{7FB0902D-8579-5DCE-B883-DAF66A885005}.Release|Win32.ActiveCfg = Release|Win32
{7FB0902D-8579-5DCE-B883-DAF66A885005}.Release|Win32.Build.0 = Release|Win32
{7FB0902D-8579-5DCE-B883-DAF66A885005}.Release|x64.ActiveCfg = Release|x64
{7FB0902D-8579-5DCE-B883-DAF66A885005}.Release|x64.Build.0 = Release|x64
{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Debug Static|Win32.ActiveCfg = Debug|Win32
{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Debug Static|x64.ActiveCfg = Debug|x64
{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Debug Unicode|x64.ActiveCfg = Debug|x64
{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Debug|Win32.ActiveCfg = Debug|Win32
{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Debug|Win32.Build.0 = Debug|Win32
{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Debug|x64.ActiveCfg = Debug|x64
@@ -169,18 +125,10 @@ Global
{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.DLL Release|Win32.Build.0 = DLL Release|Win32
{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.DLL Release|x64.ActiveCfg = DLL Release|x64
{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.DLL Release|x64.Build.0 = DLL Release|x64
{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Release Static|Win32.ActiveCfg = Release|Win32
{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Release Static|x64.ActiveCfg = Release|x64
{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Release Unicode|Win32.ActiveCfg = Release|Win32
{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Release Unicode|x64.ActiveCfg = Release|x64
{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Release|Win32.ActiveCfg = Release|Win32
{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Release|Win32.Build.0 = Release|Win32
{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Release|x64.ActiveCfg = Release|x64
{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Release|x64.Build.0 = Release|x64
{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Debug Static|Win32.ActiveCfg = Debug|Win32
{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Debug Static|x64.ActiveCfg = Debug|x64
{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Debug Unicode|x64.ActiveCfg = Debug|x64
{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Debug|Win32.ActiveCfg = Debug|Win32
{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Debug|Win32.Build.0 = Debug|Win32
{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Debug|x64.ActiveCfg = Debug|x64
@@ -193,18 +141,10 @@ Global
{33CC42F9-7756-5587-863C-8D4461B7C5DD}.DLL Release|Win32.Build.0 = DLL Release|Win32
{33CC42F9-7756-5587-863C-8D4461B7C5DD}.DLL Release|x64.ActiveCfg = DLL Release|x64
{33CC42F9-7756-5587-863C-8D4461B7C5DD}.DLL Release|x64.Build.0 = DLL Release|x64
{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Release Static|Win32.ActiveCfg = Release|Win32
{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Release Static|x64.ActiveCfg = Release|x64
{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Release Unicode|Win32.ActiveCfg = Release|Win32
{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Release Unicode|x64.ActiveCfg = Release|x64
{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Release|Win32.ActiveCfg = Release|Win32
{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Release|Win32.Build.0 = Release|Win32
{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Release|x64.ActiveCfg = Release|x64
{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Release|x64.Build.0 = Release|x64
{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Debug Static|Win32.ActiveCfg = Debug|Win32
{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Debug Static|x64.ActiveCfg = Debug|x64
{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Debug Unicode|x64.ActiveCfg = Debug|x64
{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Debug|Win32.ActiveCfg = Debug|Win32
{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Debug|Win32.Build.0 = Debug|Win32
{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Debug|x64.ActiveCfg = Debug|x64
@@ -217,18 +157,10 @@ Global
{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.DLL Release|Win32.Build.0 = DLL Release|Win32
{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.DLL Release|x64.ActiveCfg = DLL Release|x64
{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.DLL Release|x64.Build.0 = DLL Release|x64
{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Release Static|Win32.ActiveCfg = Release|Win32
{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Release Static|x64.ActiveCfg = Release|x64
{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Release Unicode|Win32.ActiveCfg = Release|Win32
{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Release Unicode|x64.ActiveCfg = Release|x64
{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Release|Win32.ActiveCfg = Release|Win32
{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Release|Win32.Build.0 = Release|Win32
{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Release|x64.ActiveCfg = Release|x64
{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Release|x64.Build.0 = Release|x64
{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Debug Static|Win32.ActiveCfg = Debug|Win32
{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Debug Static|x64.ActiveCfg = Debug|x64
{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Debug Unicode|x64.ActiveCfg = Debug|x64
{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Debug|Win32.ActiveCfg = Debug|Win32
{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Debug|Win32.Build.0 = Debug|Win32
{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Debug|x64.ActiveCfg = Debug|x64
@@ -241,18 +173,10 @@ Global
{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.DLL Release|Win32.Build.0 = DLL Release|Win32
{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.DLL Release|x64.ActiveCfg = DLL Release|x64
{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.DLL Release|x64.Build.0 = DLL Release|x64
{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Release Static|Win32.ActiveCfg = Release|Win32
{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Release Static|x64.ActiveCfg = Release|x64
{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Release Unicode|Win32.ActiveCfg = Release|Win32
{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Release Unicode|x64.ActiveCfg = Release|x64
{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Release|Win32.ActiveCfg = Release|Win32
{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Release|Win32.Build.0 = Release|Win32
{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Release|x64.ActiveCfg = Release|x64
{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Release|x64.Build.0 = Release|x64
{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Debug Static|Win32.ActiveCfg = Debug|Win32
{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Debug Static|x64.ActiveCfg = Debug|x64
{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Debug Unicode|x64.ActiveCfg = Debug|x64
{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Debug|Win32.ActiveCfg = Debug|Win32
{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Debug|Win32.Build.0 = Debug|Win32
{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Debug|x64.ActiveCfg = Debug|x64
@@ -265,22 +189,10 @@ Global
{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.DLL Release|Win32.Build.0 = DLL Release|Win32
{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.DLL Release|x64.ActiveCfg = DLL Release|x64
{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.DLL Release|x64.Build.0 = DLL Release|x64
{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Release Static|Win32.ActiveCfg = Release|Win32
{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Release Static|x64.ActiveCfg = Release|x64
{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Release Unicode|Win32.ActiveCfg = Release|Win32
{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Release Unicode|x64.ActiveCfg = Release|x64
{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Release|Win32.ActiveCfg = Release|Win32
{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Release|Win32.Build.0 = Release|Win32
{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Release|x64.ActiveCfg = Release|x64
{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Release|x64.Build.0 = Release|x64
{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug Static|Win32.ActiveCfg = Debug|Win32
{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug Static|Win32.Build.0 = Debug|Win32
{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug Static|x64.ActiveCfg = Debug|x64
{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug Static|x64.Build.0 = Debug|x64
{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug Unicode|Win32.Build.0 = Debug|Win32
{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug Unicode|x64.ActiveCfg = Debug|x64
{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug Unicode|x64.Build.0 = Debug|x64
{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug|Win32.ActiveCfg = Debug|Win32
{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug|Win32.Build.0 = Debug|Win32
{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug|x64.ActiveCfg = Debug|x64
@@ -293,26 +205,10 @@ Global
{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.DLL Release|Win32.Build.0 = DLL Release|Win32
{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.DLL Release|x64.ActiveCfg = DLL Release|x64
{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.DLL Release|x64.Build.0 = DLL Release|x64
{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release Static|Win32.ActiveCfg = Release|Win32
{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release Static|Win32.Build.0 = Release|Win32
{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release Static|x64.ActiveCfg = Release|x64
{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release Static|x64.Build.0 = Release|x64
{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release Unicode|Win32.ActiveCfg = Release|Win32
{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release Unicode|Win32.Build.0 = Release|Win32
{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release Unicode|x64.ActiveCfg = Release|x64
{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release Unicode|x64.Build.0 = Release|x64
{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release|Win32.ActiveCfg = Release|Win32
{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release|Win32.Build.0 = Release|Win32
{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release|x64.ActiveCfg = Release|x64
{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release|x64.Build.0 = Release|x64
{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug Static|Win32.ActiveCfg = Debug|Win32
{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug Static|Win32.Build.0 = Debug|Win32
{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug Static|x64.ActiveCfg = Debug|x64
{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug Static|x64.Build.0 = Debug|x64
{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug Unicode|Win32.Build.0 = Debug|Win32
{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug Unicode|x64.ActiveCfg = Debug|x64
{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug Unicode|x64.Build.0 = Debug|x64
{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug|Win32.ActiveCfg = Debug|Win32
{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug|Win32.Build.0 = Debug|Win32
{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug|x64.ActiveCfg = Debug|x64
@@ -325,14 +221,6 @@ Global
{A16D3832-0F42-57CE-8F48-50E06649ADE8}.DLL Release|Win32.Build.0 = DLL Release|Win32
{A16D3832-0F42-57CE-8F48-50E06649ADE8}.DLL Release|x64.ActiveCfg = DLL Release|x64
{A16D3832-0F42-57CE-8F48-50E06649ADE8}.DLL Release|x64.Build.0 = DLL Release|x64
{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release Static|Win32.ActiveCfg = Release|Win32
{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release Static|Win32.Build.0 = Release|Win32
{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release Static|x64.ActiveCfg = Release|x64
{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release Static|x64.Build.0 = Release|x64
{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release Unicode|Win32.ActiveCfg = Release|Win32
{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release Unicode|Win32.Build.0 = Release|Win32
{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release Unicode|x64.ActiveCfg = Release|x64
{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release Unicode|x64.Build.0 = Release|x64
{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release|Win32.ActiveCfg = Release|Win32
{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release|Win32.Build.0 = Release|Win32
{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release|x64.ActiveCfg = Release|x64

View File

@@ -48,7 +48,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../include/wx/msw/wx-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxbase31ud_net.lib wxbase31ud_xml.lib wxbase31ud.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\test.exe"
LinkIncremental="2"
@@ -113,7 +113,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../include/wx/msw/wx-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxbase31u_net.lib wxbase31u_xml.lib wxbase31u.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\test.exe"
LinkIncremental="1"
@@ -183,7 +183,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../include/wx/msw/wx-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxbase31ud_net.lib wxbase31ud_xml.lib wxbase31ud.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\test.exe"
LinkIncremental="2"
@@ -248,7 +248,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../include/wx/msw/wx-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxbase31u_net.lib wxbase31u_xml.lib wxbase31u.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\test.exe"
LinkIncremental="1"

View File

@@ -48,7 +48,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../include/wx/msw/wx-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxmsw31ud_core.lib wxbase31ud_net.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\test_drawing.exe"
LinkIncremental="2"
@@ -113,7 +113,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../include/wx/msw/wx-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxmsw31u_core.lib wxbase31u_net.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\test_drawing.exe"
LinkIncremental="1"
@@ -183,7 +183,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../include/wx/msw/wx-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxmsw31ud_core.lib wxbase31ud_net.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\test_drawing.exe"
LinkIncremental="2"
@@ -248,7 +248,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../include/wx/msw/wx-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxmsw31u_core.lib wxbase31u_net.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\test_drawing.exe"
LinkIncremental="1"

View File

@@ -45,7 +45,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../include/wx/msw/wx-dpi-aware-pmv2.manifest"
AdditionalDependencies="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\test_drawingplugin.dll"
LinkIncremental="2"
@@ -106,7 +106,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../include/wx/msw/wx-dpi-aware-pmv2.manifest"
AdditionalDependencies="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\test_drawingplugin.dll"
LinkIncremental="1"

View File

@@ -48,7 +48,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../include/wx/msw/wx-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxmsw31ud_webview.lib wxmsw31ud_stc.lib wxmsw31ud_aui.lib wxmsw31ud_richtext.lib wxmsw31ud_media.lib wxmsw31ud_xrc.lib wxbase31ud_xml.lib wxmsw31ud_html.lib wxmsw31ud_core.lib wxbase31ud_net.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\test_gui.exe"
LinkIncremental="2"
@@ -113,7 +113,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../include/wx/msw/wx-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxmsw31u_webview.lib wxmsw31u_stc.lib wxmsw31u_aui.lib wxmsw31u_richtext.lib wxmsw31u_media.lib wxmsw31u_xrc.lib wxbase31u_xml.lib wxmsw31u_html.lib wxmsw31u_core.lib wxbase31u_net.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\test_gui.exe"
LinkIncremental="1"
@@ -183,7 +183,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../include/wx/msw/wx-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxmsw31ud_webview.lib wxmsw31ud_stc.lib wxmsw31ud_aui.lib wxmsw31ud_richtext.lib wxmsw31ud_media.lib wxmsw31ud_xrc.lib wxbase31ud_xml.lib wxmsw31ud_html.lib wxmsw31ud_core.lib wxbase31ud_net.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\test_gui.exe"
LinkIncremental="2"
@@ -248,7 +248,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../include/wx/msw/wx-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxmsw31u_webview.lib wxmsw31u_stc.lib wxmsw31u_aui.lib wxmsw31u_richtext.lib wxmsw31u_media.lib wxmsw31u_xrc.lib wxbase31u_xml.lib wxmsw31u_html.lib wxmsw31u_core.lib wxbase31u_net.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\test_gui.exe"
LinkIncremental="1"

View File

@@ -85,7 +85,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../include/wx/msw/wx-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxbase31ud_net.lib wxbase31ud_xml.lib wxbase31ud.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\test.exe"
LinkIncremental="2"
@@ -182,7 +182,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../include/wx/msw/wx-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxbase31u_net.lib wxbase31u_xml.lib wxbase31u.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\test.exe"
LinkIncremental="1"
@@ -284,7 +284,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../include/wx/msw/wx-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxbase31ud_net.lib wxbase31ud_xml.lib wxbase31ud.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\test.exe"
LinkIncremental="2"
@@ -381,7 +381,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../include/wx/msw/wx-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxbase31u_net.lib wxbase31u_xml.lib wxbase31u.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\test.exe"
LinkIncremental="1"
@@ -483,7 +483,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../include/wx/msw/amd64-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxbase31ud_net.lib wxbase31ud_xml.lib wxbase31ud.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\test.exe"
LinkIncremental="2"
@@ -580,7 +580,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../include/wx/msw/amd64-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxbase31u_net.lib wxbase31u_xml.lib wxbase31u.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\test.exe"
LinkIncremental="1"
@@ -682,7 +682,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../include/wx/msw/amd64-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxbase31ud_net.lib wxbase31ud_xml.lib wxbase31ud.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\test.exe"
LinkIncremental="2"
@@ -779,7 +779,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../include/wx/msw/amd64-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxbase31u_net.lib wxbase31u_xml.lib wxbase31u.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\test.exe"
LinkIncremental="1"

View File

@@ -85,7 +85,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../include/wx/msw/wx-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxmsw31ud_core.lib wxbase31ud_net.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\test_drawing.exe"
LinkIncremental="2"
@@ -182,7 +182,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../include/wx/msw/wx-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxmsw31u_core.lib wxbase31u_net.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\test_drawing.exe"
LinkIncremental="1"
@@ -284,7 +284,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../include/wx/msw/wx-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxmsw31ud_core.lib wxbase31ud_net.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\test_drawing.exe"
LinkIncremental="2"
@@ -381,7 +381,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../include/wx/msw/wx-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxmsw31u_core.lib wxbase31u_net.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\test_drawing.exe"
LinkIncremental="1"
@@ -483,7 +483,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../include/wx/msw/amd64-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxmsw31ud_core.lib wxbase31ud_net.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\test_drawing.exe"
LinkIncremental="2"
@@ -580,7 +580,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../include/wx/msw/amd64-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxmsw31u_core.lib wxbase31u_net.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\test_drawing.exe"
LinkIncremental="1"
@@ -682,7 +682,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../include/wx/msw/amd64-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxmsw31ud_core.lib wxbase31ud_net.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\test_drawing.exe"
LinkIncremental="2"
@@ -779,7 +779,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../include/wx/msw/amd64-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxmsw31u_core.lib wxbase31u_net.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\test_drawing.exe"
LinkIncremental="1"

View File

@@ -82,7 +82,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../include/wx/msw/wx-dpi-aware-pmv2.manifest"
AdditionalDependencies="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\test_drawingplugin.dll"
LinkIncremental="2"
@@ -169,7 +169,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../include/wx/msw/wx-dpi-aware-pmv2.manifest"
AdditionalDependencies="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\test_drawingplugin.dll"
LinkIncremental="1"
@@ -261,7 +261,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../include/wx/msw/amd64-dpi-aware-pmv2.manifest"
AdditionalDependencies="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\test_drawingplugin.dll"
LinkIncremental="2"
@@ -348,7 +348,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../include/wx/msw/amd64-dpi-aware-pmv2.manifest"
AdditionalDependencies="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\test_drawingplugin.dll"
LinkIncremental="1"

View File

@@ -85,7 +85,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../include/wx/msw/wx-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxmsw31ud_webview.lib wxmsw31ud_stc.lib wxmsw31ud_aui.lib wxmsw31ud_richtext.lib wxmsw31ud_media.lib wxmsw31ud_xrc.lib wxbase31ud_xml.lib wxmsw31ud_html.lib wxmsw31ud_core.lib wxbase31ud_net.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\test_gui.exe"
LinkIncremental="2"
@@ -182,7 +182,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../include/wx/msw/wx-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxmsw31u_webview.lib wxmsw31u_stc.lib wxmsw31u_aui.lib wxmsw31u_richtext.lib wxmsw31u_media.lib wxmsw31u_xrc.lib wxbase31u_xml.lib wxmsw31u_html.lib wxmsw31u_core.lib wxbase31u_net.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\test_gui.exe"
LinkIncremental="1"
@@ -284,7 +284,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../include/wx/msw/wx-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxmsw31ud_webview.lib wxmsw31ud_stc.lib wxmsw31ud_aui.lib wxmsw31ud_richtext.lib wxmsw31ud_media.lib wxmsw31ud_xrc.lib wxbase31ud_xml.lib wxmsw31ud_html.lib wxmsw31ud_core.lib wxbase31ud_net.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\test_gui.exe"
LinkIncremental="2"
@@ -381,7 +381,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../include/wx/msw/wx-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxmsw31u_webview.lib wxmsw31u_stc.lib wxmsw31u_aui.lib wxmsw31u_richtext.lib wxmsw31u_media.lib wxmsw31u_xrc.lib wxbase31u_xml.lib wxmsw31u_html.lib wxmsw31u_core.lib wxbase31u_net.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\test_gui.exe"
LinkIncremental="1"
@@ -483,7 +483,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../include/wx/msw/amd64-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxmsw31ud_webview.lib wxmsw31ud_stc.lib wxmsw31ud_aui.lib wxmsw31ud_richtext.lib wxmsw31ud_media.lib wxmsw31ud_xrc.lib wxbase31ud_xml.lib wxmsw31ud_html.lib wxmsw31ud_core.lib wxbase31ud_net.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\test_gui.exe"
LinkIncremental="2"
@@ -580,7 +580,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../include/wx/msw/amd64-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxmsw31u_webview.lib wxmsw31u_stc.lib wxmsw31u_aui.lib wxmsw31u_richtext.lib wxmsw31u_media.lib wxmsw31u_xrc.lib wxbase31u_xml.lib wxmsw31u_html.lib wxmsw31u_core.lib wxbase31u_net.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\test_gui.exe"
LinkIncremental="1"
@@ -682,7 +682,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../include/wx/msw/amd64-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxmsw31ud_webview.lib wxmsw31ud_stc.lib wxmsw31ud_aui.lib wxmsw31ud_richtext.lib wxmsw31ud_media.lib wxmsw31ud_xrc.lib wxbase31ud_xml.lib wxmsw31ud_html.lib wxmsw31ud_core.lib wxbase31ud_net.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\test_gui.exe"
LinkIncremental="2"
@@ -779,7 +779,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../include/wx/msw/amd64-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxmsw31u_webview.lib wxmsw31u_stc.lib wxmsw31u_aui.lib wxmsw31u_richtext.lib wxmsw31u_media.lib wxmsw31u_xrc.lib wxbase31u_xml.lib wxmsw31u_html.lib wxmsw31u_core.lib wxbase31u_net.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\test_gui.exe"
LinkIncremental="1"

View File

@@ -84,7 +84,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../include/wx/msw/wx-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxbase31ud_net.lib wxbase31ud_xml.lib wxbase31ud.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\test.exe"
LinkIncremental="2"
@@ -178,7 +178,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../include/wx/msw/wx-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxbase31u_net.lib wxbase31u_xml.lib wxbase31u.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\test.exe"
LinkIncremental="1"
@@ -276,7 +276,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../include/wx/msw/wx-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxbase31ud_net.lib wxbase31ud_xml.lib wxbase31ud.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\test.exe"
LinkIncremental="2"
@@ -370,7 +370,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../include/wx/msw/wx-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxbase31u_net.lib wxbase31u_xml.lib wxbase31u.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\test.exe"
LinkIncremental="1"
@@ -468,7 +468,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../include/wx/msw/amd64-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxbase31ud_net.lib wxbase31ud_xml.lib wxbase31ud.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\test.exe"
LinkIncremental="2"
@@ -562,7 +562,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../include/wx/msw/amd64-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxbase31u_net.lib wxbase31u_xml.lib wxbase31u.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\test.exe"
LinkIncremental="1"
@@ -660,7 +660,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../include/wx/msw/amd64-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxbase31ud_net.lib wxbase31ud_xml.lib wxbase31ud.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\test.exe"
LinkIncremental="2"
@@ -754,7 +754,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../include/wx/msw/amd64-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxbase31u_net.lib wxbase31u_xml.lib wxbase31u.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\test.exe"
LinkIncremental="1"

View File

@@ -84,7 +84,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../include/wx/msw/wx-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxmsw31ud_core.lib wxbase31ud_net.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\test_drawing.exe"
LinkIncremental="2"
@@ -178,7 +178,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../include/wx/msw/wx-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxmsw31u_core.lib wxbase31u_net.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\test_drawing.exe"
LinkIncremental="1"
@@ -276,7 +276,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../include/wx/msw/wx-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxmsw31ud_core.lib wxbase31ud_net.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\test_drawing.exe"
LinkIncremental="2"
@@ -370,7 +370,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../include/wx/msw/wx-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxmsw31u_core.lib wxbase31u_net.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\test_drawing.exe"
LinkIncremental="1"
@@ -468,7 +468,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../include/wx/msw/amd64-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxmsw31ud_core.lib wxbase31ud_net.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\test_drawing.exe"
LinkIncremental="2"
@@ -562,7 +562,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../include/wx/msw/amd64-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxmsw31u_core.lib wxbase31u_net.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\test_drawing.exe"
LinkIncremental="1"
@@ -660,7 +660,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../include/wx/msw/amd64-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxmsw31ud_core.lib wxbase31ud_net.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\test_drawing.exe"
LinkIncremental="2"
@@ -754,7 +754,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../include/wx/msw/amd64-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxmsw31u_core.lib wxbase31u_net.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\test_drawing.exe"
LinkIncremental="1"

View File

@@ -81,7 +81,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../include/wx/msw/wx-dpi-aware-pmv2.manifest"
AdditionalDependencies="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\test_drawingplugin.dll"
LinkIncremental="2"
@@ -168,7 +168,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../include/wx/msw/wx-dpi-aware-pmv2.manifest"
AdditionalDependencies="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\test_drawingplugin.dll"
LinkIncremental="1"
@@ -259,7 +259,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../include/wx/msw/amd64-dpi-aware-pmv2.manifest"
AdditionalDependencies="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\test_drawingplugin.dll"
LinkIncremental="2"
@@ -346,7 +346,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../include/wx/msw/amd64-dpi-aware-pmv2.manifest"
AdditionalDependencies="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\test_drawingplugin.dll"
LinkIncremental="1"

View File

@@ -84,7 +84,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../include/wx/msw/wx-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxmsw31ud_webview.lib wxmsw31ud_stc.lib wxmsw31ud_aui.lib wxmsw31ud_richtext.lib wxmsw31ud_media.lib wxmsw31ud_xrc.lib wxbase31ud_xml.lib wxmsw31ud_html.lib wxmsw31ud_core.lib wxbase31ud_net.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\test_gui.exe"
LinkIncremental="2"
@@ -178,7 +178,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../include/wx/msw/wx-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxmsw31u_webview.lib wxmsw31u_stc.lib wxmsw31u_aui.lib wxmsw31u_richtext.lib wxmsw31u_media.lib wxmsw31u_xrc.lib wxbase31u_xml.lib wxmsw31u_html.lib wxmsw31u_core.lib wxbase31u_net.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\test_gui.exe"
LinkIncremental="1"
@@ -276,7 +276,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../include/wx/msw/wx-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxmsw31ud_webview.lib wxmsw31ud_stc.lib wxmsw31ud_aui.lib wxmsw31ud_richtext.lib wxmsw31ud_media.lib wxmsw31ud_xrc.lib wxbase31ud_xml.lib wxmsw31ud_html.lib wxmsw31ud_core.lib wxbase31ud_net.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\test_gui.exe"
LinkIncremental="2"
@@ -370,7 +370,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../include/wx/msw/wx-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxmsw31u_webview.lib wxmsw31u_stc.lib wxmsw31u_aui.lib wxmsw31u_richtext.lib wxmsw31u_media.lib wxmsw31u_xrc.lib wxbase31u_xml.lib wxmsw31u_html.lib wxmsw31u_core.lib wxbase31u_net.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\test_gui.exe"
LinkIncremental="1"
@@ -468,7 +468,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../include/wx/msw/amd64-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxmsw31ud_webview.lib wxmsw31ud_stc.lib wxmsw31ud_aui.lib wxmsw31ud_richtext.lib wxmsw31ud_media.lib wxmsw31ud_xrc.lib wxbase31ud_xml.lib wxmsw31ud_html.lib wxmsw31ud_core.lib wxbase31ud_net.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\test_gui.exe"
LinkIncremental="2"
@@ -562,7 +562,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../include/wx/msw/amd64-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxmsw31u_webview.lib wxmsw31u_stc.lib wxmsw31u_aui.lib wxmsw31u_richtext.lib wxmsw31u_media.lib wxmsw31u_xrc.lib wxbase31u_xml.lib wxmsw31u_html.lib wxmsw31u_core.lib wxbase31u_net.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\test_gui.exe"
LinkIncremental="1"
@@ -660,7 +660,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../include/wx/msw/amd64-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxmsw31ud_webview.lib wxmsw31ud_stc.lib wxmsw31ud_aui.lib wxmsw31ud_richtext.lib wxmsw31ud_media.lib wxmsw31ud_xrc.lib wxbase31ud_xml.lib wxmsw31ud_html.lib wxmsw31ud_core.lib wxbase31ud_net.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\test_gui.exe"
LinkIncremental="2"
@@ -754,7 +754,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../include/wx/msw/amd64-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxmsw31u_webview.lib wxmsw31u_stc.lib wxmsw31u_aui.lib wxmsw31u_richtext.lib wxmsw31u_media.lib wxmsw31u_xrc.lib wxbase31u_xml.lib wxmsw31u_html.lib wxmsw31u_core.lib wxbase31u_net.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\test_gui.exe"
LinkIncremental="1"