rebaked makefiles with 0.2.4
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56158 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
		| @@ -1,6 +1,6 @@ | ||||
| # ========================================================================= | ||||
| #     This makefile was generated by | ||||
| #     Bakefile 0.2.3 (http://www.bakefile.org) | ||||
| #     Bakefile 0.2.4 (http://www.bakefile.org) | ||||
| #     Do not modify, all changes will be overwritten! | ||||
| # ========================================================================= | ||||
|  | ||||
| @@ -59,7 +59,7 @@ TYPETEST_OBJECTS =  \ | ||||
| @COND_USE_GUI_0@PORTNAME = base | ||||
| @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) | ||||
| @COND_TOOLKIT_MAC@WXBASEPORT = _carbon | ||||
| @COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d | ||||
| @COND_BUILD_debug_DEBUG_FLAG_default@WXDEBUGFLAG = d | ||||
| @COND_DEBUG_FLAG_1@WXDEBUGFLAG = d | ||||
| @COND_UNICODE_1@WXUNICODEFLAG = u | ||||
| @COND_WXUNIV_1@WXUNIVNAME = univ | ||||
| @@ -110,28 +110,28 @@ COND_MONOLITHIC_0___WXLIB_BASE_p = \ | ||||
| COND_MONOLITHIC_1___WXLIB_MONO_p = \ | ||||
| 	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) | ||||
| @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p) | ||||
| @COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \ | ||||
| @COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@	= \ | ||||
| @COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) | ||||
| @COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \ | ||||
| @COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@	= \ | ||||
| @COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@	-lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) | ||||
| @COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \ | ||||
| @COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@	= \ | ||||
| @COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@	-lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) | ||||
| @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ | ||||
| @COND_WXUSE_ZLIB_BUILTIN@	-lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) | ||||
| COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \ | ||||
| @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \ | ||||
| @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@	= \ | ||||
| @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) | ||||
| @COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@__LIB_JPEG_p \ | ||||
| @COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@	= \ | ||||
| @COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@	-lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) | ||||
| @COND_USE_GUI_1_wxUSE_LIBPNG_builtin@__LIB_PNG_p \ | ||||
| @COND_USE_GUI_1_wxUSE_LIBPNG_builtin@	= \ | ||||
| @COND_USE_GUI_1_wxUSE_LIBPNG_builtin@	-lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) | ||||
| @COND_wxUSE_ZLIB_builtin@__LIB_ZLIB_p = \ | ||||
| @COND_wxUSE_ZLIB_builtin@	-lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) | ||||
| COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \ | ||||
| 	-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) | ||||
| @COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p) | ||||
| @COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \ | ||||
| @COND_WXUSE_EXPAT_BUILTIN@	-lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) | ||||
| @COND_wxUSE_REGEX_builtin@__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p) | ||||
| @COND_wxUSE_EXPAT_builtin@__LIB_EXPAT_p = \ | ||||
| @COND_wxUSE_EXPAT_builtin@	-lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) | ||||
|  | ||||
| ### Targets: ### | ||||
|  | ||||
| all: typetest$(EXEEXT) $(__typetest_bundle___depname) | ||||
|  | ||||
| install: all | ||||
| install:  | ||||
|  | ||||
| uninstall:  | ||||
|  | ||||
| @@ -147,7 +147,7 @@ distclean: clean | ||||
| 	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile | ||||
|  | ||||
| typetest$(EXEEXT): $(TYPETEST_OBJECTS) $(__typetest___win32rc) | ||||
| 	$(CXX) -o $@ $(TYPETEST_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_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) | ||||
| 	$(CXX) -o $@ $(TYPETEST_OBJECTS)    -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_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) | ||||
| 	 | ||||
| 	$(__typetest___mac_setfilecmd) | ||||
| 	$(__typetest___os2_emxbindcmd) | ||||
| @@ -192,6 +192,6 @@ monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \ | ||||
| $(srcdir)/include/wx/stc/stc.h | ||||
|  | ||||
| # Include dependency info, if present: | ||||
| @IF_GNU_MAKE@-include .deps/*.d | ||||
| @IF_GNU_MAKE@-include ./.deps/*.d | ||||
|  | ||||
| .PHONY: all install uninstall clean distclean typetest_bundle | ||||
|   | ||||
| @@ -1,6 +1,6 @@ | ||||
| # ========================================================================= | ||||
| #     This makefile was generated by | ||||
| #     Bakefile 0.2.3 (http://www.bakefile.org) | ||||
| #     Bakefile 0.2.4 (http://www.bakefile.org) | ||||
| #     Do not modify, all changes will be overwritten! | ||||
| # ========================================================================= | ||||
|  | ||||
| @@ -229,7 +229,7 @@ clean: | ||||
| 	-if exist $(OBJS)\typetest.ils del $(OBJS)\typetest.ils | ||||
|  | ||||
| $(OBJS)\typetest.exe: $(TYPETEST_OBJECTS)  $(OBJS)\typetest_typetest.res | ||||
| 	ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa @&&| | ||||
| 	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&| | ||||
| 	c0w32.obj $(TYPETEST_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\typetest_typetest.res | ||||
| | | ||||
|  | ||||
|   | ||||
| @@ -1,6 +1,6 @@ | ||||
| # ========================================================================= | ||||
| #     This makefile was generated by | ||||
| #     Bakefile 0.2.3 (http://www.bakefile.org) | ||||
| #     Bakefile 0.2.4 (http://www.bakefile.org) | ||||
| #     Do not modify, all changes will be overwritten! | ||||
| # ========================================================================= | ||||
|  | ||||
| @@ -12,7 +12,7 @@ include ../../build/msw/config.gcc | ||||
|  | ||||
| ### Variables: ### | ||||
|  | ||||
| CPPDEPS = -MT$@ -MF$@.d -MD | ||||
| CPPDEPS = -MT$@ -MF$@.d -MD -MP | ||||
| WX_RELEASE_NODOT = 29 | ||||
| COMPILER_PREFIX = gcc | ||||
| OBJS = \ | ||||
| @@ -224,7 +224,7 @@ clean: | ||||
| 	-if exist $(OBJS)\typetest.exe del $(OBJS)\typetest.exe | ||||
|  | ||||
| $(OBJS)\typetest.exe: $(TYPETEST_OBJECTS) $(OBJS)\typetest_typetest_rc.o | ||||
| 	$(CXX) -o $@ $(TYPETEST_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 | ||||
| 	$(CXX) -o $@ $(TYPETEST_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 | ||||
|  | ||||
| $(OBJS)\typetest_typetest.o: ./typetest.cpp | ||||
| 	$(CXX) -c -o $@ $(TYPETEST_CXXFLAGS) $(CPPDEPS) $< | ||||
|   | ||||
| @@ -1,6 +1,6 @@ | ||||
| # ========================================================================= | ||||
| #     This makefile was generated by | ||||
| #     Bakefile 0.2.3 (http://www.bakefile.org) | ||||
| #     Bakefile 0.2.4 (http://www.bakefile.org) | ||||
| #     Do not modify, all changes will be overwritten! | ||||
| # ========================================================================= | ||||
|  | ||||
| @@ -11,34 +11,34 @@ | ||||
| # ------------------------------------------------------------------------- | ||||
|  | ||||
| # C++ compiler  | ||||
| CXX := g++ | ||||
| CXX ?= g++ | ||||
|  | ||||
| # Standard flags for C++  | ||||
| CXXFLAGS :=  | ||||
| CXXFLAGS ?=  | ||||
|  | ||||
| # Standard preprocessor flags (common for CC and CXX)  | ||||
| CPPFLAGS :=  | ||||
| CPPFLAGS ?=  | ||||
|  | ||||
| # Standard linker flags  | ||||
| LDFLAGS :=  | ||||
| LDFLAGS ?=  | ||||
|  | ||||
| # Location and arguments of wx-config script  | ||||
| WX_CONFIG := wx-config | ||||
| WX_CONFIG ?= wx-config | ||||
|  | ||||
| # Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb] | ||||
| WX_PORT := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1) | ||||
| WX_PORT ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1) | ||||
|  | ||||
| # Use DLL build of wx library to use? [0,1] | ||||
| WX_SHARED := $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi) | ||||
| WX_SHARED ?= $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi) | ||||
|  | ||||
| # Compile Unicode build of wxWidgets? [0,1] | ||||
| WX_UNICODE := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/') | ||||
| WX_UNICODE ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/') | ||||
|  | ||||
| # Use debug build of wxWidgets (define __WXDEBUG__)? [0,1] | ||||
| WX_DEBUG := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/') | ||||
| WX_DEBUG ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/') | ||||
|  | ||||
| # Version of the wx library to build against.  | ||||
| WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/') | ||||
| WX_VERSION ?= $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/') | ||||
|  | ||||
|  | ||||
|  | ||||
| @@ -85,7 +85,7 @@ endif | ||||
|  | ||||
| all: test_for_selected_wxbuild typetest | ||||
|  | ||||
| install: all | ||||
| install:  | ||||
|  | ||||
| uninstall:  | ||||
|  | ||||
|   | ||||
| @@ -1,6 +1,6 @@ | ||||
| # ========================================================================= | ||||
| #     This makefile was generated by | ||||
| #     Bakefile 0.2.3 (http://www.bakefile.org) | ||||
| #     Bakefile 0.2.4 (http://www.bakefile.org) | ||||
| #     Do not modify, all changes will be overwritten! | ||||
| # ========================================================================= | ||||
|  | ||||
| @@ -52,15 +52,15 @@ WXUNICODEFLAG = u | ||||
| !if "$(WXUNIV)" == "1" | ||||
| WXUNIVNAME = univ | ||||
| !endif | ||||
| !if "$(TARGET_CPU)" == "amd64" | ||||
| !if "$(TARGET_CPU)" == "AMD64" | ||||
| DIR_SUFFIX_CPU = _amd64 | ||||
| !endif | ||||
| !if "$(TARGET_CPU)" == "amd64" | ||||
| DIR_SUFFIX_CPU = _amd64 | ||||
| !endif | ||||
| !if "$(TARGET_CPU)" == "ia64" | ||||
| !if "$(TARGET_CPU)" == "IA64" | ||||
| DIR_SUFFIX_CPU = _ia64 | ||||
| !endif | ||||
| !if "$(TARGET_CPU)" == "amd64" | ||||
| DIR_SUFFIX_CPU = _amd64 | ||||
| !endif | ||||
| !if "$(TARGET_CPU)" == "ia64" | ||||
| DIR_SUFFIX_CPU = _ia64 | ||||
| !endif | ||||
| @@ -73,15 +73,15 @@ LIBTYPE_SUFFIX = lib | ||||
| !if "$(SHARED)" == "1" | ||||
| LIBTYPE_SUFFIX = dll | ||||
| !endif | ||||
| !if "$(TARGET_CPU)" == "amd64" | ||||
| !if "$(TARGET_CPU)" == "AMD64" | ||||
| LINK_TARGET_CPU = /MACHINE:AMD64 | ||||
| !endif | ||||
| !if "$(TARGET_CPU)" == "amd64" | ||||
| LINK_TARGET_CPU = /MACHINE:AMD64 | ||||
| !endif | ||||
| !if "$(TARGET_CPU)" == "ia64" | ||||
| !if "$(TARGET_CPU)" == "IA64" | ||||
| LINK_TARGET_CPU = /MACHINE:IA64 | ||||
| !endif | ||||
| !if "$(TARGET_CPU)" == "amd64" | ||||
| LINK_TARGET_CPU = /MACHINE:AMD64 | ||||
| !endif | ||||
| !if "$(TARGET_CPU)" == "ia64" | ||||
| LINK_TARGET_CPU = /MACHINE:IA64 | ||||
| !endif | ||||
| @@ -305,7 +305,7 @@ clean: | ||||
| 	-if exist $(OBJS)\typetest.pdb del $(OBJS)\typetest.pdb | ||||
|  | ||||
| $(OBJS)\typetest.exe: $(TYPETEST_OBJECTS) $(OBJS)\typetest_typetest.res | ||||
| 	link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\typetest.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<< | ||||
| 	link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\typetest.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< | ||||
| 	$(TYPETEST_OBJECTS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib | ||||
| << | ||||
|  | ||||
|   | ||||
| @@ -1,6 +1,6 @@ | ||||
| # ========================================================================= | ||||
| #     This makefile was generated by | ||||
| #     Bakefile 0.2.3 (http://www.bakefile.org) | ||||
| #     Bakefile 0.2.4 (http://www.bakefile.org) | ||||
| #     Do not modify, all changes will be overwritten! | ||||
| # ========================================================================= | ||||
|  | ||||
| @@ -251,7 +251,7 @@ $(OBJS)\typetest.exe :  $(TYPETEST_OBJECTS) $(OBJS)\typetest_typetest.res | ||||
| 	@%append $(OBJS)\typetest.lbc option quiet | ||||
| 	@%append $(OBJS)\typetest.lbc name $^@ | ||||
| 	@%append $(OBJS)\typetest.lbc option caseexact | ||||
| 	@%append $(OBJS)\typetest.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' | ||||
| 	@%append $(OBJS)\typetest.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) | ||||
| 	@for %i in ($(TYPETEST_OBJECTS)) do @%append $(OBJS)\typetest.lbc file %i | ||||
| 	@for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\typetest.lbc library %i | ||||
| 	@%append $(OBJS)\typetest.lbc option resource=$(OBJS)\typetest_typetest.res | ||||
|   | ||||
| @@ -1,8 +1,8 @@ | ||||
| <?xml version="1.0" ?> | ||||
| <?xml version="1.0" encoding="Windows-1252"?> | ||||
| <!-- | ||||
|  | ||||
|   This makefile was generated by | ||||
|   Bakefile 0.2.3 (http://www.bakefile.org) | ||||
|   Bakefile 0.2.4 (http://www.bakefile.org) | ||||
|   Do not modify, all changes will be overwritten! | ||||
|  | ||||
| --> | ||||
| @@ -22,74 +22,60 @@ | ||||
| 			IntermediateDirectory="vc_mswunivudll\typetest" | ||||
| 			ConfigurationType="1" | ||||
| 			UseOfMFC="0" | ||||
| 			ATLMinimizesCRunTimeLibraryUsage="false" | ||||
| 			ATLMinimizesCRunTimeLibraryUsage="FALSE" | ||||
| 			CharacterSet="1"> | ||||
| 			<Tool | ||||
| 				Name="VCPreBuildEventTool"/> | ||||
| 			<Tool | ||||
| 				Name="VCCustomBuildTool"/> | ||||
| 			<Tool | ||||
| 				Name="VCXMLDataGeneratorTool"/> | ||||
| 			<Tool | ||||
| 				Name="VCWebServiceProxyGeneratorTool"/> | ||||
| 			<Tool | ||||
| 				Name="VCIDLTool"/> | ||||
| 			<Tool | ||||
| 				Name="VCCLCompilerTool" | ||||
| 				Optimization="2" | ||||
| 				InlineFunctionExpansion="1" | ||||
| 				AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples" | ||||
| 				MinimalRebuild="false" | ||||
| 				ExceptionHandling="1" | ||||
| 				AdditionalOptions="" | ||||
| 				RuntimeLibrary="2" | ||||
| 				PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" | ||||
| 				BasicRuntimeChecks="3" | ||||
| 				DebugInformationFormat="3" | ||||
| 				Detect64BitPortabilityProblems="true" | ||||
| 				RuntimeTypeInfo="true" | ||||
| 				ExceptionHandling="TRUE" | ||||
| 				RuntimeLibrary="2" | ||||
| 				RuntimeTypeInfo="TRUE" | ||||
| 				AssemblerListingLocation="vc_mswunivudll\typetest\" | ||||
| 				ObjectFile="vc_mswunivudll\typetest\" | ||||
| 				ProgramDataBaseFileName="vc_mswunivudll\typetest.pdb" | ||||
| 				WarningLevel="4" | ||||
| 				SuppressStartupBanner="true"/> | ||||
| 				SuppressStartupBanner="TRUE" | ||||
| 				Detect64BitPortabilityProblems="TRUE" | ||||
| 				DebugInformationFormat="3"/> | ||||
| 			<Tool | ||||
| 				Name="VCManagedResourceCompilerTool"/> | ||||
| 				Name="VCCustomBuildTool"/> | ||||
| 			<Tool | ||||
| 				Name="VCResourceCompilerTool" | ||||
| 				Culture="1033" | ||||
| 				AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples" | ||||
| 				PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/> | ||||
| 				Name="VCLinkerTool" | ||||
| 				AdditionalOptions="" | ||||
| 				AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.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 comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib" | ||||
| 				OutputFile="vc_mswunivudll\typetest.exe" | ||||
| 				LinkIncremental="2" | ||||
| 				SuppressStartupBanner="TRUE" | ||||
| 				AdditionalLibraryDirectories=".\..\..\lib\vc_dll" | ||||
| 				GenerateDebugInformation="TRUE" | ||||
| 				ProgramDatabaseFile="vc_mswunivudll\typetest.pdb" | ||||
| 				SubSystem="2" | ||||
| 				TargetMachine="1"/> | ||||
| 			<Tool | ||||
| 				Name="VCMIDLTool"/> | ||||
| 			<Tool | ||||
| 				Name="VCPostBuildEventTool"/> | ||||
| 			<Tool | ||||
| 				Name="VCPreBuildEventTool"/> | ||||
| 			<Tool | ||||
| 				Name="VCPreLinkEventTool"/> | ||||
| 			<Tool | ||||
| 				Name="VCLinkerTool" | ||||
| 				AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.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 comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib" | ||||
| 				AdditionalOptions="" | ||||
| 				OutputFile="vc_mswunivudll\typetest.exe" | ||||
| 				LinkIncremental="2" | ||||
| 				SubSystem="2" | ||||
| 				SuppressStartupBanner="true" | ||||
| 				AdditionalLibraryDirectories=".\..\..\lib\vc_dll" | ||||
| 				GenerateDebugInformation="true" | ||||
| 				ProgramDatabaseFile="vc_mswunivudll\typetest.pdb" | ||||
| 				TargetMachine="1"/> | ||||
| 				Name="VCResourceCompilerTool" | ||||
| 				PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" | ||||
| 				Culture="1033" | ||||
| 				AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> | ||||
| 			<Tool | ||||
| 				Name="VCALinkTool"/> | ||||
| 				Name="VCWebServiceProxyGeneratorTool"/> | ||||
| 			<Tool | ||||
| 				Name="VCXDCMakeTool"/> | ||||
| 			<Tool | ||||
| 				Name="VCBscMakeTool" | ||||
| 				OutputFile="vc_mswunivudll\typetest_vc7.bsc" | ||||
| 				SuppressStartupBanner="true"/> | ||||
| 			<Tool | ||||
| 				Name="VCFxCopTool"/> | ||||
| 			<Tool | ||||
| 				Name="VCAppVerifierTool"/> | ||||
| 				Name="VCXMLDataGeneratorTool"/> | ||||
| 			<Tool | ||||
| 				Name="VCWebDeploymentTool"/> | ||||
| 			<Tool | ||||
| 				Name="VCPostBuildEventTool"/> | ||||
| 				Name="VCManagedWrapperGeneratorTool"/> | ||||
| 			<Tool | ||||
| 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/> | ||||
| 		</Configuration> | ||||
| 		<Configuration | ||||
| 			Name="DLL Universal Debug|Win32" | ||||
| @@ -97,74 +83,63 @@ | ||||
| 			IntermediateDirectory="vc_mswunivuddll\typetest" | ||||
| 			ConfigurationType="1" | ||||
| 			UseOfMFC="0" | ||||
| 			ATLMinimizesCRunTimeLibraryUsage="false" | ||||
| 			ATLMinimizesCRunTimeLibraryUsage="FALSE" | ||||
| 			CharacterSet="1"> | ||||
| 			<Tool | ||||
| 				Name="VCPreBuildEventTool"/> | ||||
| 			<Tool | ||||
| 				Name="VCCustomBuildTool"/> | ||||
| 			<Tool | ||||
| 				Name="VCXMLDataGeneratorTool"/> | ||||
| 			<Tool | ||||
| 				Name="VCWebServiceProxyGeneratorTool"/> | ||||
| 			<Tool | ||||
| 				Name="VCIDLTool"/> | ||||
| 			<Tool | ||||
| 				Name="VCCLCompilerTool" | ||||
| 				Optimization="0" | ||||
| 				InlineFunctionExpansion="1" | ||||
| 				AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples" | ||||
| 				MinimalRebuild="true" | ||||
| 				ExceptionHandling="1" | ||||
| 				AdditionalOptions="" | ||||
| 				RuntimeLibrary="3" | ||||
| 				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" | ||||
| 				MinimalRebuild="TRUE" | ||||
| 				ExceptionHandling="TRUE" | ||||
| 				BasicRuntimeChecks="3" | ||||
| 				DebugInformationFormat="3" | ||||
| 				Detect64BitPortabilityProblems="true" | ||||
| 				RuntimeTypeInfo="true" | ||||
| 				RuntimeLibrary="3" | ||||
| 				BufferSecurityCheck="TRUE" | ||||
| 				RuntimeTypeInfo="TRUE" | ||||
| 				AssemblerListingLocation="vc_mswunivuddll\typetest\" | ||||
| 				ObjectFile="vc_mswunivuddll\typetest\" | ||||
| 				ProgramDataBaseFileName="vc_mswunivuddll\typetest.pdb" | ||||
| 				WarningLevel="4" | ||||
| 				SuppressStartupBanner="true"/> | ||||
| 				SuppressStartupBanner="TRUE" | ||||
| 				Detect64BitPortabilityProblems="TRUE" | ||||
| 				DebugInformationFormat="3"/> | ||||
| 			<Tool | ||||
| 				Name="VCManagedResourceCompilerTool"/> | ||||
| 				Name="VCCustomBuildTool"/> | ||||
| 			<Tool | ||||
| 				Name="VCResourceCompilerTool" | ||||
| 				Culture="1033" | ||||
| 				AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples" | ||||
| 				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/> | ||||
| 				Name="VCLinkerTool" | ||||
| 				AdditionalOptions="" | ||||
| 				AdditionalDependencies="wxmswuniv29ud_core.lib  wxbase29ud.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 comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib" | ||||
| 				OutputFile="vc_mswunivuddll\typetest.exe" | ||||
| 				LinkIncremental="2" | ||||
| 				SuppressStartupBanner="TRUE" | ||||
| 				AdditionalLibraryDirectories=".\..\..\lib\vc_dll" | ||||
| 				GenerateDebugInformation="TRUE" | ||||
| 				ProgramDatabaseFile="vc_mswunivuddll\typetest.pdb" | ||||
| 				SubSystem="2" | ||||
| 				TargetMachine="1"/> | ||||
| 			<Tool | ||||
| 				Name="VCMIDLTool"/> | ||||
| 			<Tool | ||||
| 				Name="VCPostBuildEventTool"/> | ||||
| 			<Tool | ||||
| 				Name="VCPreBuildEventTool"/> | ||||
| 			<Tool | ||||
| 				Name="VCPreLinkEventTool"/> | ||||
| 			<Tool | ||||
| 				Name="VCLinkerTool" | ||||
| 				AdditionalDependencies="wxmswuniv29ud_core.lib  wxbase29ud.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 comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib" | ||||
| 				AdditionalOptions="" | ||||
| 				OutputFile="vc_mswunivuddll\typetest.exe" | ||||
| 				LinkIncremental="2" | ||||
| 				SubSystem="2" | ||||
| 				SuppressStartupBanner="true" | ||||
| 				AdditionalLibraryDirectories=".\..\..\lib\vc_dll" | ||||
| 				GenerateDebugInformation="true" | ||||
| 				ProgramDatabaseFile="vc_mswunivuddll\typetest.pdb" | ||||
| 				TargetMachine="1"/> | ||||
| 				Name="VCResourceCompilerTool" | ||||
| 				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" | ||||
| 				Culture="1033" | ||||
| 				AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> | ||||
| 			<Tool | ||||
| 				Name="VCALinkTool"/> | ||||
| 				Name="VCWebServiceProxyGeneratorTool"/> | ||||
| 			<Tool | ||||
| 				Name="VCXDCMakeTool"/> | ||||
| 			<Tool | ||||
| 				Name="VCBscMakeTool" | ||||
| 				OutputFile="vc_mswunivuddll\typetest_vc7.bsc" | ||||
| 				SuppressStartupBanner="true"/> | ||||
| 			<Tool | ||||
| 				Name="VCFxCopTool"/> | ||||
| 			<Tool | ||||
| 				Name="VCAppVerifierTool"/> | ||||
| 				Name="VCXMLDataGeneratorTool"/> | ||||
| 			<Tool | ||||
| 				Name="VCWebDeploymentTool"/> | ||||
| 			<Tool | ||||
| 				Name="VCPostBuildEventTool"/> | ||||
| 				Name="VCManagedWrapperGeneratorTool"/> | ||||
| 			<Tool | ||||
| 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/> | ||||
| 		</Configuration> | ||||
| 		<Configuration | ||||
| 			Name="DLL Release|Win32" | ||||
| @@ -172,74 +147,60 @@ | ||||
| 			IntermediateDirectory="vc_mswudll\typetest" | ||||
| 			ConfigurationType="1" | ||||
| 			UseOfMFC="0" | ||||
| 			ATLMinimizesCRunTimeLibraryUsage="false" | ||||
| 			ATLMinimizesCRunTimeLibraryUsage="FALSE" | ||||
| 			CharacterSet="1"> | ||||
| 			<Tool | ||||
| 				Name="VCPreBuildEventTool"/> | ||||
| 			<Tool | ||||
| 				Name="VCCustomBuildTool"/> | ||||
| 			<Tool | ||||
| 				Name="VCXMLDataGeneratorTool"/> | ||||
| 			<Tool | ||||
| 				Name="VCWebServiceProxyGeneratorTool"/> | ||||
| 			<Tool | ||||
| 				Name="VCIDLTool"/> | ||||
| 			<Tool | ||||
| 				Name="VCCLCompilerTool" | ||||
| 				Optimization="2" | ||||
| 				InlineFunctionExpansion="1" | ||||
| 				AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples" | ||||
| 				MinimalRebuild="false" | ||||
| 				ExceptionHandling="1" | ||||
| 				AdditionalOptions="" | ||||
| 				RuntimeLibrary="2" | ||||
| 				PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" | ||||
| 				BasicRuntimeChecks="3" | ||||
| 				DebugInformationFormat="3" | ||||
| 				Detect64BitPortabilityProblems="true" | ||||
| 				RuntimeTypeInfo="true" | ||||
| 				ExceptionHandling="TRUE" | ||||
| 				RuntimeLibrary="2" | ||||
| 				RuntimeTypeInfo="TRUE" | ||||
| 				AssemblerListingLocation="vc_mswudll\typetest\" | ||||
| 				ObjectFile="vc_mswudll\typetest\" | ||||
| 				ProgramDataBaseFileName="vc_mswudll\typetest.pdb" | ||||
| 				WarningLevel="4" | ||||
| 				SuppressStartupBanner="true"/> | ||||
| 				SuppressStartupBanner="TRUE" | ||||
| 				Detect64BitPortabilityProblems="TRUE" | ||||
| 				DebugInformationFormat="3"/> | ||||
| 			<Tool | ||||
| 				Name="VCManagedResourceCompilerTool"/> | ||||
| 				Name="VCCustomBuildTool"/> | ||||
| 			<Tool | ||||
| 				Name="VCResourceCompilerTool" | ||||
| 				Culture="1033" | ||||
| 				AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples" | ||||
| 				PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/> | ||||
| 				Name="VCLinkerTool" | ||||
| 				AdditionalOptions="" | ||||
| 				AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.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 comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib" | ||||
| 				OutputFile="vc_mswudll\typetest.exe" | ||||
| 				LinkIncremental="2" | ||||
| 				SuppressStartupBanner="TRUE" | ||||
| 				AdditionalLibraryDirectories=".\..\..\lib\vc_dll" | ||||
| 				GenerateDebugInformation="TRUE" | ||||
| 				ProgramDatabaseFile="vc_mswudll\typetest.pdb" | ||||
| 				SubSystem="2" | ||||
| 				TargetMachine="1"/> | ||||
| 			<Tool | ||||
| 				Name="VCMIDLTool"/> | ||||
| 			<Tool | ||||
| 				Name="VCPostBuildEventTool"/> | ||||
| 			<Tool | ||||
| 				Name="VCPreBuildEventTool"/> | ||||
| 			<Tool | ||||
| 				Name="VCPreLinkEventTool"/> | ||||
| 			<Tool | ||||
| 				Name="VCLinkerTool" | ||||
| 				AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.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 comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib" | ||||
| 				AdditionalOptions="" | ||||
| 				OutputFile="vc_mswudll\typetest.exe" | ||||
| 				LinkIncremental="2" | ||||
| 				SubSystem="2" | ||||
| 				SuppressStartupBanner="true" | ||||
| 				AdditionalLibraryDirectories=".\..\..\lib\vc_dll" | ||||
| 				GenerateDebugInformation="true" | ||||
| 				ProgramDatabaseFile="vc_mswudll\typetest.pdb" | ||||
| 				TargetMachine="1"/> | ||||
| 				Name="VCResourceCompilerTool" | ||||
| 				PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" | ||||
| 				Culture="1033" | ||||
| 				AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> | ||||
| 			<Tool | ||||
| 				Name="VCALinkTool"/> | ||||
| 				Name="VCWebServiceProxyGeneratorTool"/> | ||||
| 			<Tool | ||||
| 				Name="VCXDCMakeTool"/> | ||||
| 			<Tool | ||||
| 				Name="VCBscMakeTool" | ||||
| 				OutputFile="vc_mswudll\typetest_vc7.bsc" | ||||
| 				SuppressStartupBanner="true"/> | ||||
| 			<Tool | ||||
| 				Name="VCFxCopTool"/> | ||||
| 			<Tool | ||||
| 				Name="VCAppVerifierTool"/> | ||||
| 				Name="VCXMLDataGeneratorTool"/> | ||||
| 			<Tool | ||||
| 				Name="VCWebDeploymentTool"/> | ||||
| 			<Tool | ||||
| 				Name="VCPostBuildEventTool"/> | ||||
| 				Name="VCManagedWrapperGeneratorTool"/> | ||||
| 			<Tool | ||||
| 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/> | ||||
| 		</Configuration> | ||||
| 		<Configuration | ||||
| 			Name="DLL Debug|Win32" | ||||
| @@ -247,74 +208,63 @@ | ||||
| 			IntermediateDirectory="vc_mswuddll\typetest" | ||||
| 			ConfigurationType="1" | ||||
| 			UseOfMFC="0" | ||||
| 			ATLMinimizesCRunTimeLibraryUsage="false" | ||||
| 			ATLMinimizesCRunTimeLibraryUsage="FALSE" | ||||
| 			CharacterSet="1"> | ||||
| 			<Tool | ||||
| 				Name="VCPreBuildEventTool"/> | ||||
| 			<Tool | ||||
| 				Name="VCCustomBuildTool"/> | ||||
| 			<Tool | ||||
| 				Name="VCXMLDataGeneratorTool"/> | ||||
| 			<Tool | ||||
| 				Name="VCWebServiceProxyGeneratorTool"/> | ||||
| 			<Tool | ||||
| 				Name="VCIDLTool"/> | ||||
| 			<Tool | ||||
| 				Name="VCCLCompilerTool" | ||||
| 				Optimization="0" | ||||
| 				InlineFunctionExpansion="1" | ||||
| 				AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples" | ||||
| 				MinimalRebuild="true" | ||||
| 				ExceptionHandling="1" | ||||
| 				AdditionalOptions="" | ||||
| 				RuntimeLibrary="3" | ||||
| 				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" | ||||
| 				MinimalRebuild="TRUE" | ||||
| 				ExceptionHandling="TRUE" | ||||
| 				BasicRuntimeChecks="3" | ||||
| 				DebugInformationFormat="3" | ||||
| 				Detect64BitPortabilityProblems="true" | ||||
| 				RuntimeTypeInfo="true" | ||||
| 				RuntimeLibrary="3" | ||||
| 				BufferSecurityCheck="TRUE" | ||||
| 				RuntimeTypeInfo="TRUE" | ||||
| 				AssemblerListingLocation="vc_mswuddll\typetest\" | ||||
| 				ObjectFile="vc_mswuddll\typetest\" | ||||
| 				ProgramDataBaseFileName="vc_mswuddll\typetest.pdb" | ||||
| 				WarningLevel="4" | ||||
| 				SuppressStartupBanner="true"/> | ||||
| 				SuppressStartupBanner="TRUE" | ||||
| 				Detect64BitPortabilityProblems="TRUE" | ||||
| 				DebugInformationFormat="3"/> | ||||
| 			<Tool | ||||
| 				Name="VCManagedResourceCompilerTool"/> | ||||
| 				Name="VCCustomBuildTool"/> | ||||
| 			<Tool | ||||
| 				Name="VCResourceCompilerTool" | ||||
| 				Culture="1033" | ||||
| 				AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples" | ||||
| 				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"/> | ||||
| 				Name="VCLinkerTool" | ||||
| 				AdditionalOptions="" | ||||
| 				AdditionalDependencies="wxmsw29ud_core.lib  wxbase29ud.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 comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib" | ||||
| 				OutputFile="vc_mswuddll\typetest.exe" | ||||
| 				LinkIncremental="2" | ||||
| 				SuppressStartupBanner="TRUE" | ||||
| 				AdditionalLibraryDirectories=".\..\..\lib\vc_dll" | ||||
| 				GenerateDebugInformation="TRUE" | ||||
| 				ProgramDatabaseFile="vc_mswuddll\typetest.pdb" | ||||
| 				SubSystem="2" | ||||
| 				TargetMachine="1"/> | ||||
| 			<Tool | ||||
| 				Name="VCMIDLTool"/> | ||||
| 			<Tool | ||||
| 				Name="VCPostBuildEventTool"/> | ||||
| 			<Tool | ||||
| 				Name="VCPreBuildEventTool"/> | ||||
| 			<Tool | ||||
| 				Name="VCPreLinkEventTool"/> | ||||
| 			<Tool | ||||
| 				Name="VCLinkerTool" | ||||
| 				AdditionalDependencies="wxmsw29ud_core.lib  wxbase29ud.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 comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib" | ||||
| 				AdditionalOptions="" | ||||
| 				OutputFile="vc_mswuddll\typetest.exe" | ||||
| 				LinkIncremental="2" | ||||
| 				SubSystem="2" | ||||
| 				SuppressStartupBanner="true" | ||||
| 				AdditionalLibraryDirectories=".\..\..\lib\vc_dll" | ||||
| 				GenerateDebugInformation="true" | ||||
| 				ProgramDatabaseFile="vc_mswuddll\typetest.pdb" | ||||
| 				TargetMachine="1"/> | ||||
| 				Name="VCResourceCompilerTool" | ||||
| 				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" | ||||
| 				Culture="1033" | ||||
| 				AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> | ||||
| 			<Tool | ||||
| 				Name="VCALinkTool"/> | ||||
| 				Name="VCWebServiceProxyGeneratorTool"/> | ||||
| 			<Tool | ||||
| 				Name="VCXDCMakeTool"/> | ||||
| 			<Tool | ||||
| 				Name="VCBscMakeTool" | ||||
| 				OutputFile="vc_mswuddll\typetest_vc7.bsc" | ||||
| 				SuppressStartupBanner="true"/> | ||||
| 			<Tool | ||||
| 				Name="VCFxCopTool"/> | ||||
| 			<Tool | ||||
| 				Name="VCAppVerifierTool"/> | ||||
| 				Name="VCXMLDataGeneratorTool"/> | ||||
| 			<Tool | ||||
| 				Name="VCWebDeploymentTool"/> | ||||
| 			<Tool | ||||
| 				Name="VCPostBuildEventTool"/> | ||||
| 				Name="VCManagedWrapperGeneratorTool"/> | ||||
| 			<Tool | ||||
| 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/> | ||||
| 		</Configuration> | ||||
| 		<Configuration | ||||
| 			Name="Universal Release|Win32" | ||||
| @@ -322,74 +272,60 @@ | ||||
| 			IntermediateDirectory="vc_mswunivu\typetest" | ||||
| 			ConfigurationType="1" | ||||
| 			UseOfMFC="0" | ||||
| 			ATLMinimizesCRunTimeLibraryUsage="false" | ||||
| 			ATLMinimizesCRunTimeLibraryUsage="FALSE" | ||||
| 			CharacterSet="1"> | ||||
| 			<Tool | ||||
| 				Name="VCPreBuildEventTool"/> | ||||
| 			<Tool | ||||
| 				Name="VCCustomBuildTool"/> | ||||
| 			<Tool | ||||
| 				Name="VCXMLDataGeneratorTool"/> | ||||
| 			<Tool | ||||
| 				Name="VCWebServiceProxyGeneratorTool"/> | ||||
| 			<Tool | ||||
| 				Name="VCIDLTool"/> | ||||
| 			<Tool | ||||
| 				Name="VCCLCompilerTool" | ||||
| 				Optimization="2" | ||||
| 				InlineFunctionExpansion="1" | ||||
| 				AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples" | ||||
| 				MinimalRebuild="false" | ||||
| 				ExceptionHandling="1" | ||||
| 				AdditionalOptions="" | ||||
| 				RuntimeLibrary="2" | ||||
| 				PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH" | ||||
| 				BasicRuntimeChecks="3" | ||||
| 				DebugInformationFormat="3" | ||||
| 				Detect64BitPortabilityProblems="true" | ||||
| 				RuntimeTypeInfo="true" | ||||
| 				ExceptionHandling="TRUE" | ||||
| 				RuntimeLibrary="2" | ||||
| 				RuntimeTypeInfo="TRUE" | ||||
| 				AssemblerListingLocation="vc_mswunivu\typetest\" | ||||
| 				ObjectFile="vc_mswunivu\typetest\" | ||||
| 				ProgramDataBaseFileName="vc_mswunivu\typetest.pdb" | ||||
| 				WarningLevel="4" | ||||
| 				SuppressStartupBanner="true"/> | ||||
| 				SuppressStartupBanner="TRUE" | ||||
| 				Detect64BitPortabilityProblems="TRUE" | ||||
| 				DebugInformationFormat="3"/> | ||||
| 			<Tool | ||||
| 				Name="VCManagedResourceCompilerTool"/> | ||||
| 				Name="VCCustomBuildTool"/> | ||||
| 			<Tool | ||||
| 				Name="VCResourceCompilerTool" | ||||
| 				Culture="1033" | ||||
| 				AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples" | ||||
| 				PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"/> | ||||
| 				Name="VCLinkerTool" | ||||
| 				AdditionalOptions="" | ||||
| 				AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.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 comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib" | ||||
| 				OutputFile="vc_mswunivu\typetest.exe" | ||||
| 				LinkIncremental="2" | ||||
| 				SuppressStartupBanner="TRUE" | ||||
| 				AdditionalLibraryDirectories=".\..\..\lib\vc_lib" | ||||
| 				GenerateDebugInformation="TRUE" | ||||
| 				ProgramDatabaseFile="vc_mswunivu\typetest.pdb" | ||||
| 				SubSystem="2" | ||||
| 				TargetMachine="1"/> | ||||
| 			<Tool | ||||
| 				Name="VCMIDLTool"/> | ||||
| 			<Tool | ||||
| 				Name="VCPostBuildEventTool"/> | ||||
| 			<Tool | ||||
| 				Name="VCPreBuildEventTool"/> | ||||
| 			<Tool | ||||
| 				Name="VCPreLinkEventTool"/> | ||||
| 			<Tool | ||||
| 				Name="VCLinkerTool" | ||||
| 				AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.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 comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib" | ||||
| 				AdditionalOptions="" | ||||
| 				OutputFile="vc_mswunivu\typetest.exe" | ||||
| 				LinkIncremental="2" | ||||
| 				SubSystem="2" | ||||
| 				SuppressStartupBanner="true" | ||||
| 				AdditionalLibraryDirectories=".\..\..\lib\vc_lib" | ||||
| 				GenerateDebugInformation="true" | ||||
| 				ProgramDatabaseFile="vc_mswunivu\typetest.pdb" | ||||
| 				TargetMachine="1"/> | ||||
| 				Name="VCResourceCompilerTool" | ||||
| 				PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH" | ||||
| 				Culture="1033" | ||||
| 				AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> | ||||
| 			<Tool | ||||
| 				Name="VCALinkTool"/> | ||||
| 				Name="VCWebServiceProxyGeneratorTool"/> | ||||
| 			<Tool | ||||
| 				Name="VCXDCMakeTool"/> | ||||
| 			<Tool | ||||
| 				Name="VCBscMakeTool" | ||||
| 				OutputFile="vc_mswunivu\typetest_vc7.bsc" | ||||
| 				SuppressStartupBanner="true"/> | ||||
| 			<Tool | ||||
| 				Name="VCFxCopTool"/> | ||||
| 			<Tool | ||||
| 				Name="VCAppVerifierTool"/> | ||||
| 				Name="VCXMLDataGeneratorTool"/> | ||||
| 			<Tool | ||||
| 				Name="VCWebDeploymentTool"/> | ||||
| 			<Tool | ||||
| 				Name="VCPostBuildEventTool"/> | ||||
| 				Name="VCManagedWrapperGeneratorTool"/> | ||||
| 			<Tool | ||||
| 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/> | ||||
| 		</Configuration> | ||||
| 		<Configuration | ||||
| 			Name="Universal Debug|Win32" | ||||
| @@ -397,74 +333,63 @@ | ||||
| 			IntermediateDirectory="vc_mswunivud\typetest" | ||||
| 			ConfigurationType="1" | ||||
| 			UseOfMFC="0" | ||||
| 			ATLMinimizesCRunTimeLibraryUsage="false" | ||||
| 			ATLMinimizesCRunTimeLibraryUsage="FALSE" | ||||
| 			CharacterSet="1"> | ||||
| 			<Tool | ||||
| 				Name="VCPreBuildEventTool"/> | ||||
| 			<Tool | ||||
| 				Name="VCCustomBuildTool"/> | ||||
| 			<Tool | ||||
| 				Name="VCXMLDataGeneratorTool"/> | ||||
| 			<Tool | ||||
| 				Name="VCWebServiceProxyGeneratorTool"/> | ||||
| 			<Tool | ||||
| 				Name="VCIDLTool"/> | ||||
| 			<Tool | ||||
| 				Name="VCCLCompilerTool" | ||||
| 				Optimization="0" | ||||
| 				InlineFunctionExpansion="1" | ||||
| 				AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples" | ||||
| 				MinimalRebuild="true" | ||||
| 				ExceptionHandling="1" | ||||
| 				AdditionalOptions="" | ||||
| 				RuntimeLibrary="3" | ||||
| 				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" | ||||
| 				MinimalRebuild="TRUE" | ||||
| 				ExceptionHandling="TRUE" | ||||
| 				BasicRuntimeChecks="3" | ||||
| 				DebugInformationFormat="3" | ||||
| 				Detect64BitPortabilityProblems="true" | ||||
| 				RuntimeTypeInfo="true" | ||||
| 				RuntimeLibrary="3" | ||||
| 				BufferSecurityCheck="TRUE" | ||||
| 				RuntimeTypeInfo="TRUE" | ||||
| 				AssemblerListingLocation="vc_mswunivud\typetest\" | ||||
| 				ObjectFile="vc_mswunivud\typetest\" | ||||
| 				ProgramDataBaseFileName="vc_mswunivud\typetest.pdb" | ||||
| 				WarningLevel="4" | ||||
| 				SuppressStartupBanner="true"/> | ||||
| 				SuppressStartupBanner="TRUE" | ||||
| 				Detect64BitPortabilityProblems="TRUE" | ||||
| 				DebugInformationFormat="3"/> | ||||
| 			<Tool | ||||
| 				Name="VCManagedResourceCompilerTool"/> | ||||
| 				Name="VCCustomBuildTool"/> | ||||
| 			<Tool | ||||
| 				Name="VCResourceCompilerTool" | ||||
| 				Culture="1033" | ||||
| 				AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples" | ||||
| 				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/> | ||||
| 				Name="VCLinkerTool" | ||||
| 				AdditionalOptions="" | ||||
| 				AdditionalDependencies="wxmswuniv29ud_core.lib  wxbase29ud.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 comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib" | ||||
| 				OutputFile="vc_mswunivud\typetest.exe" | ||||
| 				LinkIncremental="2" | ||||
| 				SuppressStartupBanner="TRUE" | ||||
| 				AdditionalLibraryDirectories=".\..\..\lib\vc_lib" | ||||
| 				GenerateDebugInformation="TRUE" | ||||
| 				ProgramDatabaseFile="vc_mswunivud\typetest.pdb" | ||||
| 				SubSystem="2" | ||||
| 				TargetMachine="1"/> | ||||
| 			<Tool | ||||
| 				Name="VCMIDLTool"/> | ||||
| 			<Tool | ||||
| 				Name="VCPostBuildEventTool"/> | ||||
| 			<Tool | ||||
| 				Name="VCPreBuildEventTool"/> | ||||
| 			<Tool | ||||
| 				Name="VCPreLinkEventTool"/> | ||||
| 			<Tool | ||||
| 				Name="VCLinkerTool" | ||||
| 				AdditionalDependencies="wxmswuniv29ud_core.lib  wxbase29ud.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 comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib" | ||||
| 				AdditionalOptions="" | ||||
| 				OutputFile="vc_mswunivud\typetest.exe" | ||||
| 				LinkIncremental="2" | ||||
| 				SubSystem="2" | ||||
| 				SuppressStartupBanner="true" | ||||
| 				AdditionalLibraryDirectories=".\..\..\lib\vc_lib" | ||||
| 				GenerateDebugInformation="true" | ||||
| 				ProgramDatabaseFile="vc_mswunivud\typetest.pdb" | ||||
| 				TargetMachine="1"/> | ||||
| 				Name="VCResourceCompilerTool" | ||||
| 				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" | ||||
| 				Culture="1033" | ||||
| 				AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> | ||||
| 			<Tool | ||||
| 				Name="VCALinkTool"/> | ||||
| 				Name="VCWebServiceProxyGeneratorTool"/> | ||||
| 			<Tool | ||||
| 				Name="VCXDCMakeTool"/> | ||||
| 			<Tool | ||||
| 				Name="VCBscMakeTool" | ||||
| 				OutputFile="vc_mswunivud\typetest_vc7.bsc" | ||||
| 				SuppressStartupBanner="true"/> | ||||
| 			<Tool | ||||
| 				Name="VCFxCopTool"/> | ||||
| 			<Tool | ||||
| 				Name="VCAppVerifierTool"/> | ||||
| 				Name="VCXMLDataGeneratorTool"/> | ||||
| 			<Tool | ||||
| 				Name="VCWebDeploymentTool"/> | ||||
| 			<Tool | ||||
| 				Name="VCPostBuildEventTool"/> | ||||
| 				Name="VCManagedWrapperGeneratorTool"/> | ||||
| 			<Tool | ||||
| 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/> | ||||
| 		</Configuration> | ||||
| 		<Configuration | ||||
| 			Name="Release|Win32" | ||||
| @@ -472,74 +397,60 @@ | ||||
| 			IntermediateDirectory="vc_mswu\typetest" | ||||
| 			ConfigurationType="1" | ||||
| 			UseOfMFC="0" | ||||
| 			ATLMinimizesCRunTimeLibraryUsage="false" | ||||
| 			ATLMinimizesCRunTimeLibraryUsage="FALSE" | ||||
| 			CharacterSet="1"> | ||||
| 			<Tool | ||||
| 				Name="VCPreBuildEventTool"/> | ||||
| 			<Tool | ||||
| 				Name="VCCustomBuildTool"/> | ||||
| 			<Tool | ||||
| 				Name="VCXMLDataGeneratorTool"/> | ||||
| 			<Tool | ||||
| 				Name="VCWebServiceProxyGeneratorTool"/> | ||||
| 			<Tool | ||||
| 				Name="VCIDLTool"/> | ||||
| 			<Tool | ||||
| 				Name="VCCLCompilerTool" | ||||
| 				Optimization="2" | ||||
| 				InlineFunctionExpansion="1" | ||||
| 				AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples" | ||||
| 				MinimalRebuild="false" | ||||
| 				ExceptionHandling="1" | ||||
| 				AdditionalOptions="" | ||||
| 				RuntimeLibrary="2" | ||||
| 				PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH" | ||||
| 				BasicRuntimeChecks="3" | ||||
| 				DebugInformationFormat="3" | ||||
| 				Detect64BitPortabilityProblems="true" | ||||
| 				RuntimeTypeInfo="true" | ||||
| 				ExceptionHandling="TRUE" | ||||
| 				RuntimeLibrary="2" | ||||
| 				RuntimeTypeInfo="TRUE" | ||||
| 				AssemblerListingLocation="vc_mswu\typetest\" | ||||
| 				ObjectFile="vc_mswu\typetest\" | ||||
| 				ProgramDataBaseFileName="vc_mswu\typetest.pdb" | ||||
| 				WarningLevel="4" | ||||
| 				SuppressStartupBanner="true"/> | ||||
| 				SuppressStartupBanner="TRUE" | ||||
| 				Detect64BitPortabilityProblems="TRUE" | ||||
| 				DebugInformationFormat="3"/> | ||||
| 			<Tool | ||||
| 				Name="VCManagedResourceCompilerTool"/> | ||||
| 				Name="VCCustomBuildTool"/> | ||||
| 			<Tool | ||||
| 				Name="VCResourceCompilerTool" | ||||
| 				Culture="1033" | ||||
| 				AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples" | ||||
| 				PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"/> | ||||
| 				Name="VCLinkerTool" | ||||
| 				AdditionalOptions="" | ||||
| 				AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.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 comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib" | ||||
| 				OutputFile="vc_mswu\typetest.exe" | ||||
| 				LinkIncremental="2" | ||||
| 				SuppressStartupBanner="TRUE" | ||||
| 				AdditionalLibraryDirectories=".\..\..\lib\vc_lib" | ||||
| 				GenerateDebugInformation="TRUE" | ||||
| 				ProgramDatabaseFile="vc_mswu\typetest.pdb" | ||||
| 				SubSystem="2" | ||||
| 				TargetMachine="1"/> | ||||
| 			<Tool | ||||
| 				Name="VCMIDLTool"/> | ||||
| 			<Tool | ||||
| 				Name="VCPostBuildEventTool"/> | ||||
| 			<Tool | ||||
| 				Name="VCPreBuildEventTool"/> | ||||
| 			<Tool | ||||
| 				Name="VCPreLinkEventTool"/> | ||||
| 			<Tool | ||||
| 				Name="VCLinkerTool" | ||||
| 				AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.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 comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib" | ||||
| 				AdditionalOptions="" | ||||
| 				OutputFile="vc_mswu\typetest.exe" | ||||
| 				LinkIncremental="2" | ||||
| 				SubSystem="2" | ||||
| 				SuppressStartupBanner="true" | ||||
| 				AdditionalLibraryDirectories=".\..\..\lib\vc_lib" | ||||
| 				GenerateDebugInformation="true" | ||||
| 				ProgramDatabaseFile="vc_mswu\typetest.pdb" | ||||
| 				TargetMachine="1"/> | ||||
| 				Name="VCResourceCompilerTool" | ||||
| 				PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH" | ||||
| 				Culture="1033" | ||||
| 				AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> | ||||
| 			<Tool | ||||
| 				Name="VCALinkTool"/> | ||||
| 				Name="VCWebServiceProxyGeneratorTool"/> | ||||
| 			<Tool | ||||
| 				Name="VCXDCMakeTool"/> | ||||
| 			<Tool | ||||
| 				Name="VCBscMakeTool" | ||||
| 				OutputFile="vc_mswu\typetest_vc7.bsc" | ||||
| 				SuppressStartupBanner="true"/> | ||||
| 			<Tool | ||||
| 				Name="VCFxCopTool"/> | ||||
| 			<Tool | ||||
| 				Name="VCAppVerifierTool"/> | ||||
| 				Name="VCXMLDataGeneratorTool"/> | ||||
| 			<Tool | ||||
| 				Name="VCWebDeploymentTool"/> | ||||
| 			<Tool | ||||
| 				Name="VCPostBuildEventTool"/> | ||||
| 				Name="VCManagedWrapperGeneratorTool"/> | ||||
| 			<Tool | ||||
| 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/> | ||||
| 		</Configuration> | ||||
| 		<Configuration | ||||
| 			Name="Debug|Win32" | ||||
| @@ -547,74 +458,63 @@ | ||||
| 			IntermediateDirectory="vc_mswud\typetest" | ||||
| 			ConfigurationType="1" | ||||
| 			UseOfMFC="0" | ||||
| 			ATLMinimizesCRunTimeLibraryUsage="false" | ||||
| 			ATLMinimizesCRunTimeLibraryUsage="FALSE" | ||||
| 			CharacterSet="1"> | ||||
| 			<Tool | ||||
| 				Name="VCPreBuildEventTool"/> | ||||
| 			<Tool | ||||
| 				Name="VCCustomBuildTool"/> | ||||
| 			<Tool | ||||
| 				Name="VCXMLDataGeneratorTool"/> | ||||
| 			<Tool | ||||
| 				Name="VCWebServiceProxyGeneratorTool"/> | ||||
| 			<Tool | ||||
| 				Name="VCIDLTool"/> | ||||
| 			<Tool | ||||
| 				Name="VCCLCompilerTool" | ||||
| 				Optimization="0" | ||||
| 				InlineFunctionExpansion="1" | ||||
| 				AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples" | ||||
| 				MinimalRebuild="true" | ||||
| 				ExceptionHandling="1" | ||||
| 				AdditionalOptions="" | ||||
| 				RuntimeLibrary="3" | ||||
| 				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" | ||||
| 				MinimalRebuild="TRUE" | ||||
| 				ExceptionHandling="TRUE" | ||||
| 				BasicRuntimeChecks="3" | ||||
| 				DebugInformationFormat="3" | ||||
| 				Detect64BitPortabilityProblems="true" | ||||
| 				RuntimeTypeInfo="true" | ||||
| 				RuntimeLibrary="3" | ||||
| 				BufferSecurityCheck="TRUE" | ||||
| 				RuntimeTypeInfo="TRUE" | ||||
| 				AssemblerListingLocation="vc_mswud\typetest\" | ||||
| 				ObjectFile="vc_mswud\typetest\" | ||||
| 				ProgramDataBaseFileName="vc_mswud\typetest.pdb" | ||||
| 				WarningLevel="4" | ||||
| 				SuppressStartupBanner="true"/> | ||||
| 				SuppressStartupBanner="TRUE" | ||||
| 				Detect64BitPortabilityProblems="TRUE" | ||||
| 				DebugInformationFormat="3"/> | ||||
| 			<Tool | ||||
| 				Name="VCManagedResourceCompilerTool"/> | ||||
| 				Name="VCCustomBuildTool"/> | ||||
| 			<Tool | ||||
| 				Name="VCResourceCompilerTool" | ||||
| 				Culture="1033" | ||||
| 				AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples" | ||||
| 				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"/> | ||||
| 				Name="VCLinkerTool" | ||||
| 				AdditionalOptions="" | ||||
| 				AdditionalDependencies="wxmsw29ud_core.lib  wxbase29ud.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 comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib" | ||||
| 				OutputFile="vc_mswud\typetest.exe" | ||||
| 				LinkIncremental="2" | ||||
| 				SuppressStartupBanner="TRUE" | ||||
| 				AdditionalLibraryDirectories=".\..\..\lib\vc_lib" | ||||
| 				GenerateDebugInformation="TRUE" | ||||
| 				ProgramDatabaseFile="vc_mswud\typetest.pdb" | ||||
| 				SubSystem="2" | ||||
| 				TargetMachine="1"/> | ||||
| 			<Tool | ||||
| 				Name="VCMIDLTool"/> | ||||
| 			<Tool | ||||
| 				Name="VCPostBuildEventTool"/> | ||||
| 			<Tool | ||||
| 				Name="VCPreBuildEventTool"/> | ||||
| 			<Tool | ||||
| 				Name="VCPreLinkEventTool"/> | ||||
| 			<Tool | ||||
| 				Name="VCLinkerTool" | ||||
| 				AdditionalDependencies="wxmsw29ud_core.lib  wxbase29ud.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 comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib" | ||||
| 				AdditionalOptions="" | ||||
| 				OutputFile="vc_mswud\typetest.exe" | ||||
| 				LinkIncremental="2" | ||||
| 				SubSystem="2" | ||||
| 				SuppressStartupBanner="true" | ||||
| 				AdditionalLibraryDirectories=".\..\..\lib\vc_lib" | ||||
| 				GenerateDebugInformation="true" | ||||
| 				ProgramDatabaseFile="vc_mswud\typetest.pdb" | ||||
| 				TargetMachine="1"/> | ||||
| 				Name="VCResourceCompilerTool" | ||||
| 				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" | ||||
| 				Culture="1033" | ||||
| 				AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> | ||||
| 			<Tool | ||||
| 				Name="VCALinkTool"/> | ||||
| 				Name="VCWebServiceProxyGeneratorTool"/> | ||||
| 			<Tool | ||||
| 				Name="VCXDCMakeTool"/> | ||||
| 			<Tool | ||||
| 				Name="VCBscMakeTool" | ||||
| 				OutputFile="vc_mswud\typetest_vc7.bsc" | ||||
| 				SuppressStartupBanner="true"/> | ||||
| 			<Tool | ||||
| 				Name="VCFxCopTool"/> | ||||
| 			<Tool | ||||
| 				Name="VCAppVerifierTool"/> | ||||
| 				Name="VCXMLDataGeneratorTool"/> | ||||
| 			<Tool | ||||
| 				Name="VCWebDeploymentTool"/> | ||||
| 			<Tool | ||||
| 				Name="VCPostBuildEventTool"/> | ||||
| 				Name="VCManagedWrapperGeneratorTool"/> | ||||
| 			<Tool | ||||
| 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/> | ||||
| 		</Configuration> | ||||
| 	</Configurations> | ||||
| 	<References> | ||||
| @@ -623,17 +523,19 @@ | ||||
| 	<Files> | ||||
| 		<Filter | ||||
| 			Name="Source Files" | ||||
| 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" | ||||
| 			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"> | ||||
| 			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" | ||||
| 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"> | ||||
| 			<File | ||||
| 				RelativePath=".\typetest.cpp"/> | ||||
| 				RelativePath=".\typetest.cpp"> | ||||
| 			</File> | ||||
| 		</Filter> | ||||
| 		<Filter | ||||
| 			Name="Resource Files" | ||||
| 			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" | ||||
| 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"> | ||||
| 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" | ||||
| 			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"> | ||||
| 			<File | ||||
| 				RelativePath=".\typetest.rc"/> | ||||
| 				RelativePath=".\typetest.rc"> | ||||
| 			</File> | ||||
| 		</Filter> | ||||
| 	</Files> | ||||
| 	<Globals> | ||||
|   | ||||
| @@ -1,8 +1,8 @@ | ||||
| <?xml version="1.0" ?> | ||||
| <?xml version="1.0" encoding="Windows-1252"?> | ||||
| <!-- | ||||
|  | ||||
|   This makefile was generated by | ||||
|   Bakefile 0.2.3 (http://www.bakefile.org) | ||||
|   Bakefile 0.2.4 (http://www.bakefile.org) | ||||
|   Do not modify, all changes will be overwritten! | ||||
|  | ||||
| --> | ||||
| @@ -43,57 +43,56 @@ | ||||
| 				Name="VCWebServiceProxyGeneratorTool" | ||||
| 			/> | ||||
| 			<Tool | ||||
| 				Name="VCIDLTool" | ||||
| 				Name="VCMIDLTool" | ||||
| 			/> | ||||
| 			<Tool | ||||
| 				Name="VCCLCompilerTool" | ||||
| 				Optimization="2" | ||||
| 				InlineFunctionExpansion="1" | ||||
| 				AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples" | ||||
| 				MinimalRebuild="false" | ||||
| 				ExceptionHandling="1" | ||||
| 				AdditionalOptions="" | ||||
| 				RuntimeLibrary="2" | ||||
| 				PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" | ||||
| 				BasicRuntimeChecks="3" | ||||
| 				DebugInformationFormat="3" | ||||
| 				Detect64BitPortabilityProblems="true" | ||||
| 				ExceptionHandling="1" | ||||
| 				RuntimeLibrary="2" | ||||
| 				RuntimeTypeInfo="true" | ||||
| 				AssemblerListingLocation="vc_mswunivudll\typetest\" | ||||
| 				ObjectFile="vc_mswunivudll\typetest\" | ||||
| 				ProgramDataBaseFileName="vc_mswunivudll\typetest.pdb" | ||||
| 				WarningLevel="4" | ||||
| 				SuppressStartupBanner="true" | ||||
| 				Detect64BitPortabilityProblems="true" | ||||
| 				DebugInformationFormat="3" | ||||
| 			/> | ||||
| 			<Tool | ||||
| 				Name="VCManagedResourceCompilerTool" | ||||
| 			/> | ||||
| 			<Tool | ||||
| 				Name="VCResourceCompilerTool" | ||||
| 				PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" | ||||
| 				Culture="1033" | ||||
| 				AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples" | ||||
| 				PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" | ||||
| 			/> | ||||
| 			<Tool | ||||
| 				Name="VCPreLinkEventTool" | ||||
| 			/> | ||||
| 			<Tool | ||||
| 				Name="VCLinkerTool" | ||||
| 				AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.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 comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib" | ||||
| 				AdditionalOptions="" | ||||
| 				AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.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 comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib" | ||||
| 				OutputFile="vc_mswunivudll\typetest.exe" | ||||
| 				LinkIncremental="2" | ||||
| 				SubSystem="2" | ||||
| 				SuppressStartupBanner="true" | ||||
| 				AdditionalLibraryDirectories=".\..\..\lib\vc_dll" | ||||
| 				GenerateManifest="true" | ||||
| 				GenerateDebugInformation="true" | ||||
| 				ProgramDatabaseFile="vc_mswunivudll\typetest.pdb" | ||||
| 				SubSystem="2" | ||||
| 				TargetMachine="1" | ||||
| 			/> | ||||
| 			<Tool | ||||
| 				Name="VCALinkTool" | ||||
| 			/> | ||||
| 			<Tool | ||||
| 				Name="VCManifestTool" | ||||
| 			/> | ||||
| 			<Tool | ||||
| 				Name="VCXDCMakeTool" | ||||
| 			/> | ||||
| @@ -137,57 +136,59 @@ | ||||
| 				Name="VCWebServiceProxyGeneratorTool" | ||||
| 			/> | ||||
| 			<Tool | ||||
| 				Name="VCIDLTool" | ||||
| 				Name="VCMIDLTool" | ||||
| 			/> | ||||
| 			<Tool | ||||
| 				Name="VCCLCompilerTool" | ||||
| 				Optimization="0" | ||||
| 				InlineFunctionExpansion="1" | ||||
| 				AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples" | ||||
| 				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" | ||||
| 				MinimalRebuild="true" | ||||
| 				ExceptionHandling="1" | ||||
| 				AdditionalOptions="" | ||||
| 				RuntimeLibrary="3" | ||||
| 				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" | ||||
| 				BasicRuntimeChecks="3" | ||||
| 				DebugInformationFormat="3" | ||||
| 				Detect64BitPortabilityProblems="true" | ||||
| 				RuntimeLibrary="3" | ||||
| 				BufferSecurityCheck="true" | ||||
| 				RuntimeTypeInfo="true" | ||||
| 				AssemblerListingLocation="vc_mswunivuddll\typetest\" | ||||
| 				ObjectFile="vc_mswunivuddll\typetest\" | ||||
| 				ProgramDataBaseFileName="vc_mswunivuddll\typetest.pdb" | ||||
| 				WarningLevel="4" | ||||
| 				SuppressStartupBanner="true" | ||||
| 				Detect64BitPortabilityProblems="true" | ||||
| 				DebugInformationFormat="3" | ||||
| 			/> | ||||
| 			<Tool | ||||
| 				Name="VCManagedResourceCompilerTool" | ||||
| 			/> | ||||
| 			<Tool | ||||
| 				Name="VCResourceCompilerTool" | ||||
| 				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" | ||||
| 				Culture="1033" | ||||
| 				AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples" | ||||
| 				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" | ||||
| 			/> | ||||
| 			<Tool | ||||
| 				Name="VCPreLinkEventTool" | ||||
| 			/> | ||||
| 			<Tool | ||||
| 				Name="VCLinkerTool" | ||||
| 				AdditionalDependencies="wxmswuniv29ud_core.lib  wxbase29ud.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 comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib" | ||||
| 				AdditionalOptions="" | ||||
| 				AdditionalDependencies="wxmswuniv29ud_core.lib  wxbase29ud.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 comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib" | ||||
| 				OutputFile="vc_mswunivuddll\typetest.exe" | ||||
| 				LinkIncremental="2" | ||||
| 				SubSystem="2" | ||||
| 				SuppressStartupBanner="true" | ||||
| 				AdditionalLibraryDirectories=".\..\..\lib\vc_dll" | ||||
| 				GenerateManifest="true" | ||||
| 				GenerateDebugInformation="true" | ||||
| 				ProgramDatabaseFile="vc_mswunivuddll\typetest.pdb" | ||||
| 				SubSystem="2" | ||||
| 				TargetMachine="1" | ||||
| 			/> | ||||
| 			<Tool | ||||
| 				Name="VCALinkTool" | ||||
| 			/> | ||||
| 			<Tool | ||||
| 				Name="VCManifestTool" | ||||
| 			/> | ||||
| 			<Tool | ||||
| 				Name="VCXDCMakeTool" | ||||
| 			/> | ||||
| @@ -231,57 +232,56 @@ | ||||
| 				Name="VCWebServiceProxyGeneratorTool" | ||||
| 			/> | ||||
| 			<Tool | ||||
| 				Name="VCIDLTool" | ||||
| 				Name="VCMIDLTool" | ||||
| 			/> | ||||
| 			<Tool | ||||
| 				Name="VCCLCompilerTool" | ||||
| 				Optimization="2" | ||||
| 				InlineFunctionExpansion="1" | ||||
| 				AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples" | ||||
| 				MinimalRebuild="false" | ||||
| 				ExceptionHandling="1" | ||||
| 				AdditionalOptions="" | ||||
| 				RuntimeLibrary="2" | ||||
| 				PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" | ||||
| 				BasicRuntimeChecks="3" | ||||
| 				DebugInformationFormat="3" | ||||
| 				Detect64BitPortabilityProblems="true" | ||||
| 				ExceptionHandling="1" | ||||
| 				RuntimeLibrary="2" | ||||
| 				RuntimeTypeInfo="true" | ||||
| 				AssemblerListingLocation="vc_mswudll\typetest\" | ||||
| 				ObjectFile="vc_mswudll\typetest\" | ||||
| 				ProgramDataBaseFileName="vc_mswudll\typetest.pdb" | ||||
| 				WarningLevel="4" | ||||
| 				SuppressStartupBanner="true" | ||||
| 				Detect64BitPortabilityProblems="true" | ||||
| 				DebugInformationFormat="3" | ||||
| 			/> | ||||
| 			<Tool | ||||
| 				Name="VCManagedResourceCompilerTool" | ||||
| 			/> | ||||
| 			<Tool | ||||
| 				Name="VCResourceCompilerTool" | ||||
| 				PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" | ||||
| 				Culture="1033" | ||||
| 				AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples" | ||||
| 				PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" | ||||
| 			/> | ||||
| 			<Tool | ||||
| 				Name="VCPreLinkEventTool" | ||||
| 			/> | ||||
| 			<Tool | ||||
| 				Name="VCLinkerTool" | ||||
| 				AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.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 comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib" | ||||
| 				AdditionalOptions="" | ||||
| 				AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.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 comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib" | ||||
| 				OutputFile="vc_mswudll\typetest.exe" | ||||
| 				LinkIncremental="2" | ||||
| 				SubSystem="2" | ||||
| 				SuppressStartupBanner="true" | ||||
| 				AdditionalLibraryDirectories=".\..\..\lib\vc_dll" | ||||
| 				GenerateManifest="true" | ||||
| 				GenerateDebugInformation="true" | ||||
| 				ProgramDatabaseFile="vc_mswudll\typetest.pdb" | ||||
| 				SubSystem="2" | ||||
| 				TargetMachine="1" | ||||
| 			/> | ||||
| 			<Tool | ||||
| 				Name="VCALinkTool" | ||||
| 			/> | ||||
| 			<Tool | ||||
| 				Name="VCManifestTool" | ||||
| 			/> | ||||
| 			<Tool | ||||
| 				Name="VCXDCMakeTool" | ||||
| 			/> | ||||
| @@ -325,57 +325,59 @@ | ||||
| 				Name="VCWebServiceProxyGeneratorTool" | ||||
| 			/> | ||||
| 			<Tool | ||||
| 				Name="VCIDLTool" | ||||
| 				Name="VCMIDLTool" | ||||
| 			/> | ||||
| 			<Tool | ||||
| 				Name="VCCLCompilerTool" | ||||
| 				Optimization="0" | ||||
| 				InlineFunctionExpansion="1" | ||||
| 				AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples" | ||||
| 				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" | ||||
| 				MinimalRebuild="true" | ||||
| 				ExceptionHandling="1" | ||||
| 				AdditionalOptions="" | ||||
| 				RuntimeLibrary="3" | ||||
| 				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" | ||||
| 				BasicRuntimeChecks="3" | ||||
| 				DebugInformationFormat="3" | ||||
| 				Detect64BitPortabilityProblems="true" | ||||
| 				RuntimeLibrary="3" | ||||
| 				BufferSecurityCheck="true" | ||||
| 				RuntimeTypeInfo="true" | ||||
| 				AssemblerListingLocation="vc_mswuddll\typetest\" | ||||
| 				ObjectFile="vc_mswuddll\typetest\" | ||||
| 				ProgramDataBaseFileName="vc_mswuddll\typetest.pdb" | ||||
| 				WarningLevel="4" | ||||
| 				SuppressStartupBanner="true" | ||||
| 				Detect64BitPortabilityProblems="true" | ||||
| 				DebugInformationFormat="3" | ||||
| 			/> | ||||
| 			<Tool | ||||
| 				Name="VCManagedResourceCompilerTool" | ||||
| 			/> | ||||
| 			<Tool | ||||
| 				Name="VCResourceCompilerTool" | ||||
| 				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" | ||||
| 				Culture="1033" | ||||
| 				AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples" | ||||
| 				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" | ||||
| 			/> | ||||
| 			<Tool | ||||
| 				Name="VCPreLinkEventTool" | ||||
| 			/> | ||||
| 			<Tool | ||||
| 				Name="VCLinkerTool" | ||||
| 				AdditionalDependencies="wxmsw29ud_core.lib  wxbase29ud.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 comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib" | ||||
| 				AdditionalOptions="" | ||||
| 				AdditionalDependencies="wxmsw29ud_core.lib  wxbase29ud.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 comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib" | ||||
| 				OutputFile="vc_mswuddll\typetest.exe" | ||||
| 				LinkIncremental="2" | ||||
| 				SubSystem="2" | ||||
| 				SuppressStartupBanner="true" | ||||
| 				AdditionalLibraryDirectories=".\..\..\lib\vc_dll" | ||||
| 				GenerateManifest="true" | ||||
| 				GenerateDebugInformation="true" | ||||
| 				ProgramDatabaseFile="vc_mswuddll\typetest.pdb" | ||||
| 				SubSystem="2" | ||||
| 				TargetMachine="1" | ||||
| 			/> | ||||
| 			<Tool | ||||
| 				Name="VCALinkTool" | ||||
| 			/> | ||||
| 			<Tool | ||||
| 				Name="VCManifestTool" | ||||
| 			/> | ||||
| 			<Tool | ||||
| 				Name="VCXDCMakeTool" | ||||
| 			/> | ||||
| @@ -419,57 +421,56 @@ | ||||
| 				Name="VCWebServiceProxyGeneratorTool" | ||||
| 			/> | ||||
| 			<Tool | ||||
| 				Name="VCIDLTool" | ||||
| 				Name="VCMIDLTool" | ||||
| 			/> | ||||
| 			<Tool | ||||
| 				Name="VCCLCompilerTool" | ||||
| 				Optimization="2" | ||||
| 				InlineFunctionExpansion="1" | ||||
| 				AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples" | ||||
| 				MinimalRebuild="false" | ||||
| 				ExceptionHandling="1" | ||||
| 				AdditionalOptions="" | ||||
| 				RuntimeLibrary="2" | ||||
| 				PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH" | ||||
| 				BasicRuntimeChecks="3" | ||||
| 				DebugInformationFormat="3" | ||||
| 				Detect64BitPortabilityProblems="true" | ||||
| 				ExceptionHandling="1" | ||||
| 				RuntimeLibrary="2" | ||||
| 				RuntimeTypeInfo="true" | ||||
| 				AssemblerListingLocation="vc_mswunivu\typetest\" | ||||
| 				ObjectFile="vc_mswunivu\typetest\" | ||||
| 				ProgramDataBaseFileName="vc_mswunivu\typetest.pdb" | ||||
| 				WarningLevel="4" | ||||
| 				SuppressStartupBanner="true" | ||||
| 				Detect64BitPortabilityProblems="true" | ||||
| 				DebugInformationFormat="3" | ||||
| 			/> | ||||
| 			<Tool | ||||
| 				Name="VCManagedResourceCompilerTool" | ||||
| 			/> | ||||
| 			<Tool | ||||
| 				Name="VCResourceCompilerTool" | ||||
| 				PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH" | ||||
| 				Culture="1033" | ||||
| 				AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples" | ||||
| 				PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH" | ||||
| 			/> | ||||
| 			<Tool | ||||
| 				Name="VCPreLinkEventTool" | ||||
| 			/> | ||||
| 			<Tool | ||||
| 				Name="VCLinkerTool" | ||||
| 				AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.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 comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib" | ||||
| 				AdditionalOptions="" | ||||
| 				AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.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 comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib" | ||||
| 				OutputFile="vc_mswunivu\typetest.exe" | ||||
| 				LinkIncremental="2" | ||||
| 				SubSystem="2" | ||||
| 				SuppressStartupBanner="true" | ||||
| 				AdditionalLibraryDirectories=".\..\..\lib\vc_lib" | ||||
| 				GenerateManifest="true" | ||||
| 				GenerateDebugInformation="true" | ||||
| 				ProgramDatabaseFile="vc_mswunivu\typetest.pdb" | ||||
| 				SubSystem="2" | ||||
| 				TargetMachine="1" | ||||
| 			/> | ||||
| 			<Tool | ||||
| 				Name="VCALinkTool" | ||||
| 			/> | ||||
| 			<Tool | ||||
| 				Name="VCManifestTool" | ||||
| 			/> | ||||
| 			<Tool | ||||
| 				Name="VCXDCMakeTool" | ||||
| 			/> | ||||
| @@ -513,57 +514,59 @@ | ||||
| 				Name="VCWebServiceProxyGeneratorTool" | ||||
| 			/> | ||||
| 			<Tool | ||||
| 				Name="VCIDLTool" | ||||
| 				Name="VCMIDLTool" | ||||
| 			/> | ||||
| 			<Tool | ||||
| 				Name="VCCLCompilerTool" | ||||
| 				Optimization="0" | ||||
| 				InlineFunctionExpansion="1" | ||||
| 				AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples" | ||||
| 				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" | ||||
| 				MinimalRebuild="true" | ||||
| 				ExceptionHandling="1" | ||||
| 				AdditionalOptions="" | ||||
| 				RuntimeLibrary="3" | ||||
| 				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" | ||||
| 				BasicRuntimeChecks="3" | ||||
| 				DebugInformationFormat="3" | ||||
| 				Detect64BitPortabilityProblems="true" | ||||
| 				RuntimeLibrary="3" | ||||
| 				BufferSecurityCheck="true" | ||||
| 				RuntimeTypeInfo="true" | ||||
| 				AssemblerListingLocation="vc_mswunivud\typetest\" | ||||
| 				ObjectFile="vc_mswunivud\typetest\" | ||||
| 				ProgramDataBaseFileName="vc_mswunivud\typetest.pdb" | ||||
| 				WarningLevel="4" | ||||
| 				SuppressStartupBanner="true" | ||||
| 				Detect64BitPortabilityProblems="true" | ||||
| 				DebugInformationFormat="3" | ||||
| 			/> | ||||
| 			<Tool | ||||
| 				Name="VCManagedResourceCompilerTool" | ||||
| 			/> | ||||
| 			<Tool | ||||
| 				Name="VCResourceCompilerTool" | ||||
| 				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" | ||||
| 				Culture="1033" | ||||
| 				AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples" | ||||
| 				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" | ||||
| 			/> | ||||
| 			<Tool | ||||
| 				Name="VCPreLinkEventTool" | ||||
| 			/> | ||||
| 			<Tool | ||||
| 				Name="VCLinkerTool" | ||||
| 				AdditionalDependencies="wxmswuniv29ud_core.lib  wxbase29ud.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 comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib" | ||||
| 				AdditionalOptions="" | ||||
| 				AdditionalDependencies="wxmswuniv29ud_core.lib  wxbase29ud.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 comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib" | ||||
| 				OutputFile="vc_mswunivud\typetest.exe" | ||||
| 				LinkIncremental="2" | ||||
| 				SubSystem="2" | ||||
| 				SuppressStartupBanner="true" | ||||
| 				AdditionalLibraryDirectories=".\..\..\lib\vc_lib" | ||||
| 				GenerateManifest="true" | ||||
| 				GenerateDebugInformation="true" | ||||
| 				ProgramDatabaseFile="vc_mswunivud\typetest.pdb" | ||||
| 				SubSystem="2" | ||||
| 				TargetMachine="1" | ||||
| 			/> | ||||
| 			<Tool | ||||
| 				Name="VCALinkTool" | ||||
| 			/> | ||||
| 			<Tool | ||||
| 				Name="VCManifestTool" | ||||
| 			/> | ||||
| 			<Tool | ||||
| 				Name="VCXDCMakeTool" | ||||
| 			/> | ||||
| @@ -607,57 +610,56 @@ | ||||
| 				Name="VCWebServiceProxyGeneratorTool" | ||||
| 			/> | ||||
| 			<Tool | ||||
| 				Name="VCIDLTool" | ||||
| 				Name="VCMIDLTool" | ||||
| 			/> | ||||
| 			<Tool | ||||
| 				Name="VCCLCompilerTool" | ||||
| 				Optimization="2" | ||||
| 				InlineFunctionExpansion="1" | ||||
| 				AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples" | ||||
| 				MinimalRebuild="false" | ||||
| 				ExceptionHandling="1" | ||||
| 				AdditionalOptions="" | ||||
| 				RuntimeLibrary="2" | ||||
| 				PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH" | ||||
| 				BasicRuntimeChecks="3" | ||||
| 				DebugInformationFormat="3" | ||||
| 				Detect64BitPortabilityProblems="true" | ||||
| 				ExceptionHandling="1" | ||||
| 				RuntimeLibrary="2" | ||||
| 				RuntimeTypeInfo="true" | ||||
| 				AssemblerListingLocation="vc_mswu\typetest\" | ||||
| 				ObjectFile="vc_mswu\typetest\" | ||||
| 				ProgramDataBaseFileName="vc_mswu\typetest.pdb" | ||||
| 				WarningLevel="4" | ||||
| 				SuppressStartupBanner="true" | ||||
| 				Detect64BitPortabilityProblems="true" | ||||
| 				DebugInformationFormat="3" | ||||
| 			/> | ||||
| 			<Tool | ||||
| 				Name="VCManagedResourceCompilerTool" | ||||
| 			/> | ||||
| 			<Tool | ||||
| 				Name="VCResourceCompilerTool" | ||||
| 				PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH" | ||||
| 				Culture="1033" | ||||
| 				AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples" | ||||
| 				PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH" | ||||
| 			/> | ||||
| 			<Tool | ||||
| 				Name="VCPreLinkEventTool" | ||||
| 			/> | ||||
| 			<Tool | ||||
| 				Name="VCLinkerTool" | ||||
| 				AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.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 comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib" | ||||
| 				AdditionalOptions="" | ||||
| 				AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.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 comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib" | ||||
| 				OutputFile="vc_mswu\typetest.exe" | ||||
| 				LinkIncremental="2" | ||||
| 				SubSystem="2" | ||||
| 				SuppressStartupBanner="true" | ||||
| 				AdditionalLibraryDirectories=".\..\..\lib\vc_lib" | ||||
| 				GenerateManifest="true" | ||||
| 				GenerateDebugInformation="true" | ||||
| 				ProgramDatabaseFile="vc_mswu\typetest.pdb" | ||||
| 				SubSystem="2" | ||||
| 				TargetMachine="1" | ||||
| 			/> | ||||
| 			<Tool | ||||
| 				Name="VCALinkTool" | ||||
| 			/> | ||||
| 			<Tool | ||||
| 				Name="VCManifestTool" | ||||
| 			/> | ||||
| 			<Tool | ||||
| 				Name="VCXDCMakeTool" | ||||
| 			/> | ||||
| @@ -701,57 +703,59 @@ | ||||
| 				Name="VCWebServiceProxyGeneratorTool" | ||||
| 			/> | ||||
| 			<Tool | ||||
| 				Name="VCIDLTool" | ||||
| 				Name="VCMIDLTool" | ||||
| 			/> | ||||
| 			<Tool | ||||
| 				Name="VCCLCompilerTool" | ||||
| 				Optimization="0" | ||||
| 				InlineFunctionExpansion="1" | ||||
| 				AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples" | ||||
| 				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" | ||||
| 				MinimalRebuild="true" | ||||
| 				ExceptionHandling="1" | ||||
| 				AdditionalOptions="" | ||||
| 				RuntimeLibrary="3" | ||||
| 				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" | ||||
| 				BasicRuntimeChecks="3" | ||||
| 				DebugInformationFormat="3" | ||||
| 				Detect64BitPortabilityProblems="true" | ||||
| 				RuntimeLibrary="3" | ||||
| 				BufferSecurityCheck="true" | ||||
| 				RuntimeTypeInfo="true" | ||||
| 				AssemblerListingLocation="vc_mswud\typetest\" | ||||
| 				ObjectFile="vc_mswud\typetest\" | ||||
| 				ProgramDataBaseFileName="vc_mswud\typetest.pdb" | ||||
| 				WarningLevel="4" | ||||
| 				SuppressStartupBanner="true" | ||||
| 				Detect64BitPortabilityProblems="true" | ||||
| 				DebugInformationFormat="3" | ||||
| 			/> | ||||
| 			<Tool | ||||
| 				Name="VCManagedResourceCompilerTool" | ||||
| 			/> | ||||
| 			<Tool | ||||
| 				Name="VCResourceCompilerTool" | ||||
| 				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" | ||||
| 				Culture="1033" | ||||
| 				AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples" | ||||
| 				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" | ||||
| 			/> | ||||
| 			<Tool | ||||
| 				Name="VCPreLinkEventTool" | ||||
| 			/> | ||||
| 			<Tool | ||||
| 				Name="VCLinkerTool" | ||||
| 				AdditionalDependencies="wxmsw29ud_core.lib  wxbase29ud.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 comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib" | ||||
| 				AdditionalOptions="" | ||||
| 				AdditionalDependencies="wxmsw29ud_core.lib  wxbase29ud.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 comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib" | ||||
| 				OutputFile="vc_mswud\typetest.exe" | ||||
| 				LinkIncremental="2" | ||||
| 				SubSystem="2" | ||||
| 				SuppressStartupBanner="true" | ||||
| 				AdditionalLibraryDirectories=".\..\..\lib\vc_lib" | ||||
| 				GenerateManifest="true" | ||||
| 				GenerateDebugInformation="true" | ||||
| 				ProgramDatabaseFile="vc_mswud\typetest.pdb" | ||||
| 				SubSystem="2" | ||||
| 				TargetMachine="1" | ||||
| 			/> | ||||
| 			<Tool | ||||
| 				Name="VCALinkTool" | ||||
| 			/> | ||||
| 			<Tool | ||||
| 				Name="VCManifestTool" | ||||
| 			/> | ||||
| 			<Tool | ||||
| 				Name="VCXDCMakeTool" | ||||
| 			/> | ||||
| @@ -780,21 +784,23 @@ | ||||
| 	<Files> | ||||
| 		<Filter | ||||
| 			Name="Source Files" | ||||
| 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" | ||||
| 			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" | ||||
| 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" | ||||
| 			> | ||||
| 			<File | ||||
| 				RelativePath=".\typetest.cpp" | ||||
| 			/> | ||||
| 				> | ||||
| 			</File> | ||||
| 		</Filter> | ||||
| 		<Filter | ||||
| 			Name="Resource Files" | ||||
| 			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" | ||||
| 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" | ||||
| 			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" | ||||
| 			> | ||||
| 			<File | ||||
| 				RelativePath=".\typetest.rc" | ||||
| 			/> | ||||
| 				> | ||||
| 			</File> | ||||
| 		</Filter> | ||||
| 	</Files> | ||||
| 	<Globals> | ||||
|   | ||||
		Reference in New Issue
	
	Block a user