Rebake after adding DPI awareness option

This commit is contained in:
Maarten Bent
2019-11-28 21:28:57 +01:00
parent a96a55be77
commit bed8cd7b52
876 changed files with 7740 additions and 3220 deletions

View File

@@ -197,7 +197,7 @@ distclean: clean
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
@COND_USE_GUI_1@client$(EXEEXT): $(CLIENT_OBJECTS) $(__client___win32rc)
@COND_USE_GUI_1@ $(CXX) -o $@ $(CLIENT_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
@COND_USE_GUI_1@ $(CXX) -o $@ $(CLIENT_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
@COND_USE_GUI_1@ $(__client___os2_emxbindcmd)
@COND_PLATFORM_MACOSX_1_USE_GUI_1@client.app/Contents/PkgInfo: $(__client___depname) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
@@ -223,7 +223,7 @@ distclean: clean
@COND_PLATFORM_MACOSX_1_USE_GUI_1@client_bundle: $(____client_BUNDLE_TGT_REF_DEP)
@COND_USE_GUI_1@server$(EXEEXT): $(SERVER_OBJECTS) $(__server___win32rc)
@COND_USE_GUI_1@ $(CXX) -o $@ $(SERVER_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
@COND_USE_GUI_1@ $(CXX) -o $@ $(SERVER_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
@COND_USE_GUI_1@ $(__server___os2_emxbindcmd)
@COND_PLATFORM_MACOSX_1_USE_GUI_1@server.app/Contents/PkgInfo: $(__server___depname) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
@@ -249,10 +249,10 @@ distclean: clean
@COND_PLATFORM_MACOSX_1_USE_GUI_1@server_bundle: $(____server_BUNDLE_TGT_REF_DEP)
baseclient$(EXEEXT): $(BASECLIENT_OBJECTS)
$(CXX) -o $@ $(BASECLIENT_OBJECTS) -L$(LIBDIRNAME) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
$(CXX) -o $@ $(BASECLIENT_OBJECTS) -L$(LIBDIRNAME) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
baseserver$(EXEEXT): $(BASESERVER_OBJECTS)
$(CXX) -o $@ $(BASESERVER_OBJECTS) -L$(LIBDIRNAME) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p_1) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
$(CXX) -o $@ $(BASESERVER_OBJECTS) -L$(LIBDIRNAME) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p_1) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
client_sample_rc.o: $(srcdir)/../../samples/sample.rc
$(WINDRES) -i$< -o$@ $(__WIN32_DPI_MANIFEST_p) --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_0) $(__DEBUG_DEFINE_p_0) $(__EXCEPTIONS_DEFINE_p_0) $(__RTTI_DEFINE_p_0) $(__THREAD_DEFINE_p_0) --include-dir $(srcdir) $(__DLLFLAG_p_0) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include

View File

@@ -286,25 +286,25 @@ clean:
!if "$(USE_GUI)" == "1"
$(OBJS)\client.exe: $(CLIENT_OBJECTS) $(OBJS)\client_sample.res
ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @&&|
ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @&&|
c0w32.obj $(CLIENT_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_2).lib,, $(OBJS)\client_sample.res
|
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\server.exe: $(SERVER_OBJECTS) $(OBJS)\server_sample.res
ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @&&|
ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @&&|
c0w32.obj $(SERVER_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_2).lib,, $(OBJS)\server_sample.res
|
!endif
$(OBJS)\baseclient.exe: $(BASECLIENT_OBJECTS)
ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -ap $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @&&|
ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -ap $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @&&|
c0x32.obj $(BASECLIENT_OBJECTS),$@,, $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_2).lib,,
|
$(OBJS)\baseserver.exe: $(BASESERVER_OBJECTS)
ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -ap $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @&&|
ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -ap $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @&&|
c0x32.obj $(BASESERVER_OBJECTS),$@,, $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p_1) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_2).lib,,
|

View File

@@ -268,7 +268,7 @@ ifeq ($(USE_GUI),1)
$(OBJS)\client.exe: $(CLIENT_OBJECTS) $(OBJS)\client_sample_rc.o
$(foreach f,$(subst \,/,$(CLIENT_OBJECTS)),$(shell echo $f >> $(subst \,/,$@).rsp.tmp))
@move /y $@.rsp.tmp $@.rsp >nul
$(CXX) -o $@ @$@.rsp $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
$(CXX) -o $@ @$@.rsp $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
@-del $@.rsp
endif
@@ -276,20 +276,20 @@ ifeq ($(USE_GUI),1)
$(OBJS)\server.exe: $(SERVER_OBJECTS) $(OBJS)\server_sample_rc.o
$(foreach f,$(subst \,/,$(SERVER_OBJECTS)),$(shell echo $f >> $(subst \,/,$@).rsp.tmp))
@move /y $@.rsp.tmp $@.rsp >nul
$(CXX) -o $@ @$@.rsp $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
$(CXX) -o $@ @$@.rsp $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
@-del $@.rsp
endif
$(OBJS)\baseclient.exe: $(BASECLIENT_OBJECTS)
$(foreach f,$(subst \,/,$(BASECLIENT_OBJECTS)),$(shell echo $f >> $(subst \,/,$@).rsp.tmp))
@move /y $@.rsp.tmp $@.rsp >nul
$(CXX) -o $@ @$@.rsp $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
$(CXX) -o $@ @$@.rsp $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
@-del $@.rsp
$(OBJS)\baseserver.exe: $(BASESERVER_OBJECTS)
$(foreach f,$(subst \,/,$(BASESERVER_OBJECTS)),$(shell echo $f >> $(subst \,/,$@).rsp.tmp))
@move /y $@.rsp.tmp $@.rsp >nul
$(CXX) -o $@ @$@.rsp $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p_1) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
$(CXX) -o $@ @$@.rsp $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p_1) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
@-del $@.rsp
$(OBJS)\client_sample_rc.o: ./../../samples/sample.rc

View File

@@ -151,6 +151,46 @@ LINK_TARGET_CPU = /MACHINE:IA64
!if "$(TARGET_CPU)" == "x64"
LINK_TARGET_CPU = /MACHINE:X64
!endif
!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "1"
WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
/MANIFESTINPUT:./../../include/wx/msw/wx-dpi-aware.manifest
!endif
!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "1"
WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
/MANIFESTINPUT:./../../include/wx/msw/amd64-dpi-aware.manifest
!endif
!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "1"
WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
/MANIFESTINPUT:./../../include/wx/msw/amd64-dpi-aware.manifest
!endif
!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "1"
WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
/MANIFESTINPUT:./../../include/wx/msw/amd64-dpi-aware.manifest
!endif
!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "1"
WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
/MANIFESTINPUT:./../../include/wx/msw/amd64-dpi-aware.manifest
!endif
!if "$(TARGET_CPU)" == "" && "$(USE_DPI_AWARE_MANIFEST)" == "2"
WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
/MANIFESTINPUT:./../../include/wx/msw/wx-dpi-aware-pmv2.manifest
!endif
!if "$(TARGET_CPU)" == "amd64" && "$(USE_DPI_AWARE_MANIFEST)" == "2"
WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
/MANIFESTINPUT:./../../include/wx/msw/amd64-dpi-aware-pmv2.manifest
!endif
!if "$(TARGET_CPU)" == "AMD64" && "$(USE_DPI_AWARE_MANIFEST)" == "2"
WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
/MANIFESTINPUT:./../../include/wx/msw/amd64-dpi-aware-pmv2.manifest
!endif
!if "$(TARGET_CPU)" == "x64" && "$(USE_DPI_AWARE_MANIFEST)" == "2"
WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
/MANIFESTINPUT:./../../include/wx/msw/amd64-dpi-aware-pmv2.manifest
!endif
!if "$(TARGET_CPU)" == "X64" && "$(USE_DPI_AWARE_MANIFEST)" == "2"
WIN32_DPI_LINKFLAG = /MANIFEST:EMBED \
/MANIFESTINPUT:./../../include/wx/msw/amd64-dpi-aware-pmv2.manifest
!endif
!if "$(MONOLITHIC)" == "0"
EXTRALIBS_FOR_BASE =
!endif
@@ -478,25 +518,25 @@ clean:
!if "$(USE_GUI)" == "1"
$(OBJS)\client.exe: $(CLIENT_OBJECTS) $(OBJS)\client_sample.res
link /NOLOGO /OUT:$@ $(__DEBUGINFO_4) /pdb:"$(OBJS)\client.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<<
link /NOLOGO /OUT:$@ $(__DEBUGINFO_4) /pdb:"$(OBJS)\client.pdb" $(__DEBUGINFO_2) $(WIN32_DPI_LINKFLAG) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<<
$(CLIENT_OBJECTS) $(CLIENT_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib
<<
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\server.exe: $(SERVER_OBJECTS) $(OBJS)\server_sample.res
link /NOLOGO /OUT:$@ $(__DEBUGINFO_4) /pdb:"$(OBJS)\server.pdb" $(__DEBUGINFO_18) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<<
link /NOLOGO /OUT:$@ $(__DEBUGINFO_4) /pdb:"$(OBJS)\server.pdb" $(__DEBUGINFO_18) $(WIN32_DPI_LINKFLAG) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<<
$(SERVER_OBJECTS) $(SERVER_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib
<<
!endif
$(OBJS)\baseclient.exe: $(BASECLIENT_OBJECTS)
link /NOLOGO /OUT:$@ $(__DEBUGINFO_4) /pdb:"$(OBJS)\baseclient.pdb" $(__DEBUGINFO_34) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<<
link /NOLOGO /OUT:$@ $(__DEBUGINFO_4) /pdb:"$(OBJS)\baseclient.pdb" $(__DEBUGINFO_34) $(WIN32_DPI_LINKFLAG) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<<
$(BASECLIENT_OBJECTS) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib
<<
$(OBJS)\baseserver.exe: $(BASESERVER_OBJECTS)
link /NOLOGO /OUT:$@ $(__DEBUGINFO_4) /pdb:"$(OBJS)\baseserver.pdb" $(__DEBUGINFO_50) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<<
link /NOLOGO /OUT:$@ $(__DEBUGINFO_4) /pdb:"$(OBJS)\baseserver.pdb" $(__DEBUGINFO_50) $(WIN32_DPI_LINKFLAG) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<<
$(BASESERVER_OBJECTS) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p_1) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib
<<

View File

@@ -45,7 +45,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/wx-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxbase31ud_net.lib wxbase31ud.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="vc_mswud\baseclient.exe"
LinkIncremental="2"
@@ -107,7 +107,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/wx-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxbase31u_net.lib wxbase31u.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="vc_mswu\baseclient.exe"
LinkIncremental="1"
@@ -174,7 +174,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/wx-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxbase31ud_net.lib wxbase31ud.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="vc_mswuddll\baseclient.exe"
LinkIncremental="2"
@@ -236,7 +236,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/wx-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxbase31u_net.lib wxbase31u.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="vc_mswudll\baseclient.exe"
LinkIncremental="1"

View File

@@ -45,7 +45,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/wx-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxbase31ud_net.lib wxbase31ud.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="vc_mswud\baseserver.exe"
LinkIncremental="2"
@@ -107,7 +107,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/wx-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxbase31u_net.lib wxbase31u.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="vc_mswu\baseserver.exe"
LinkIncremental="1"
@@ -174,7 +174,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/wx-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxbase31ud_net.lib wxbase31ud.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="vc_mswuddll\baseserver.exe"
LinkIncremental="2"
@@ -236,7 +236,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/wx-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxbase31u_net.lib wxbase31u.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="vc_mswudll\baseserver.exe"
LinkIncremental="1"

View File

@@ -45,7 +45,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/wx-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxmsw31ud_core.lib wxbase31ud_net.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="vc_mswud\client.exe"
LinkIncremental="2"
@@ -107,7 +107,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/wx-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxmsw31u_core.lib wxbase31u_net.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="vc_mswu\client.exe"
LinkIncremental="1"
@@ -174,7 +174,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/wx-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxmsw31ud_core.lib wxbase31ud_net.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="vc_mswuddll\client.exe"
LinkIncremental="2"
@@ -236,7 +236,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/wx-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxmsw31u_core.lib wxbase31u_net.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="vc_mswudll\client.exe"
LinkIncremental="1"

View File

@@ -45,7 +45,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/wx-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxmsw31ud_core.lib wxbase31ud_net.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="vc_mswud\server.exe"
LinkIncremental="2"
@@ -107,7 +107,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/wx-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxmsw31u_core.lib wxbase31u_net.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="vc_mswu\server.exe"
LinkIncremental="1"
@@ -174,7 +174,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/wx-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxmsw31ud_core.lib wxbase31ud_net.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="vc_mswuddll\server.exe"
LinkIncremental="2"
@@ -236,7 +236,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/wx-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxmsw31u_core.lib wxbase31u_net.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="vc_mswudll\server.exe"
LinkIncremental="1"

View File

@@ -82,7 +82,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/wx-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxbase31ud_net.lib wxbase31ud.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="vc_mswud\baseclient.exe"
LinkIncremental="2"
@@ -176,7 +176,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/wx-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxbase31u_net.lib wxbase31u.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="vc_mswu\baseclient.exe"
LinkIncremental="1"
@@ -275,7 +275,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/wx-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxbase31ud_net.lib wxbase31ud.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="vc_mswuddll\baseclient.exe"
LinkIncremental="2"
@@ -369,7 +369,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/wx-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxbase31u_net.lib wxbase31u.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="vc_mswudll\baseclient.exe"
LinkIncremental="1"
@@ -468,7 +468,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/amd64-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxbase31ud_net.lib wxbase31ud.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="vc_mswud_x64\baseclient.exe"
LinkIncremental="2"
@@ -562,7 +562,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/amd64-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxbase31u_net.lib wxbase31u.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="vc_mswu_x64\baseclient.exe"
LinkIncremental="1"
@@ -661,7 +661,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/amd64-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxbase31ud_net.lib wxbase31ud.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="vc_mswuddll_x64\baseclient.exe"
LinkIncremental="2"
@@ -755,7 +755,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/amd64-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxbase31u_net.lib wxbase31u.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="vc_mswudll_x64\baseclient.exe"
LinkIncremental="1"

View File

@@ -82,7 +82,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/wx-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxbase31ud_net.lib wxbase31ud.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="vc_mswud\baseserver.exe"
LinkIncremental="2"
@@ -176,7 +176,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/wx-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxbase31u_net.lib wxbase31u.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="vc_mswu\baseserver.exe"
LinkIncremental="1"
@@ -275,7 +275,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/wx-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxbase31ud_net.lib wxbase31ud.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="vc_mswuddll\baseserver.exe"
LinkIncremental="2"
@@ -369,7 +369,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/wx-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxbase31u_net.lib wxbase31u.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="vc_mswudll\baseserver.exe"
LinkIncremental="1"
@@ -468,7 +468,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/amd64-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxbase31ud_net.lib wxbase31ud.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="vc_mswud_x64\baseserver.exe"
LinkIncremental="2"
@@ -562,7 +562,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/amd64-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxbase31u_net.lib wxbase31u.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="vc_mswu_x64\baseserver.exe"
LinkIncremental="1"
@@ -661,7 +661,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/amd64-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxbase31ud_net.lib wxbase31ud.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="vc_mswuddll_x64\baseserver.exe"
LinkIncremental="2"
@@ -755,7 +755,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/amd64-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxbase31u_net.lib wxbase31u.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="vc_mswudll_x64\baseserver.exe"
LinkIncremental="1"

View File

@@ -82,7 +82,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/wx-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxmsw31ud_core.lib wxbase31ud_net.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="vc_mswud\client.exe"
LinkIncremental="2"
@@ -176,7 +176,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/wx-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxmsw31u_core.lib wxbase31u_net.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="vc_mswu\client.exe"
LinkIncremental="1"
@@ -275,7 +275,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/wx-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxmsw31ud_core.lib wxbase31ud_net.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="vc_mswuddll\client.exe"
LinkIncremental="2"
@@ -369,7 +369,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/wx-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxmsw31u_core.lib wxbase31u_net.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="vc_mswudll\client.exe"
LinkIncremental="1"
@@ -468,7 +468,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/amd64-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxmsw31ud_core.lib wxbase31ud_net.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="vc_mswud_x64\client.exe"
LinkIncremental="2"
@@ -562,7 +562,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/amd64-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxmsw31u_core.lib wxbase31u_net.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="vc_mswu_x64\client.exe"
LinkIncremental="1"
@@ -661,7 +661,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/amd64-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxmsw31ud_core.lib wxbase31ud_net.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="vc_mswuddll_x64\client.exe"
LinkIncremental="2"
@@ -755,7 +755,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/amd64-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxmsw31u_core.lib wxbase31u_net.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="vc_mswudll_x64\client.exe"
LinkIncremental="1"

View File

@@ -82,7 +82,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/wx-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxmsw31ud_core.lib wxbase31ud_net.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="vc_mswud\server.exe"
LinkIncremental="2"
@@ -176,7 +176,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/wx-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxmsw31u_core.lib wxbase31u_net.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="vc_mswu\server.exe"
LinkIncremental="1"
@@ -275,7 +275,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/wx-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxmsw31ud_core.lib wxbase31ud_net.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="vc_mswuddll\server.exe"
LinkIncremental="2"
@@ -369,7 +369,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/wx-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxmsw31u_core.lib wxbase31u_net.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="vc_mswudll\server.exe"
LinkIncremental="1"
@@ -468,7 +468,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/amd64-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxmsw31ud_core.lib wxbase31ud_net.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="vc_mswud_x64\server.exe"
LinkIncremental="2"
@@ -562,7 +562,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/amd64-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxmsw31u_core.lib wxbase31u_net.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="vc_mswu_x64\server.exe"
LinkIncremental="1"
@@ -661,7 +661,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/amd64-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxmsw31ud_core.lib wxbase31ud_net.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="vc_mswuddll_x64\server.exe"
LinkIncremental="2"
@@ -755,7 +755,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/amd64-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxmsw31u_core.lib wxbase31u_net.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="vc_mswudll_x64\server.exe"
LinkIncremental="1"

View File

@@ -81,7 +81,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/wx-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxbase31ud_net.lib wxbase31ud.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="vc_mswud\baseclient.exe"
LinkIncremental="2"
@@ -172,7 +172,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/wx-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxbase31u_net.lib wxbase31u.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="vc_mswu\baseclient.exe"
LinkIncremental="1"
@@ -267,7 +267,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/wx-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxbase31ud_net.lib wxbase31ud.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="vc_mswuddll\baseclient.exe"
LinkIncremental="2"
@@ -358,7 +358,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/wx-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxbase31u_net.lib wxbase31u.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="vc_mswudll\baseclient.exe"
LinkIncremental="1"
@@ -453,7 +453,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/amd64-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxbase31ud_net.lib wxbase31ud.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="vc_mswud_x64\baseclient.exe"
LinkIncremental="2"
@@ -544,7 +544,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/amd64-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxbase31u_net.lib wxbase31u.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="vc_mswu_x64\baseclient.exe"
LinkIncremental="1"
@@ -639,7 +639,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/amd64-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxbase31ud_net.lib wxbase31ud.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="vc_mswuddll_x64\baseclient.exe"
LinkIncremental="2"
@@ -730,7 +730,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/amd64-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxbase31u_net.lib wxbase31u.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="vc_mswudll_x64\baseclient.exe"
LinkIncremental="1"

View File

@@ -81,7 +81,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/wx-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxbase31ud_net.lib wxbase31ud.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="vc_mswud\baseserver.exe"
LinkIncremental="2"
@@ -172,7 +172,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/wx-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxbase31u_net.lib wxbase31u.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="vc_mswu\baseserver.exe"
LinkIncremental="1"
@@ -267,7 +267,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/wx-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxbase31ud_net.lib wxbase31ud.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="vc_mswuddll\baseserver.exe"
LinkIncremental="2"
@@ -358,7 +358,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/wx-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxbase31u_net.lib wxbase31u.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="vc_mswudll\baseserver.exe"
LinkIncremental="1"
@@ -453,7 +453,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/amd64-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxbase31ud_net.lib wxbase31ud.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="vc_mswud_x64\baseserver.exe"
LinkIncremental="2"
@@ -544,7 +544,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/amd64-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxbase31u_net.lib wxbase31u.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="vc_mswu_x64\baseserver.exe"
LinkIncremental="1"
@@ -639,7 +639,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/amd64-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxbase31ud_net.lib wxbase31ud.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="vc_mswuddll_x64\baseserver.exe"
LinkIncremental="2"
@@ -730,7 +730,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/amd64-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxbase31u_net.lib wxbase31u.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="vc_mswudll_x64\baseserver.exe"
LinkIncremental="1"

View File

@@ -81,7 +81,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/wx-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxmsw31ud_core.lib wxbase31ud_net.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="vc_mswud\client.exe"
LinkIncremental="2"
@@ -172,7 +172,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/wx-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxmsw31u_core.lib wxbase31u_net.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="vc_mswu\client.exe"
LinkIncremental="1"
@@ -267,7 +267,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/wx-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxmsw31ud_core.lib wxbase31ud_net.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="vc_mswuddll\client.exe"
LinkIncremental="2"
@@ -358,7 +358,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/wx-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxmsw31u_core.lib wxbase31u_net.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="vc_mswudll\client.exe"
LinkIncremental="1"
@@ -453,7 +453,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/amd64-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxmsw31ud_core.lib wxbase31ud_net.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="vc_mswud_x64\client.exe"
LinkIncremental="2"
@@ -544,7 +544,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/amd64-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxmsw31u_core.lib wxbase31u_net.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="vc_mswu_x64\client.exe"
LinkIncremental="1"
@@ -639,7 +639,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/amd64-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxmsw31ud_core.lib wxbase31ud_net.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="vc_mswuddll_x64\client.exe"
LinkIncremental="2"
@@ -730,7 +730,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/amd64-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxmsw31u_core.lib wxbase31u_net.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="vc_mswudll_x64\client.exe"
LinkIncremental="1"

View File

@@ -81,7 +81,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/wx-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxmsw31ud_core.lib wxbase31ud_net.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="vc_mswud\server.exe"
LinkIncremental="2"
@@ -172,7 +172,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/wx-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxmsw31u_core.lib wxbase31u_net.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="vc_mswu\server.exe"
LinkIncremental="1"
@@ -267,7 +267,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/wx-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxmsw31ud_core.lib wxbase31ud_net.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="vc_mswuddll\server.exe"
LinkIncremental="2"
@@ -358,7 +358,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/wx-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxmsw31u_core.lib wxbase31u_net.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="vc_mswudll\server.exe"
LinkIncremental="1"
@@ -453,7 +453,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/amd64-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxmsw31ud_core.lib wxbase31ud_net.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="vc_mswud_x64\server.exe"
LinkIncremental="2"
@@ -544,7 +544,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/amd64-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxmsw31u_core.lib wxbase31u_net.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="vc_mswu_x64\server.exe"
LinkIncremental="1"
@@ -639,7 +639,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/amd64-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxmsw31ud_core.lib wxbase31ud_net.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="vc_mswuddll_x64\server.exe"
LinkIncremental="2"
@@ -730,7 +730,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalOptions="/MANIFEST:EMBED /MANIFESTINPUT:./../../include/wx/msw/amd64-dpi-aware-pmv2.manifest"
AdditionalDependencies="wxmsw31u_core.lib wxbase31u_net.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="vc_mswudll_x64\server.exe"
LinkIncremental="1"