Merge branch 'pmdpi-build' of git://github.com/MaartenBent/wxWidgets

Improve DPI aware builds with .vc and .vcproj files.

See https://github.com/wxWidgets/wxWidgets/pull/1769
This commit is contained in:
Vadim Zeitlin
2020-03-28 14:10:17 +01:00
550 changed files with 22579 additions and 4523 deletions
+56 -10
View File
@@ -43,6 +43,8 @@
<if cond="TARGET_CPU=='IA64'">_ia64</if>
<if cond="TARGET_CPU=='x64'">_x64</if>
<if cond="TARGET_CPU=='X64'">_x64</if>
<if cond="FORMAT=='msvc' and TARGET_CPU=='' and VISUALSTUDIOPLATFORM=='x64'">_x64</if>
<if cond="FORMAT=='msvc' and TARGET_CPU=='' and VISUALSTUDIOPLATFORM=='X64'">_x64</if>
</set>
<!-- ================================================================== -->
@@ -326,6 +328,8 @@
<if cond="TARGET_CPU=='IA64'">/MACHINE:IA64</if>
<if cond="TARGET_CPU=='x64'">/MACHINE:X64</if>
<if cond="TARGET_CPU=='X64'">/MACHINE:X64</if>
<if cond="FORMAT=='msvc' and TARGET_CPU=='' and VISUALSTUDIOPLATFORM=='x64'">/MACHINE:X64</if>
<if cond="FORMAT=='msvc' and TARGET_CPU=='' and VISUALSTUDIOPLATFORM=='X64'">/MACHINE:X64</if>
</set>
<set var="WIN32_DPI_LINKFLAG"></set>
@@ -344,19 +348,60 @@
<if cond="FORMAT=='msvc'">
<set var="WIN32_DPI_LINKFLAG">
<!-- 32-bit system dpi -->
<if cond="USE_DPI_AWARE_MANIFEST=='1' and TARGET_CPU==''">/MANIFEST:EMBED /MANIFESTINPUT:$(TOP_SRCDIR)include/wx/msw/wx_dpi_aware.manifest</if>
<if cond="USE_DPI_AWARE_MANIFEST=='1' and VISUALSTUDIOVERSION=='14.0' and TARGET_CPU==''">/MANIFEST:EMBED /MANIFESTINPUT:$(TOP_SRCDIR)include/wx/msw/wx_dpi_aware.manifest</if>
<if cond="USE_DPI_AWARE_MANIFEST=='1' and VISUALSTUDIOVERSION=='15.0' and TARGET_CPU==''">/MANIFEST:EMBED /MANIFESTINPUT:$(TOP_SRCDIR)include/wx/msw/wx_dpi_aware.manifest</if>
<if cond="USE_DPI_AWARE_MANIFEST=='1' and VISUALSTUDIOVERSION=='16.0' and TARGET_CPU==''">/MANIFEST:EMBED /MANIFESTINPUT:$(TOP_SRCDIR)include/wx/msw/wx_dpi_aware.manifest</if>
<!-- 64-bit system dpi -->
<if cond="USE_DPI_AWARE_MANIFEST=='1' and TARGET_CPU=='amd64'">/MANIFEST:EMBED /MANIFESTINPUT:$(TOP_SRCDIR)include/wx/msw/amd64_dpi_aware.manifest</if>
<if cond="USE_DPI_AWARE_MANIFEST=='1' and TARGET_CPU=='AMD64'">/MANIFEST:EMBED /MANIFESTINPUT:$(TOP_SRCDIR)include/wx/msw/amd64_dpi_aware.manifest</if>
<if cond="USE_DPI_AWARE_MANIFEST=='1' and TARGET_CPU=='x64'">/MANIFEST:EMBED /MANIFESTINPUT:$(TOP_SRCDIR)include/wx/msw/amd64_dpi_aware.manifest</if>
<if cond="USE_DPI_AWARE_MANIFEST=='1' and TARGET_CPU=='X64'">/MANIFEST:EMBED /MANIFESTINPUT:$(TOP_SRCDIR)include/wx/msw/amd64_dpi_aware.manifest</if>
<if cond="USE_DPI_AWARE_MANIFEST=='1' and VISUALSTUDIOVERSION=='14.0' and TARGET_CPU=='amd64'">/MANIFEST:EMBED /MANIFESTINPUT:$(TOP_SRCDIR)include/wx/msw/amd64_dpi_aware.manifest</if>
<if cond="USE_DPI_AWARE_MANIFEST=='1' and VISUALSTUDIOVERSION=='15.0' and TARGET_CPU=='amd64'">/MANIFEST:EMBED /MANIFESTINPUT:$(TOP_SRCDIR)include/wx/msw/amd64_dpi_aware.manifest</if>
<if cond="USE_DPI_AWARE_MANIFEST=='1' and VISUALSTUDIOVERSION=='16.0' and TARGET_CPU=='amd64'">/MANIFEST:EMBED /MANIFESTINPUT:$(TOP_SRCDIR)include/wx/msw/amd64_dpi_aware.manifest</if>
<if cond="USE_DPI_AWARE_MANIFEST=='1' and VISUALSTUDIOVERSION=='14.0' and TARGET_CPU=='AMD64'">/MANIFEST:EMBED /MANIFESTINPUT:$(TOP_SRCDIR)include/wx/msw/amd64_dpi_aware.manifest</if>
<if cond="USE_DPI_AWARE_MANIFEST=='1' and VISUALSTUDIOVERSION=='15.0' and TARGET_CPU=='AMD64'">/MANIFEST:EMBED /MANIFESTINPUT:$(TOP_SRCDIR)include/wx/msw/amd64_dpi_aware.manifest</if>
<if cond="USE_DPI_AWARE_MANIFEST=='1' and VISUALSTUDIOVERSION=='16.0' and TARGET_CPU=='AMD64'">/MANIFEST:EMBED /MANIFESTINPUT:$(TOP_SRCDIR)include/wx/msw/amd64_dpi_aware.manifest</if>
<if cond="USE_DPI_AWARE_MANIFEST=='1' and VISUALSTUDIOVERSION=='14.0' and TARGET_CPU=='x64'">/MANIFEST:EMBED /MANIFESTINPUT:$(TOP_SRCDIR)include/wx/msw/amd64_dpi_aware.manifest</if>
<if cond="USE_DPI_AWARE_MANIFEST=='1' and VISUALSTUDIOVERSION=='15.0' and TARGET_CPU=='x64'">/MANIFEST:EMBED /MANIFESTINPUT:$(TOP_SRCDIR)include/wx/msw/amd64_dpi_aware.manifest</if>
<if cond="USE_DPI_AWARE_MANIFEST=='1' and VISUALSTUDIOVERSION=='16.0' and TARGET_CPU=='x64'">/MANIFEST:EMBED /MANIFESTINPUT:$(TOP_SRCDIR)include/wx/msw/amd64_dpi_aware.manifest</if>
<if cond="USE_DPI_AWARE_MANIFEST=='1' and VISUALSTUDIOVERSION=='14.0' and TARGET_CPU=='X64'">/MANIFEST:EMBED /MANIFESTINPUT:$(TOP_SRCDIR)include/wx/msw/amd64_dpi_aware.manifest</if>
<if cond="USE_DPI_AWARE_MANIFEST=='1' and VISUALSTUDIOVERSION=='15.0' and TARGET_CPU=='X64'">/MANIFEST:EMBED /MANIFESTINPUT:$(TOP_SRCDIR)include/wx/msw/amd64_dpi_aware.manifest</if>
<if cond="USE_DPI_AWARE_MANIFEST=='1' and VISUALSTUDIOVERSION=='16.0' and TARGET_CPU=='X64'">/MANIFEST:EMBED /MANIFESTINPUT:$(TOP_SRCDIR)include/wx/msw/amd64_dpi_aware.manifest</if>
<if cond="USE_DPI_AWARE_MANIFEST=='1' and VISUALSTUDIOVERSION=='14.0' and TARGET_CPU=='' and VISUALSTUDIOPLATFORM=='x64'">/MANIFEST:EMBED /MANIFESTINPUT:$(TOP_SRCDIR)include/wx/msw/amd64_dpi_aware.manifest</if>
<if cond="USE_DPI_AWARE_MANIFEST=='1' and VISUALSTUDIOVERSION=='15.0' and TARGET_CPU=='' and VISUALSTUDIOPLATFORM=='x64'">/MANIFEST:EMBED /MANIFESTINPUT:$(TOP_SRCDIR)include/wx/msw/amd64_dpi_aware.manifest</if>
<if cond="USE_DPI_AWARE_MANIFEST=='1' and VISUALSTUDIOVERSION=='16.0' and TARGET_CPU=='' and VISUALSTUDIOPLATFORM=='x64'">/MANIFEST:EMBED /MANIFESTINPUT:$(TOP_SRCDIR)include/wx/msw/amd64_dpi_aware.manifest</if>
<if cond="USE_DPI_AWARE_MANIFEST=='1' and VISUALSTUDIOVERSION=='14.0' and TARGET_CPU=='' and VISUALSTUDIOPLATFORM=='X64'">/MANIFEST:EMBED /MANIFESTINPUT:$(TOP_SRCDIR)include/wx/msw/amd64_dpi_aware.manifest</if>
<if cond="USE_DPI_AWARE_MANIFEST=='1' and VISUALSTUDIOVERSION=='15.0' and TARGET_CPU=='' and VISUALSTUDIOPLATFORM=='X64'">/MANIFEST:EMBED /MANIFESTINPUT:$(TOP_SRCDIR)include/wx/msw/amd64_dpi_aware.manifest</if>
<if cond="USE_DPI_AWARE_MANIFEST=='1' and VISUALSTUDIOVERSION=='16.0' and TARGET_CPU=='' and VISUALSTUDIOPLATFORM=='X64'">/MANIFEST:EMBED /MANIFESTINPUT:$(TOP_SRCDIR)include/wx/msw/amd64_dpi_aware.manifest</if>
<!-- 32-bit per-monitor dpi -->
<if cond="USE_DPI_AWARE_MANIFEST=='2' and TARGET_CPU==''">/MANIFEST:EMBED /MANIFESTINPUT:$(TOP_SRCDIR)include/wx/msw/wx_dpi_aware_pmv2.manifest</if>
<if cond="USE_DPI_AWARE_MANIFEST=='2' and VISUALSTUDIOVERSION=='14.0' and TARGET_CPU==''">/MANIFEST:EMBED /MANIFESTINPUT:$(TOP_SRCDIR)include/wx/msw/wx_dpi_aware_pmv2.manifest</if>
<if cond="USE_DPI_AWARE_MANIFEST=='2' and VISUALSTUDIOVERSION=='15.0' and TARGET_CPU==''">/MANIFEST:EMBED /MANIFESTINPUT:$(TOP_SRCDIR)include/wx/msw/wx_dpi_aware_pmv2.manifest</if>
<if cond="USE_DPI_AWARE_MANIFEST=='2' and VISUALSTUDIOVERSION=='16.0' and TARGET_CPU==''">/MANIFEST:EMBED /MANIFESTINPUT:$(TOP_SRCDIR)include/wx/msw/wx_dpi_aware_pmv2.manifest</if>
<!-- 64-bit per-monitor dpi -->
<if cond="USE_DPI_AWARE_MANIFEST=='2' and TARGET_CPU=='amd64'">/MANIFEST:EMBED /MANIFESTINPUT:$(TOP_SRCDIR)include/wx/msw/amd64_dpi_aware_pmv2.manifest</if>
<if cond="USE_DPI_AWARE_MANIFEST=='2' and TARGET_CPU=='AMD64'">/MANIFEST:EMBED /MANIFESTINPUT:$(TOP_SRCDIR)include/wx/msw/amd64_dpi_aware_pmv2.manifest</if>
<if cond="USE_DPI_AWARE_MANIFEST=='2' and TARGET_CPU=='x64'">/MANIFEST:EMBED /MANIFESTINPUT:$(TOP_SRCDIR)include/wx/msw/amd64_dpi_aware_pmv2.manifest</if>
<if cond="USE_DPI_AWARE_MANIFEST=='2' and TARGET_CPU=='X64'">/MANIFEST:EMBED /MANIFESTINPUT:$(TOP_SRCDIR)include/wx/msw/amd64_dpi_aware_pmv2.manifest</if>
<if cond="USE_DPI_AWARE_MANIFEST=='2' and VISUALSTUDIOVERSION=='14.0' and TARGET_CPU=='amd64'">/MANIFEST:EMBED /MANIFESTINPUT:$(TOP_SRCDIR)include/wx/msw/amd64_dpi_aware_pmv2.manifest</if>
<if cond="USE_DPI_AWARE_MANIFEST=='2' and VISUALSTUDIOVERSION=='15.0' and TARGET_CPU=='amd64'">/MANIFEST:EMBED /MANIFESTINPUT:$(TOP_SRCDIR)include/wx/msw/amd64_dpi_aware_pmv2.manifest</if>
<if cond="USE_DPI_AWARE_MANIFEST=='2' and VISUALSTUDIOVERSION=='16.0' and TARGET_CPU=='amd64'">/MANIFEST:EMBED /MANIFESTINPUT:$(TOP_SRCDIR)include/wx/msw/amd64_dpi_aware_pmv2.manifest</if>
<if cond="USE_DPI_AWARE_MANIFEST=='2' and VISUALSTUDIOVERSION=='14.0' and TARGET_CPU=='AMD64'">/MANIFEST:EMBED /MANIFESTINPUT:$(TOP_SRCDIR)include/wx/msw/amd64_dpi_aware_pmv2.manifest</if>
<if cond="USE_DPI_AWARE_MANIFEST=='2' and VISUALSTUDIOVERSION=='15.0' and TARGET_CPU=='AMD64'">/MANIFEST:EMBED /MANIFESTINPUT:$(TOP_SRCDIR)include/wx/msw/amd64_dpi_aware_pmv2.manifest</if>
<if cond="USE_DPI_AWARE_MANIFEST=='2' and VISUALSTUDIOVERSION=='16.0' and TARGET_CPU=='AMD64'">/MANIFEST:EMBED /MANIFESTINPUT:$(TOP_SRCDIR)include/wx/msw/amd64_dpi_aware_pmv2.manifest</if>
<if cond="USE_DPI_AWARE_MANIFEST=='2' and VISUALSTUDIOVERSION=='14.0' and TARGET_CPU=='x64'">/MANIFEST:EMBED /MANIFESTINPUT:$(TOP_SRCDIR)include/wx/msw/amd64_dpi_aware_pmv2.manifest</if>
<if cond="USE_DPI_AWARE_MANIFEST=='2' and VISUALSTUDIOVERSION=='15.0' and TARGET_CPU=='x64'">/MANIFEST:EMBED /MANIFESTINPUT:$(TOP_SRCDIR)include/wx/msw/amd64_dpi_aware_pmv2.manifest</if>
<if cond="USE_DPI_AWARE_MANIFEST=='2' and VISUALSTUDIOVERSION=='16.0' and TARGET_CPU=='x64'">/MANIFEST:EMBED /MANIFESTINPUT:$(TOP_SRCDIR)include/wx/msw/amd64_dpi_aware_pmv2.manifest</if>
<if cond="USE_DPI_AWARE_MANIFEST=='2' and VISUALSTUDIOVERSION=='14.0' and TARGET_CPU=='X64'">/MANIFEST:EMBED /MANIFESTINPUT:$(TOP_SRCDIR)include/wx/msw/amd64_dpi_aware_pmv2.manifest</if>
<if cond="USE_DPI_AWARE_MANIFEST=='2' and VISUALSTUDIOVERSION=='15.0' and TARGET_CPU=='X64'">/MANIFEST:EMBED /MANIFESTINPUT:$(TOP_SRCDIR)include/wx/msw/amd64_dpi_aware_pmv2.manifest</if>
<if cond="USE_DPI_AWARE_MANIFEST=='2' and VISUALSTUDIOVERSION=='16.0' and TARGET_CPU=='X64'">/MANIFEST:EMBED /MANIFESTINPUT:$(TOP_SRCDIR)include/wx/msw/amd64_dpi_aware_pmv2.manifest</if>
<if cond="USE_DPI_AWARE_MANIFEST=='2' and VISUALSTUDIOVERSION=='14.0' and TARGET_CPU=='' and VISUALSTUDIOPLATFORM=='x64'">/MANIFEST:EMBED /MANIFESTINPUT:$(TOP_SRCDIR)include/wx/msw/amd64_dpi_aware_pmv2.manifest</if>
<if cond="USE_DPI_AWARE_MANIFEST=='2' and VISUALSTUDIOVERSION=='15.0' and TARGET_CPU=='' and VISUALSTUDIOPLATFORM=='x64'">/MANIFEST:EMBED /MANIFESTINPUT:$(TOP_SRCDIR)include/wx/msw/amd64_dpi_aware_pmv2.manifest</if>
<if cond="USE_DPI_AWARE_MANIFEST=='2' and VISUALSTUDIOVERSION=='16.0' and TARGET_CPU=='' and VISUALSTUDIOPLATFORM=='x64'">/MANIFEST:EMBED /MANIFESTINPUT:$(TOP_SRCDIR)include/wx/msw/amd64_dpi_aware_pmv2.manifest</if>
<if cond="USE_DPI_AWARE_MANIFEST=='2' and VISUALSTUDIOVERSION=='14.0' and TARGET_CPU=='' and VISUALSTUDIOPLATFORM=='X64'">/MANIFEST:EMBED /MANIFESTINPUT:$(TOP_SRCDIR)include/wx/msw/amd64_dpi_aware_pmv2.manifest</if>
<if cond="USE_DPI_AWARE_MANIFEST=='2' and VISUALSTUDIOVERSION=='15.0' and TARGET_CPU=='' and VISUALSTUDIOPLATFORM=='X64'">/MANIFEST:EMBED /MANIFESTINPUT:$(TOP_SRCDIR)include/wx/msw/amd64_dpi_aware_pmv2.manifest</if>
<if cond="USE_DPI_AWARE_MANIFEST=='2' and VISUALSTUDIOVERSION=='16.0' and TARGET_CPU=='' and VISUALSTUDIOPLATFORM=='X64'">/MANIFEST:EMBED /MANIFESTINPUT:$(TOP_SRCDIR)include/wx/msw/amd64_dpi_aware_pmv2.manifest</if>
</set>
</if>
<set var="TARGET_CPU_COMPFLAG"></set>
<if cond="FORMAT=='msvc'">
<set var="TARGET_CPU_COMPFLAG">
<if cond="TARGET_CPU==''">TARGET_CPU_COMPFLAG=0</if>
<if cond="TARGET_CPU=='' and VISUALSTUDIOPLATFORM=='x64'"></if>
<if cond="TARGET_CPU=='' and VISUALSTUDIOPLATFORM=='X64'"></if>
</set>
</if>
@@ -387,6 +432,7 @@
<ldflags>$(WIN32_DPI_LINKFLAG)</ldflags>
<if cond="FORMAT=='msvc'">
<ldflags>$(LINK_TARGET_CPU)</ldflags>
<define>$(TARGET_CPU_COMPFLAG)</define>
</if>
</template>
+13 -1
View File
@@ -132,6 +132,18 @@ Accepted values: IA64, X64, ARM64
(AMD64 accepted as synonym for X64 but should not be used any more).
</description>
</option>
<option name="VISUALSTUDIOVERSION">
<default-value>$(DOLLAR)(VISUALSTUDIOVERSION)</default-value>
<description>
Visual Studio version set by the VS command prompt.
</description>
</option>
<option name="VISUALSTUDIOPLATFORM">
<default-value>$(DOLLAR)(PLATFORM)</default-value>
<description>
Platform architecture set by the VS command prompt.
</description>
</option>
</if>
<if cond="FORMAT!='msvc'">
<set var="TARGET_CPU"/>
@@ -536,7 +548,7 @@ For example, add "-F pe-i386" here if using 64 bit windres for 32 bit build.
<set var="USE_GUI">1</set>
<set var="USE_EXCEPTIONS">1</set>
<set var="USE_RTTI">1</set>
<set var="USE_DPI_AWARE_MANIFEST">2</set>
<set var="USE_DPI_AWARE_MANIFEST">0</set>
<set var="USE_THREADS">1</set>
<set var="USE_CAIRO">0</set>
<set var="DEBUG_INFO">$(DEBUG_INFO_DEFAULT)</set>
+21
View File
@@ -18,7 +18,28 @@ function(wx_add_demo name)
if(WIN32)
list(APPEND src_files ${wxSOURCE_DIR}/demos/${name}/${DEMO_NAME}.rc)
endif()
if (WXMSW AND DEFINED wxUSE_DPI_AWARE_MANIFEST)
set(wxDPI_MANIFEST_PRFIX "wx")
if (wxARCH_SUFFIX)
set(wxDPI_MANIFEST_PRFIX "amd64")
endif()
set(wxUSE_DPI_AWARE_MANIFEST_VALUE 0)
if (${wxUSE_DPI_AWARE_MANIFEST} MATCHES "system")
set(wxUSE_DPI_AWARE_MANIFEST_VALUE 1)
list(APPEND src_files "${wxSOURCE_DIR}/include/wx/msw/${wxDPI_MANIFEST_PRFIX}_dpi_aware.manifest")
elseif(${wxUSE_DPI_AWARE_MANIFEST} MATCHES "per-monitor")
set(wxUSE_DPI_AWARE_MANIFEST_VALUE 2)
list(APPEND src_files "${wxSOURCE_DIR}/include/wx/msw/${wxDPI_MANIFEST_PRFIX}_dpi_aware_pmv2.manifest")
endif()
endif()
add_executable(${DEMO_NAME} WIN32 MACOSX_BUNDLE ${src_files})
if (DEFINED wxUSE_DPI_AWARE_MANIFEST_VALUE)
target_compile_definitions(${DEMO_NAME} PRIVATE wxUSE_DPI_AWARE_MANIFEST=${wxUSE_DPI_AWARE_MANIFEST_VALUE})
endif()
if(DEMO_DATA)
# TODO: unify with data handling for samples
# TODO: handle data files differently for OS X bundles
+6
View File
@@ -56,6 +56,12 @@ BUILD = debug
# (AMD64 accepted as synonym for X64 but should not be used any more).
TARGET_CPU = $(CPU)
# Visual Studio version set by the VS command prompt.
VISUALSTUDIOVERSION = $(VISUALSTUDIOVERSION)
# Platform architecture set by the VS command prompt.
VISUALSTUDIOPLATFORM = $(PLATFORM)
# Should debugging info be included in the executables? The default value
# "default" means that debug info will be included if BUILD=debug
# and not included if BUILD=release. [0,1,default]
+366 -168
View File
File diff suppressed because it is too large Load Diff
+2 -2
View File
@@ -165,7 +165,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/wx_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
OutputFile="..\..\lib\vc_dll\wxmsw314ud_adv_vc_custom.dll"
LinkIncremental="2"
@@ -230,7 +230,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/wx_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
OutputFile="..\..\lib\vc_dll\wxmsw314u_adv_vc_custom.dll"
LinkIncremental="1"
+2 -2
View File
@@ -165,7 +165,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/wx_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
OutputFile="..\..\lib\vc_dll\wxmsw314ud_aui_vc_custom.dll"
LinkIncremental="2"
@@ -230,7 +230,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/wx_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
OutputFile="..\..\lib\vc_dll\wxmsw314u_aui_vc_custom.dll"
LinkIncremental="1"
+2 -2
View File
@@ -165,7 +165,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/wx_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="..\..\lib\vc_dll\wxbase314ud_vc_custom.dll"
LinkIncremental="2"
@@ -230,7 +230,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/wx_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="..\..\lib\vc_dll\wxbase314u_vc_custom.dll"
LinkIncremental="1"
+2 -2
View File
@@ -165,7 +165,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/wx_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase31ud.lib"
OutputFile="..\..\lib\vc_dll\wxmsw314ud_core_vc_custom.dll"
LinkIncremental="2"
@@ -230,7 +230,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/wx_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase31u.lib"
OutputFile="..\..\lib\vc_dll\wxmsw314u_core_vc_custom.dll"
LinkIncremental="1"
+2 -2
View File
@@ -165,7 +165,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/wx_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib wxmsw31ud_core.lib wxbase31ud.lib opengl32.lib glu32.lib"
OutputFile="..\..\lib\vc_dll\wxmsw314ud_gl_vc_custom.dll"
LinkIncremental="2"
@@ -230,7 +230,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/wx_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib wxmsw31u_core.lib wxbase31u.lib opengl32.lib glu32.lib"
OutputFile="..\..\lib\vc_dll\wxmsw314u_gl_vc_custom.dll"
LinkIncremental="1"
+2 -2
View File
@@ -165,7 +165,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/wx_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
OutputFile="..\..\lib\vc_dll\wxmsw314ud_html_vc_custom.dll"
LinkIncremental="2"
@@ -230,7 +230,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/wx_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
OutputFile="..\..\lib\vc_dll\wxmsw314u_html_vc_custom.dll"
LinkIncremental="1"
+2 -2
View File
@@ -165,7 +165,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/wx_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
OutputFile="..\..\lib\vc_dll\wxmsw314ud_media_vc_custom.dll"
LinkIncremental="2"
@@ -230,7 +230,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/wx_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
OutputFile="..\..\lib\vc_dll\wxmsw314u_media_vc_custom.dll"
LinkIncremental="1"
+2 -2
View File
@@ -165,7 +165,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/wx_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase31ud.lib"
OutputFile="..\..\lib\vc_dll\wxbase314ud_net_vc_custom.dll"
LinkIncremental="2"
@@ -230,7 +230,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/wx_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase31u.lib"
OutputFile="..\..\lib\vc_dll\wxbase314u_net_vc_custom.dll"
LinkIncremental="1"
+2 -2
View File
@@ -165,7 +165,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/wx_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
OutputFile="..\..\lib\vc_dll\wxmsw314ud_propgrid_vc_custom.dll"
LinkIncremental="2"
@@ -230,7 +230,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/wx_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
OutputFile="..\..\lib\vc_dll\wxmsw314u_propgrid_vc_custom.dll"
LinkIncremental="1"
+2 -2
View File
@@ -165,7 +165,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/wx_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib ..\..\lib\vc_dll\wxbase31ud_xml.lib"
OutputFile="..\..\lib\vc_dll\wxmsw314ud_qa_vc_custom.dll"
LinkIncremental="2"
@@ -230,7 +230,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/wx_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib ..\..\lib\vc_dll\wxbase31u_xml.lib"
OutputFile="..\..\lib\vc_dll\wxmsw314u_qa_vc_custom.dll"
LinkIncremental="1"
+2 -2
View File
@@ -165,7 +165,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/wx_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
OutputFile="..\..\lib\vc_dll\wxmsw314ud_ribbon_vc_custom.dll"
LinkIncremental="2"
@@ -230,7 +230,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/wx_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
OutputFile="..\..\lib\vc_dll\wxmsw314u_ribbon_vc_custom.dll"
LinkIncremental="1"
+2 -2
View File
@@ -165,7 +165,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/wx_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_html.lib ..\..\lib\vc_dll\wxbase31ud_xml.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
OutputFile="..\..\lib\vc_dll\wxmsw314ud_richtext_vc_custom.dll"
LinkIncremental="2"
@@ -230,7 +230,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/wx_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_html.lib ..\..\lib\vc_dll\wxbase31u_xml.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
OutputFile="..\..\lib\vc_dll\wxmsw314u_richtext_vc_custom.dll"
LinkIncremental="1"
+2 -2
View File
@@ -165,7 +165,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/wx_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxscintillad.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
OutputFile="..\..\lib\vc_dll\wxmsw314ud_stc_vc_custom.dll"
LinkIncremental="2"
@@ -230,7 +230,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/wx_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxscintilla.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
OutputFile="..\..\lib\vc_dll\wxmsw314u_stc_vc_custom.dll"
LinkIncremental="1"
+2 -2
View File
@@ -165,7 +165,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/wx_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
OutputFile="..\..\lib\vc_dll\wxmsw314ud_webview_vc_custom.dll"
LinkIncremental="2"
@@ -230,7 +230,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/wx_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
OutputFile="..\..\lib\vc_dll\wxmsw314u_webview_vc_custom.dll"
LinkIncremental="1"
+2 -2
View File
@@ -165,7 +165,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/wx_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase31ud.lib"
OutputFile="..\..\lib\vc_dll\wxbase314ud_xml_vc_custom.dll"
LinkIncremental="2"
@@ -230,7 +230,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/wx_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase31u.lib"
OutputFile="..\..\lib\vc_dll\wxbase314u_xml_vc_custom.dll"
LinkIncremental="1"
+2 -2
View File
@@ -165,7 +165,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/wx_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_html.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud_xml.lib ..\..\lib\vc_dll\wxbase31ud.lib"
OutputFile="..\..\lib\vc_dll\wxmsw314ud_xrc_vc_custom.dll"
LinkIncremental="2"
@@ -230,7 +230,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/wx_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_html.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u_xml.lib ..\..\lib\vc_dll\wxbase31u.lib"
OutputFile="..\..\lib\vc_dll\wxmsw314u_xrc_vc_custom.dll"
LinkIncremental="1"
+4 -4
View File
@@ -252,7 +252,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/wx_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
OutputFile="..\..\lib\vc_dll\wxmsw314ud_adv_vc_custom.dll"
LinkIncremental="2"
@@ -343,7 +343,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/wx_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
OutputFile="..\..\lib\vc_dll\wxmsw314u_adv_vc_custom.dll"
LinkIncremental="1"
@@ -606,7 +606,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/amd64_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib"
OutputFile="..\..\lib\vc_x64_dll\wxmsw314ud_adv_vc_custom.dll"
LinkIncremental="2"
@@ -697,7 +697,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/amd64_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u.lib"
OutputFile="..\..\lib\vc_x64_dll\wxmsw314u_adv_vc_custom.dll"
LinkIncremental="1"
+4 -4
View File
@@ -252,7 +252,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/wx_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
OutputFile="..\..\lib\vc_dll\wxmsw314ud_aui_vc_custom.dll"
LinkIncremental="2"
@@ -343,7 +343,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/wx_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
OutputFile="..\..\lib\vc_dll\wxmsw314u_aui_vc_custom.dll"
LinkIncremental="1"
@@ -606,7 +606,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/amd64_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib"
OutputFile="..\..\lib\vc_x64_dll\wxmsw314ud_aui_vc_custom.dll"
LinkIncremental="2"
@@ -697,7 +697,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/amd64_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u.lib"
OutputFile="..\..\lib\vc_x64_dll\wxmsw314u_aui_vc_custom.dll"
LinkIncremental="1"
+4 -4
View File
@@ -252,7 +252,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/wx_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="..\..\lib\vc_dll\wxbase314ud_vc_custom.dll"
LinkIncremental="2"
@@ -343,7 +343,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/wx_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="..\..\lib\vc_dll\wxbase314u_vc_custom.dll"
LinkIncremental="1"
@@ -606,7 +606,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/amd64_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="..\..\lib\vc_x64_dll\wxbase314ud_vc_custom.dll"
LinkIncremental="2"
@@ -697,7 +697,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/amd64_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="..\..\lib\vc_x64_dll\wxbase314u_vc_custom.dll"
LinkIncremental="1"
+4 -4
View File
@@ -252,7 +252,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/wx_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase31ud.lib"
OutputFile="..\..\lib\vc_dll\wxmsw314ud_core_vc_custom.dll"
LinkIncremental="2"
@@ -343,7 +343,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/wx_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase31u.lib"
OutputFile="..\..\lib\vc_dll\wxmsw314u_core_vc_custom.dll"
LinkIncremental="1"
@@ -606,7 +606,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/amd64_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib"
OutputFile="..\..\lib\vc_x64_dll\wxmsw314ud_core_vc_custom.dll"
LinkIncremental="2"
@@ -697,7 +697,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/amd64_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxbase31u.lib"
OutputFile="..\..\lib\vc_x64_dll\wxmsw314u_core_vc_custom.dll"
LinkIncremental="1"
+4 -4
View File
@@ -252,7 +252,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/wx_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib wxmsw31ud_core.lib wxbase31ud.lib opengl32.lib glu32.lib"
OutputFile="..\..\lib\vc_dll\wxmsw314ud_gl_vc_custom.dll"
LinkIncremental="2"
@@ -343,7 +343,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/wx_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib wxmsw31u_core.lib wxbase31u.lib opengl32.lib glu32.lib"
OutputFile="..\..\lib\vc_dll\wxmsw314u_gl_vc_custom.dll"
LinkIncremental="1"
@@ -606,7 +606,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/amd64_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib wxmsw31ud_core.lib wxbase31ud.lib opengl32.lib glu32.lib"
OutputFile="..\..\lib\vc_x64_dll\wxmsw314ud_gl_vc_custom.dll"
LinkIncremental="2"
@@ -697,7 +697,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/amd64_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib wxmsw31u_core.lib wxbase31u.lib opengl32.lib glu32.lib"
OutputFile="..\..\lib\vc_x64_dll\wxmsw314u_gl_vc_custom.dll"
LinkIncremental="1"
+4 -4
View File
@@ -252,7 +252,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/wx_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
OutputFile="..\..\lib\vc_dll\wxmsw314ud_html_vc_custom.dll"
LinkIncremental="2"
@@ -343,7 +343,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/wx_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
OutputFile="..\..\lib\vc_dll\wxmsw314u_html_vc_custom.dll"
LinkIncremental="1"
@@ -606,7 +606,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/amd64_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib"
OutputFile="..\..\lib\vc_x64_dll\wxmsw314ud_html_vc_custom.dll"
LinkIncremental="2"
@@ -697,7 +697,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/amd64_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u.lib"
OutputFile="..\..\lib\vc_x64_dll\wxmsw314u_html_vc_custom.dll"
LinkIncremental="1"
+4 -4
View File
@@ -252,7 +252,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/wx_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
OutputFile="..\..\lib\vc_dll\wxmsw314ud_media_vc_custom.dll"
LinkIncremental="2"
@@ -343,7 +343,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/wx_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
OutputFile="..\..\lib\vc_dll\wxmsw314u_media_vc_custom.dll"
LinkIncremental="1"
@@ -606,7 +606,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/amd64_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib"
OutputFile="..\..\lib\vc_x64_dll\wxmsw314ud_media_vc_custom.dll"
LinkIncremental="2"
@@ -697,7 +697,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/amd64_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u.lib"
OutputFile="..\..\lib\vc_x64_dll\wxmsw314u_media_vc_custom.dll"
LinkIncremental="1"
+4 -4
View File
@@ -252,7 +252,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/wx_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase31ud.lib"
OutputFile="..\..\lib\vc_dll\wxbase314ud_net_vc_custom.dll"
LinkIncremental="2"
@@ -343,7 +343,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/wx_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase31u.lib"
OutputFile="..\..\lib\vc_dll\wxbase314u_net_vc_custom.dll"
LinkIncremental="1"
@@ -606,7 +606,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/amd64_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib"
OutputFile="..\..\lib\vc_x64_dll\wxbase314ud_net_vc_custom.dll"
LinkIncremental="2"
@@ -697,7 +697,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/amd64_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxbase31u.lib"
OutputFile="..\..\lib\vc_x64_dll\wxbase314u_net_vc_custom.dll"
LinkIncremental="1"
+4 -4
View File
@@ -252,7 +252,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/wx_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
OutputFile="..\..\lib\vc_dll\wxmsw314ud_propgrid_vc_custom.dll"
LinkIncremental="2"
@@ -343,7 +343,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/wx_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
OutputFile="..\..\lib\vc_dll\wxmsw314u_propgrid_vc_custom.dll"
LinkIncremental="1"
@@ -606,7 +606,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/amd64_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib"
OutputFile="..\..\lib\vc_x64_dll\wxmsw314ud_propgrid_vc_custom.dll"
LinkIncremental="2"
@@ -697,7 +697,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/amd64_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u.lib"
OutputFile="..\..\lib\vc_x64_dll\wxmsw314u_propgrid_vc_custom.dll"
LinkIncremental="1"
+4 -4
View File
@@ -252,7 +252,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/wx_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib ..\..\lib\vc_dll\wxbase31ud_xml.lib"
OutputFile="..\..\lib\vc_dll\wxmsw314ud_qa_vc_custom.dll"
LinkIncremental="2"
@@ -343,7 +343,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/wx_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib ..\..\lib\vc_dll\wxbase31u_xml.lib"
OutputFile="..\..\lib\vc_dll\wxmsw314u_qa_vc_custom.dll"
LinkIncremental="1"
@@ -606,7 +606,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/amd64_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib ..\..\lib\vc_x64_dll\wxbase31ud_xml.lib"
OutputFile="..\..\lib\vc_x64_dll\wxmsw314ud_qa_vc_custom.dll"
LinkIncremental="2"
@@ -697,7 +697,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/amd64_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u.lib ..\..\lib\vc_x64_dll\wxbase31u_xml.lib"
OutputFile="..\..\lib\vc_x64_dll\wxmsw314u_qa_vc_custom.dll"
LinkIncremental="1"
+4 -4
View File
@@ -252,7 +252,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/wx_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
OutputFile="..\..\lib\vc_dll\wxmsw314ud_ribbon_vc_custom.dll"
LinkIncremental="2"
@@ -343,7 +343,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/wx_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
OutputFile="..\..\lib\vc_dll\wxmsw314u_ribbon_vc_custom.dll"
LinkIncremental="1"
@@ -606,7 +606,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/amd64_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib"
OutputFile="..\..\lib\vc_x64_dll\wxmsw314ud_ribbon_vc_custom.dll"
LinkIncremental="2"
@@ -697,7 +697,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/amd64_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u.lib"
OutputFile="..\..\lib\vc_x64_dll\wxmsw314u_ribbon_vc_custom.dll"
LinkIncremental="1"
+4 -4
View File
@@ -252,7 +252,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/wx_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_html.lib ..\..\lib\vc_dll\wxbase31ud_xml.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
OutputFile="..\..\lib\vc_dll\wxmsw314ud_richtext_vc_custom.dll"
LinkIncremental="2"
@@ -343,7 +343,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/wx_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_html.lib ..\..\lib\vc_dll\wxbase31u_xml.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
OutputFile="..\..\lib\vc_dll\wxmsw314u_richtext_vc_custom.dll"
LinkIncremental="1"
@@ -606,7 +606,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/amd64_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31ud_html.lib ..\..\lib\vc_x64_dll\wxbase31ud_xml.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib"
OutputFile="..\..\lib\vc_x64_dll\wxmsw314ud_richtext_vc_custom.dll"
LinkIncremental="2"
@@ -697,7 +697,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/amd64_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31u_html.lib ..\..\lib\vc_x64_dll\wxbase31u_xml.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u.lib"
OutputFile="..\..\lib\vc_x64_dll\wxmsw314u_richtext_vc_custom.dll"
LinkIncremental="1"
+4 -4
View File
@@ -252,7 +252,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/wx_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxscintillad.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
OutputFile="..\..\lib\vc_dll\wxmsw314ud_stc_vc_custom.dll"
LinkIncremental="2"
@@ -343,7 +343,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/wx_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxscintilla.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
OutputFile="..\..\lib\vc_dll\wxmsw314u_stc_vc_custom.dll"
LinkIncremental="1"
@@ -606,7 +606,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/amd64_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxscintillad.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib"
OutputFile="..\..\lib\vc_x64_dll\wxmsw314ud_stc_vc_custom.dll"
LinkIncremental="2"
@@ -697,7 +697,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/amd64_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxscintilla.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u.lib"
OutputFile="..\..\lib\vc_x64_dll\wxmsw314u_stc_vc_custom.dll"
LinkIncremental="1"
+4 -4
View File
@@ -252,7 +252,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/wx_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
OutputFile="..\..\lib\vc_dll\wxmsw314ud_webview_vc_custom.dll"
LinkIncremental="2"
@@ -343,7 +343,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/wx_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
OutputFile="..\..\lib\vc_dll\wxmsw314u_webview_vc_custom.dll"
LinkIncremental="1"
@@ -606,7 +606,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/amd64_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib"
OutputFile="..\..\lib\vc_x64_dll\wxmsw314ud_webview_vc_custom.dll"
LinkIncremental="2"
@@ -697,7 +697,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/amd64_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u.lib"
OutputFile="..\..\lib\vc_x64_dll\wxmsw314u_webview_vc_custom.dll"
LinkIncremental="1"
+4 -4
View File
@@ -252,7 +252,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/wx_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase31ud.lib"
OutputFile="..\..\lib\vc_dll\wxbase314ud_xml_vc_custom.dll"
LinkIncremental="2"
@@ -343,7 +343,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/wx_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase31u.lib"
OutputFile="..\..\lib\vc_dll\wxbase314u_xml_vc_custom.dll"
LinkIncremental="1"
@@ -606,7 +606,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/amd64_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib"
OutputFile="..\..\lib\vc_x64_dll\wxbase314ud_xml_vc_custom.dll"
LinkIncremental="2"
@@ -697,7 +697,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/amd64_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxbase31u.lib"
OutputFile="..\..\lib\vc_x64_dll\wxbase314u_xml_vc_custom.dll"
LinkIncremental="1"
+4 -4
View File
@@ -252,7 +252,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/wx_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_html.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud_xml.lib ..\..\lib\vc_dll\wxbase31ud.lib"
OutputFile="..\..\lib\vc_dll\wxmsw314ud_xrc_vc_custom.dll"
LinkIncremental="2"
@@ -343,7 +343,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/wx_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_html.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u_xml.lib ..\..\lib\vc_dll\wxbase31u.lib"
OutputFile="..\..\lib\vc_dll\wxmsw314u_xrc_vc_custom.dll"
LinkIncremental="1"
@@ -606,7 +606,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/amd64_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31ud_html.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud_xml.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib"
OutputFile="..\..\lib\vc_x64_dll\wxmsw314ud_xrc_vc_custom.dll"
LinkIncremental="2"
@@ -697,7 +697,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/amd64_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31u_html.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u_xml.lib ..\..\lib\vc_x64_dll\wxbase31u.lib"
OutputFile="..\..\lib\vc_x64_dll\wxmsw314u_xrc_vc_custom.dll"
LinkIncremental="1"
+4 -4
View File
@@ -250,7 +250,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/wx_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
OutputFile="..\..\lib\vc_dll\wxmsw314ud_adv_vc_custom.dll"
LinkIncremental="2"
@@ -341,7 +341,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/wx_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
OutputFile="..\..\lib\vc_dll\wxmsw314u_adv_vc_custom.dll"
LinkIncremental="1"
@@ -602,7 +602,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/amd64_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib"
OutputFile="..\..\lib\vc_x64_dll\wxmsw314ud_adv_vc_custom.dll"
LinkIncremental="2"
@@ -693,7 +693,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/amd64_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u.lib"
OutputFile="..\..\lib\vc_x64_dll\wxmsw314u_adv_vc_custom.dll"
LinkIncremental="1"
+4 -4
View File
@@ -250,7 +250,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/wx_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
OutputFile="..\..\lib\vc_dll\wxmsw314ud_aui_vc_custom.dll"
LinkIncremental="2"
@@ -341,7 +341,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/wx_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
OutputFile="..\..\lib\vc_dll\wxmsw314u_aui_vc_custom.dll"
LinkIncremental="1"
@@ -602,7 +602,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/amd64_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib"
OutputFile="..\..\lib\vc_x64_dll\wxmsw314ud_aui_vc_custom.dll"
LinkIncremental="2"
@@ -693,7 +693,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/amd64_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u.lib"
OutputFile="..\..\lib\vc_x64_dll\wxmsw314u_aui_vc_custom.dll"
LinkIncremental="1"
+4 -4
View File
@@ -250,7 +250,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/wx_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="..\..\lib\vc_dll\wxbase314ud_vc_custom.dll"
LinkIncremental="2"
@@ -341,7 +341,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/wx_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="..\..\lib\vc_dll\wxbase314u_vc_custom.dll"
LinkIncremental="1"
@@ -602,7 +602,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/amd64_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="..\..\lib\vc_x64_dll\wxbase314ud_vc_custom.dll"
LinkIncremental="2"
@@ -693,7 +693,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/amd64_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="..\..\lib\vc_x64_dll\wxbase314u_vc_custom.dll"
LinkIncremental="1"
+4 -4
View File
@@ -250,7 +250,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/wx_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase31ud.lib"
OutputFile="..\..\lib\vc_dll\wxmsw314ud_core_vc_custom.dll"
LinkIncremental="2"
@@ -341,7 +341,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/wx_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase31u.lib"
OutputFile="..\..\lib\vc_dll\wxmsw314u_core_vc_custom.dll"
LinkIncremental="1"
@@ -602,7 +602,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/amd64_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib"
OutputFile="..\..\lib\vc_x64_dll\wxmsw314ud_core_vc_custom.dll"
LinkIncremental="2"
@@ -693,7 +693,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/amd64_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxbase31u.lib"
OutputFile="..\..\lib\vc_x64_dll\wxmsw314u_core_vc_custom.dll"
LinkIncremental="1"
+4 -4
View File
@@ -250,7 +250,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/wx_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib wxmsw31ud_core.lib wxbase31ud.lib opengl32.lib glu32.lib"
OutputFile="..\..\lib\vc_dll\wxmsw314ud_gl_vc_custom.dll"
LinkIncremental="2"
@@ -341,7 +341,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/wx_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib wxmsw31u_core.lib wxbase31u.lib opengl32.lib glu32.lib"
OutputFile="..\..\lib\vc_dll\wxmsw314u_gl_vc_custom.dll"
LinkIncremental="1"
@@ -602,7 +602,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/amd64_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib wxmsw31ud_core.lib wxbase31ud.lib opengl32.lib glu32.lib"
OutputFile="..\..\lib\vc_x64_dll\wxmsw314ud_gl_vc_custom.dll"
LinkIncremental="2"
@@ -693,7 +693,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/amd64_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib wxmsw31u_core.lib wxbase31u.lib opengl32.lib glu32.lib"
OutputFile="..\..\lib\vc_x64_dll\wxmsw314u_gl_vc_custom.dll"
LinkIncremental="1"
+4 -4
View File
@@ -250,7 +250,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/wx_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
OutputFile="..\..\lib\vc_dll\wxmsw314ud_html_vc_custom.dll"
LinkIncremental="2"
@@ -341,7 +341,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/wx_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
OutputFile="..\..\lib\vc_dll\wxmsw314u_html_vc_custom.dll"
LinkIncremental="1"
@@ -602,7 +602,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/amd64_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib"
OutputFile="..\..\lib\vc_x64_dll\wxmsw314ud_html_vc_custom.dll"
LinkIncremental="2"
@@ -693,7 +693,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/amd64_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u.lib"
OutputFile="..\..\lib\vc_x64_dll\wxmsw314u_html_vc_custom.dll"
LinkIncremental="1"
+4 -4
View File
@@ -250,7 +250,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/wx_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
OutputFile="..\..\lib\vc_dll\wxmsw314ud_media_vc_custom.dll"
LinkIncremental="2"
@@ -341,7 +341,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/wx_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
OutputFile="..\..\lib\vc_dll\wxmsw314u_media_vc_custom.dll"
LinkIncremental="1"
@@ -602,7 +602,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/amd64_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib"
OutputFile="..\..\lib\vc_x64_dll\wxmsw314ud_media_vc_custom.dll"
LinkIncremental="2"
@@ -693,7 +693,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/amd64_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u.lib"
OutputFile="..\..\lib\vc_x64_dll\wxmsw314u_media_vc_custom.dll"
LinkIncremental="1"
+4 -4
View File
@@ -250,7 +250,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/wx_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase31ud.lib"
OutputFile="..\..\lib\vc_dll\wxbase314ud_net_vc_custom.dll"
LinkIncremental="2"
@@ -341,7 +341,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/wx_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase31u.lib"
OutputFile="..\..\lib\vc_dll\wxbase314u_net_vc_custom.dll"
LinkIncremental="1"
@@ -602,7 +602,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/amd64_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib"
OutputFile="..\..\lib\vc_x64_dll\wxbase314ud_net_vc_custom.dll"
LinkIncremental="2"
@@ -693,7 +693,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/amd64_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxbase31u.lib"
OutputFile="..\..\lib\vc_x64_dll\wxbase314u_net_vc_custom.dll"
LinkIncremental="1"
+4 -4
View File
@@ -250,7 +250,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/wx_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
OutputFile="..\..\lib\vc_dll\wxmsw314ud_propgrid_vc_custom.dll"
LinkIncremental="2"
@@ -341,7 +341,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/wx_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
OutputFile="..\..\lib\vc_dll\wxmsw314u_propgrid_vc_custom.dll"
LinkIncremental="1"
@@ -602,7 +602,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/amd64_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib"
OutputFile="..\..\lib\vc_x64_dll\wxmsw314ud_propgrid_vc_custom.dll"
LinkIncremental="2"
@@ -693,7 +693,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/amd64_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u.lib"
OutputFile="..\..\lib\vc_x64_dll\wxmsw314u_propgrid_vc_custom.dll"
LinkIncremental="1"
+4 -4
View File
@@ -250,7 +250,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/wx_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib ..\..\lib\vc_dll\wxbase31ud_xml.lib"
OutputFile="..\..\lib\vc_dll\wxmsw314ud_qa_vc_custom.dll"
LinkIncremental="2"
@@ -341,7 +341,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/wx_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib ..\..\lib\vc_dll\wxbase31u_xml.lib"
OutputFile="..\..\lib\vc_dll\wxmsw314u_qa_vc_custom.dll"
LinkIncremental="1"
@@ -602,7 +602,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/amd64_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib ..\..\lib\vc_x64_dll\wxbase31ud_xml.lib"
OutputFile="..\..\lib\vc_x64_dll\wxmsw314ud_qa_vc_custom.dll"
LinkIncremental="2"
@@ -693,7 +693,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/amd64_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u.lib ..\..\lib\vc_x64_dll\wxbase31u_xml.lib"
OutputFile="..\..\lib\vc_x64_dll\wxmsw314u_qa_vc_custom.dll"
LinkIncremental="1"
+4 -4
View File
@@ -250,7 +250,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/wx_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
OutputFile="..\..\lib\vc_dll\wxmsw314ud_ribbon_vc_custom.dll"
LinkIncremental="2"
@@ -341,7 +341,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/wx_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
OutputFile="..\..\lib\vc_dll\wxmsw314u_ribbon_vc_custom.dll"
LinkIncremental="1"
@@ -602,7 +602,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/amd64_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib"
OutputFile="..\..\lib\vc_x64_dll\wxmsw314ud_ribbon_vc_custom.dll"
LinkIncremental="2"
@@ -693,7 +693,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/amd64_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u.lib"
OutputFile="..\..\lib\vc_x64_dll\wxmsw314u_ribbon_vc_custom.dll"
LinkIncremental="1"
+4 -4
View File
@@ -250,7 +250,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/wx_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_html.lib ..\..\lib\vc_dll\wxbase31ud_xml.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
OutputFile="..\..\lib\vc_dll\wxmsw314ud_richtext_vc_custom.dll"
LinkIncremental="2"
@@ -341,7 +341,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/wx_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_html.lib ..\..\lib\vc_dll\wxbase31u_xml.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
OutputFile="..\..\lib\vc_dll\wxmsw314u_richtext_vc_custom.dll"
LinkIncremental="1"
@@ -602,7 +602,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/amd64_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31ud_html.lib ..\..\lib\vc_x64_dll\wxbase31ud_xml.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib"
OutputFile="..\..\lib\vc_x64_dll\wxmsw314ud_richtext_vc_custom.dll"
LinkIncremental="2"
@@ -693,7 +693,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/amd64_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31u_html.lib ..\..\lib\vc_x64_dll\wxbase31u_xml.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u.lib"
OutputFile="..\..\lib\vc_x64_dll\wxmsw314u_richtext_vc_custom.dll"
LinkIncremental="1"
+4 -4
View File
@@ -250,7 +250,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/wx_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxscintillad.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
OutputFile="..\..\lib\vc_dll\wxmsw314ud_stc_vc_custom.dll"
LinkIncremental="2"
@@ -341,7 +341,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/wx_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxscintilla.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
OutputFile="..\..\lib\vc_dll\wxmsw314u_stc_vc_custom.dll"
LinkIncremental="1"
@@ -602,7 +602,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/amd64_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxscintillad.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib"
OutputFile="..\..\lib\vc_x64_dll\wxmsw314ud_stc_vc_custom.dll"
LinkIncremental="2"
@@ -693,7 +693,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:../../include/wx/msw/amd64_dpi_aware_pmv2.manifest"
AdditionalOptions=""
AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxscintilla.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u.lib"
OutputFile="..\..\lib\vc_x64_dll\wxmsw314u_stc_vc_custom.dll"
LinkIncremental="1"

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