Rebaked everything with bakefile 0.2.6 after wxRibbon merge.
0.2.5 versions of some makefiles were checked in, regenerate them using 0.2.6. Also regenerate configure after autoconf_inc.m4 was updated. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61946 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
		
							
								
								
									
										64
									
								
								Makefile.in
									
									
									
									
									
								
							
							
						
						
									
										64
									
								
								Makefile.in
									
									
									
									
									
								
							| @@ -1731,11 +1731,11 @@ AUILIB_OBJECTS =  \ | |||||||
| 	auilib_tabmdi.o | 	auilib_tabmdi.o | ||||||
| AUILIB_ODEP =  $(_____pch_wxprec_auilib_wx_wxprec_h_gch___depname) | AUILIB_ODEP =  $(_____pch_wxprec_auilib_wx_wxprec_h_gch___depname) | ||||||
| RIBBONDLL_CXXFLAGS = $(__ribbondll_PCH_INC) -D__WX$(TOOLKIT)__ \
 | RIBBONDLL_CXXFLAGS = $(__ribbondll_PCH_INC) -D__WX$(TOOLKIT)__ \
 | ||||||
| 	$(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
 | 	$(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
 | ||||||
| 	$(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) \
 | 	$(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_BUILD_p) \
 | ||||||
| 	$(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_REGEX_p) \
 | 	$(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \
 | ||||||
| 	$(__INC_EXPAT_p) -DWXUSINGDLL -DWXMAKINGDLL_RIBBON $(PIC_FLAG) \
 | 	$(__INC_REGEX_p) $(__INC_EXPAT_p) -DWXUSINGDLL -DWXMAKINGDLL_RIBBON \
 | ||||||
| 	$(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS) | 	$(PIC_FLAG) $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS) | ||||||
| RIBBONDLL_OBJECTS =  \
 | RIBBONDLL_OBJECTS =  \
 | ||||||
| 	$(__ribbondll___win32rc) \
 | 	$(__ribbondll___win32rc) \
 | ||||||
| 	ribbondll_art_internal.o \
 | 	ribbondll_art_internal.o \
 | ||||||
| @@ -1750,10 +1750,10 @@ RIBBONDLL_OBJECTS =  \ | |||||||
| 	ribbondll_toolbar.o | 	ribbondll_toolbar.o | ||||||
| RIBBONDLL_ODEP =  $(_____pch_wxprec_ribbondll_wx_wxprec_h_gch___depname) | RIBBONDLL_ODEP =  $(_____pch_wxprec_ribbondll_wx_wxprec_h_gch___depname) | ||||||
| RIBBONLIB_CXXFLAGS = $(__ribbonlib_PCH_INC) -D__WX$(TOOLKIT)__ \
 | RIBBONLIB_CXXFLAGS = $(__ribbonlib_PCH_INC) -D__WX$(TOOLKIT)__ \
 | ||||||
| 	$(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
 | 	$(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
 | ||||||
| 	$(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) \
 | 	$(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_BUILD_p) \
 | ||||||
| 	$(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_REGEX_p) \
 | 	$(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \
 | ||||||
| 	$(__INC_EXPAT_p) $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS) | 	$(__INC_REGEX_p) $(__INC_EXPAT_p) $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS) | ||||||
| RIBBONLIB_OBJECTS =  \
 | RIBBONLIB_OBJECTS =  \
 | ||||||
| 	ribbonlib_art_internal.o \
 | 	ribbonlib_art_internal.o \
 | ||||||
| 	ribbonlib_art_msw.o \
 | 	ribbonlib_art_msw.o \
 | ||||||
| @@ -11501,7 +11501,7 @@ COND_WINDOWS_IMPLIB_1___ribbondll___importlib = \ | |||||||
| 	-Wl,--out-implib=$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) | 	-Wl,--out-implib=$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) | ||||||
| @COND_WINDOWS_IMPLIB_1@__ribbondll___importlib = $(COND_WINDOWS_IMPLIB_1___ribbondll___importlib) | @COND_WINDOWS_IMPLIB_1@__ribbondll___importlib = $(COND_WINDOWS_IMPLIB_1___ribbondll___importlib) | ||||||
| @COND_GCC_PCH_1@__ribbondll_PCH_INC = -I./.pch/wxprec_ribbondll | @COND_GCC_PCH_1@__ribbondll_PCH_INC = -I./.pch/wxprec_ribbondll | ||||||
| @COND_ICC_PCH_1@__ribbondll_PCH_INC = -use_pch \
 | @COND_ICC_PCH_1@__ribbondll_PCH_INC = $(ICC_PCH_USE_SWITCH) \
 | ||||||
| @COND_ICC_PCH_1@	./.pch/wxprec_ribbondll/wx/wxprec.h.gch | @COND_ICC_PCH_1@	./.pch/wxprec_ribbondll/wx/wxprec.h.gch | ||||||
| @COND_USE_PCH_1@_____pch_wxprec_ribbondll_wx_wxprec_h_gch___depname \ | @COND_USE_PCH_1@_____pch_wxprec_ribbondll_wx_wxprec_h_gch___depname \ | ||||||
| @COND_USE_PCH_1@	= ./.pch/wxprec_ribbondll/wx/wxprec.h.gch | @COND_USE_PCH_1@	= ./.pch/wxprec_ribbondll/wx/wxprec.h.gch | ||||||
| @@ -11544,7 +11544,7 @@ COND_MONOLITHIC_0_SHARED_0_USE_RIBBON_1___ribbonlib___depname = \ | |||||||
| @COND_MONOLITHIC_0_SHARED_0_USE_RIBBON_1@__uninstall_ribbonlib___depname \ | @COND_MONOLITHIC_0_SHARED_0_USE_RIBBON_1@__uninstall_ribbonlib___depname \ | ||||||
| @COND_MONOLITHIC_0_SHARED_0_USE_RIBBON_1@	= uninstall_ribbonlib | @COND_MONOLITHIC_0_SHARED_0_USE_RIBBON_1@	= uninstall_ribbonlib | ||||||
| @COND_GCC_PCH_1@__ribbonlib_PCH_INC = -I./.pch/wxprec_ribbonlib | @COND_GCC_PCH_1@__ribbonlib_PCH_INC = -I./.pch/wxprec_ribbonlib | ||||||
| @COND_ICC_PCH_1@__ribbonlib_PCH_INC = -use_pch \
 | @COND_ICC_PCH_1@__ribbonlib_PCH_INC = $(ICC_PCH_USE_SWITCH) \
 | ||||||
| @COND_ICC_PCH_1@	./.pch/wxprec_ribbonlib/wx/wxprec.h.gch | @COND_ICC_PCH_1@	./.pch/wxprec_ribbonlib/wx/wxprec.h.gch | ||||||
| @COND_USE_PCH_1@_____pch_wxprec_ribbonlib_wx_wxprec_h_gch___depname \ | @COND_USE_PCH_1@_____pch_wxprec_ribbonlib_wx_wxprec_h_gch___depname \ | ||||||
| @COND_USE_PCH_1@	= ./.pch/wxprec_ribbonlib/wx/wxprec.h.gch | @COND_USE_PCH_1@	= ./.pch/wxprec_ribbonlib/wx/wxprec.h.gch | ||||||
| @@ -12601,11 +12601,11 @@ COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1___htmldll_library_link_LIBR_0 \ | |||||||
| 	= \
 | 	= \
 | ||||||
| 	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX) | 	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX) | ||||||
| @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@__htmldll_library_link_LIBR_0 = $(COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1___htmldll_library_link_LIBR_0) | @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@__htmldll_library_link_LIBR_0 = $(COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1___htmldll_library_link_LIBR_0) | ||||||
| @COND_WXUNIV_1@__WXUNIV_DEFINE_p_58 = --define __WXUNIVERSAL__ | @COND_WXUNIV_1@__WXUNIV_DEFINE_p_62 = --define __WXUNIVERSAL__ | ||||||
| @COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_57 = --define wxDEBUG_LEVEL=0 | @COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_61 = --define wxDEBUG_LEVEL=0 | ||||||
| @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_57 = --define wxNO_EXCEPTIONS | @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_61 = --define wxNO_EXCEPTIONS | ||||||
| @COND_USE_RTTI_0@__RTTI_DEFINE_p_57 = --define wxNO_RTTI | @COND_USE_RTTI_0@__RTTI_DEFINE_p_61 = --define wxNO_RTTI | ||||||
| @COND_USE_THREADS_0@__THREAD_DEFINE_p_57 = --define wxNO_THREADS | @COND_USE_THREADS_0@__THREAD_DEFINE_p_61 = --define wxNO_THREADS | ||||||
| @COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@dll___targetsuf2 = .$(SO_SUFFIX).1 | @COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@dll___targetsuf2 = .$(SO_SUFFIX).1 | ||||||
| @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@dll___targetsuf2 = .1.$(SO_SUFFIX) | @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@dll___targetsuf2 = .1.$(SO_SUFFIX) | ||||||
| @COND_USE_SOVERSION_0@dll___targetsuf2 = .$(SO_SUFFIX) | @COND_USE_SOVERSION_0@dll___targetsuf2 = .$(SO_SUFFIX) | ||||||
| @@ -18938,7 +18938,7 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) | |||||||
| @COND_PLATFORM_MACOSX_1_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/html/chm.cpp | @COND_PLATFORM_MACOSX_1_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/html/chm.cpp | ||||||
| 
 | 
 | ||||||
| monodll_version_rc.o: $(srcdir)/src/msw/version.rc $(MONODLL_ODEP) | monodll_version_rc.o: $(srcdir)/src/msw/version.rc $(MONODLL_ODEP) | ||||||
| 	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__DEBUG_DEFINE_p_57) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57)   --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_58) $(__INC_TIFF_p_58) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define wxUSE_BASE=1 --define WXMAKINGDLL --include-dir $(top_srcdir)/src/stc/scintilla/include --include-dir $(top_srcdir)/src/stc/scintilla/src --define __WX__ --define SCI_LEXER --define LINK_LEXERS | 	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61)   --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_62) $(__INC_TIFF_p_62) $(__INC_JPEG_p_62) $(__INC_PNG_p_61) $(__INC_ZLIB_p_63) $(__INC_REGEX_p_61) $(__INC_EXPAT_p_61) --define wxUSE_BASE=1 --define WXMAKINGDLL --include-dir $(top_srcdir)/src/stc/scintilla/include --include-dir $(top_srcdir)/src/stc/scintilla/src --define __WX__ --define SCI_LEXER --define LINK_LEXERS | ||||||
| 
 | 
 | ||||||
| monolib_appbase.o: $(srcdir)/src/common/appbase.cpp $(MONOLIB_ODEP) | monolib_appbase.o: $(srcdir)/src/common/appbase.cpp $(MONOLIB_ODEP) | ||||||
| 	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/appbase.cpp | 	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/appbase.cpp | ||||||
| @@ -23675,7 +23675,7 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) | |||||||
| @COND_PLATFORM_MACOSX_1_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/html/chm.cpp | @COND_PLATFORM_MACOSX_1_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/html/chm.cpp | ||||||
| 
 | 
 | ||||||
| basedll_version_rc.o: $(srcdir)/src/msw/version.rc $(BASEDLL_ODEP) | basedll_version_rc.o: $(srcdir)/src/msw/version.rc $(BASEDLL_ODEP) | ||||||
| 	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__DEBUG_DEFINE_p_57) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57)   --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_58) $(__INC_TIFF_p_58) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define wxUSE_GUI=0 --define WXMAKINGDLL_BASE --define wxUSE_BASE=1 | 	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61)   --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_62) $(__INC_TIFF_p_62) $(__INC_JPEG_p_62) $(__INC_PNG_p_61) $(__INC_ZLIB_p_63) $(__INC_REGEX_p_61) $(__INC_EXPAT_p_61) --define wxUSE_GUI=0 --define WXMAKINGDLL_BASE --define wxUSE_BASE=1 | ||||||
| 
 | 
 | ||||||
| basedll_appbase.o: $(srcdir)/src/common/appbase.cpp $(BASEDLL_ODEP) | basedll_appbase.o: $(srcdir)/src/common/appbase.cpp $(BASEDLL_ODEP) | ||||||
| 	$(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/appbase.cpp | 	$(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/appbase.cpp | ||||||
| @@ -24620,7 +24620,7 @@ baselib_cocoa_utils.o: $(srcdir)/src/osx/cocoa/utils.mm $(BASELIB_ODEP) | |||||||
| @COND_PLATFORM_MACOSX_1@	$(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/unix/utilsunx.cpp | @COND_PLATFORM_MACOSX_1@	$(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/unix/utilsunx.cpp | ||||||
| 
 | 
 | ||||||
| netdll_version_rc.o: $(srcdir)/src/msw/version.rc $(NETDLL_ODEP) | netdll_version_rc.o: $(srcdir)/src/msw/version.rc $(NETDLL_ODEP) | ||||||
| 	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__DEBUG_DEFINE_p_57) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57)   --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_58) $(__INC_TIFF_p_58) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define wxUSE_GUI=0 --define WXUSINGDLL --define WXMAKINGDLL_NET | 	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61)   --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_62) $(__INC_TIFF_p_62) $(__INC_JPEG_p_62) $(__INC_PNG_p_61) $(__INC_ZLIB_p_63) $(__INC_REGEX_p_61) $(__INC_EXPAT_p_61) --define wxUSE_GUI=0 --define WXUSINGDLL --define WXMAKINGDLL_NET | ||||||
| 
 | 
 | ||||||
| netdll_fs_inet.o: $(srcdir)/src/common/fs_inet.cpp $(NETDLL_ODEP) | netdll_fs_inet.o: $(srcdir)/src/common/fs_inet.cpp $(NETDLL_ODEP) | ||||||
| 	$(CXXC) -c -o $@ $(NETDLL_CXXFLAGS) $(srcdir)/src/common/fs_inet.cpp | 	$(CXXC) -c -o $@ $(NETDLL_CXXFLAGS) $(srcdir)/src/common/fs_inet.cpp | ||||||
| @@ -24737,7 +24737,7 @@ netlib_sockosx.o: $(srcdir)/src/osx/core/sockosx.cpp $(NETLIB_ODEP) | |||||||
| @COND_PLATFORM_OS2_1@	$(CXXC) -c -o $@ $(NETLIB_CXXFLAGS) $(srcdir)/src/unix/sockunix.cpp | @COND_PLATFORM_OS2_1@	$(CXXC) -c -o $@ $(NETLIB_CXXFLAGS) $(srcdir)/src/unix/sockunix.cpp | ||||||
| 
 | 
 | ||||||
| coredll_version_rc.o: $(srcdir)/src/msw/version.rc $(COREDLL_ODEP) | coredll_version_rc.o: $(srcdir)/src/msw/version.rc $(COREDLL_ODEP) | ||||||
| 	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__DEBUG_DEFINE_p_57) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57)   --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_58) $(__INC_TIFF_p_58) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define WXUSINGDLL --define WXMAKINGDLL_CORE --define wxUSE_BASE=0 | 	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61)   --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_62) $(__INC_TIFF_p_62) $(__INC_JPEG_p_62) $(__INC_PNG_p_61) $(__INC_ZLIB_p_63) $(__INC_REGEX_p_61) $(__INC_EXPAT_p_61) --define WXUSINGDLL --define WXMAKINGDLL_CORE --define wxUSE_BASE=0 | ||||||
| 
 | 
 | ||||||
| coredll_event.o: $(srcdir)/src/common/event.cpp $(COREDLL_ODEP) | coredll_event.o: $(srcdir)/src/common/event.cpp $(COREDLL_ODEP) | ||||||
| 	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/event.cpp | 	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/event.cpp | ||||||
| @@ -31796,7 +31796,7 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP) | |||||||
| @COND_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/vscroll.cpp | @COND_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/vscroll.cpp | ||||||
| 
 | 
 | ||||||
| advdll_version_rc.o: $(srcdir)/src/msw/version.rc $(ADVDLL_ODEP) | advdll_version_rc.o: $(srcdir)/src/msw/version.rc $(ADVDLL_ODEP) | ||||||
| 	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__DEBUG_DEFINE_p_57) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57)   --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_58) $(__INC_TIFF_p_58) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define WXUSINGDLL --define WXMAKINGDLL_ADV | 	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61)   --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_62) $(__INC_TIFF_p_62) $(__INC_JPEG_p_62) $(__INC_PNG_p_61) $(__INC_ZLIB_p_63) $(__INC_REGEX_p_61) $(__INC_EXPAT_p_61) --define WXUSINGDLL --define WXMAKINGDLL_ADV | ||||||
| 
 | 
 | ||||||
| advdll_gtk_aboutdlg.o: $(srcdir)/src/gtk/aboutdlg.cpp $(ADVDLL_ODEP) | advdll_gtk_aboutdlg.o: $(srcdir)/src/gtk/aboutdlg.cpp $(ADVDLL_ODEP) | ||||||
| 	$(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/gtk/aboutdlg.cpp | 	$(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/gtk/aboutdlg.cpp | ||||||
| @@ -32447,7 +32447,7 @@ advlib_wizard.o: $(srcdir)/src/generic/wizard.cpp $(ADVLIB_ODEP) | |||||||
| @COND_TOOLKIT_WINCE_WXUNIV_0@	$(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/msw/datectrl.cpp | @COND_TOOLKIT_WINCE_WXUNIV_0@	$(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/msw/datectrl.cpp | ||||||
| 
 | 
 | ||||||
| mediadll_version_rc.o: $(srcdir)/src/msw/version.rc $(MEDIADLL_ODEP) | mediadll_version_rc.o: $(srcdir)/src/msw/version.rc $(MEDIADLL_ODEP) | ||||||
| 	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__DEBUG_DEFINE_p_57) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57)   --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_58) $(__INC_TIFF_p_58) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define WXUSINGDLL --define WXMAKINGDLL_MEDIA | 	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61)   --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_62) $(__INC_TIFF_p_62) $(__INC_JPEG_p_62) $(__INC_PNG_p_61) $(__INC_ZLIB_p_63) $(__INC_REGEX_p_61) $(__INC_EXPAT_p_61) --define WXUSINGDLL --define WXMAKINGDLL_MEDIA | ||||||
| 
 | 
 | ||||||
| mediadll_mediactrlcmn.o: $(srcdir)/src/common/mediactrlcmn.cpp $(MEDIADLL_ODEP) | mediadll_mediactrlcmn.o: $(srcdir)/src/common/mediactrlcmn.cpp $(MEDIADLL_ODEP) | ||||||
| 	$(CXXC) -c -o $@ $(MEDIADLL_CXXFLAGS) $(srcdir)/src/common/mediactrlcmn.cpp | 	$(CXXC) -c -o $@ $(MEDIADLL_CXXFLAGS) $(srcdir)/src/common/mediactrlcmn.cpp | ||||||
| @@ -32522,7 +32522,7 @@ medialib_cocoa_mediactrl.o: $(srcdir)/src/cocoa/mediactrl.mm $(MEDIALIB_ODEP) | |||||||
| @COND_TOOLKIT_X11@	$(CXXC) -c -o $@ $(MEDIALIB_CXXFLAGS) $(srcdir)/src/unix/mediactrl.cpp | @COND_TOOLKIT_X11@	$(CXXC) -c -o $@ $(MEDIALIB_CXXFLAGS) $(srcdir)/src/unix/mediactrl.cpp | ||||||
| 
 | 
 | ||||||
| htmldll_version_rc.o: $(srcdir)/src/msw/version.rc $(HTMLDLL_ODEP) | htmldll_version_rc.o: $(srcdir)/src/msw/version.rc $(HTMLDLL_ODEP) | ||||||
| 	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__DEBUG_DEFINE_p_57) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57)   --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_58) $(__INC_TIFF_p_58) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define WXUSINGDLL --define WXMAKINGDLL_HTML | 	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61)   --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_62) $(__INC_TIFF_p_62) $(__INC_JPEG_p_62) $(__INC_PNG_p_61) $(__INC_ZLIB_p_63) $(__INC_REGEX_p_61) $(__INC_EXPAT_p_61) --define WXUSINGDLL --define WXMAKINGDLL_HTML | ||||||
| 
 | 
 | ||||||
| htmldll_helpbest.o: $(srcdir)/src/msw/helpbest.cpp $(HTMLDLL_ODEP) | htmldll_helpbest.o: $(srcdir)/src/msw/helpbest.cpp $(HTMLDLL_ODEP) | ||||||
| 	$(CXXC) -c -o $@ $(HTMLDLL_CXXFLAGS) $(srcdir)/src/msw/helpbest.cpp | 	$(CXXC) -c -o $@ $(HTMLDLL_CXXFLAGS) $(srcdir)/src/msw/helpbest.cpp | ||||||
| @@ -32681,7 +32681,7 @@ htmllib_htmllbox.o: $(srcdir)/src/generic/htmllbox.cpp $(HTMLLIB_ODEP) | |||||||
| @COND_PLATFORM_MACOSX_1@	$(CXXC) -c -o $@ $(HTMLLIB_CXXFLAGS) $(srcdir)/src/html/chm.cpp | @COND_PLATFORM_MACOSX_1@	$(CXXC) -c -o $@ $(HTMLLIB_CXXFLAGS) $(srcdir)/src/html/chm.cpp | ||||||
| 
 | 
 | ||||||
| qadll_version_rc.o: $(srcdir)/src/msw/version.rc $(QADLL_ODEP) | qadll_version_rc.o: $(srcdir)/src/msw/version.rc $(QADLL_ODEP) | ||||||
| 	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__DEBUG_DEFINE_p_57) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57)   --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_58) $(__INC_TIFF_p_58) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define WXUSINGDLL --define WXMAKINGDLL_QA | 	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61)   --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_62) $(__INC_TIFF_p_62) $(__INC_JPEG_p_62) $(__INC_PNG_p_61) $(__INC_ZLIB_p_63) $(__INC_REGEX_p_61) $(__INC_EXPAT_p_61) --define WXUSINGDLL --define WXMAKINGDLL_QA | ||||||
| 
 | 
 | ||||||
| qadll_debugrpt.o: $(srcdir)/src/common/debugrpt.cpp $(QADLL_ODEP) | qadll_debugrpt.o: $(srcdir)/src/common/debugrpt.cpp $(QADLL_ODEP) | ||||||
| 	$(CXXC) -c -o $@ $(QADLL_CXXFLAGS) $(srcdir)/src/common/debugrpt.cpp | 	$(CXXC) -c -o $@ $(QADLL_CXXFLAGS) $(srcdir)/src/common/debugrpt.cpp | ||||||
| @@ -32696,7 +32696,7 @@ qalib_dbgrptg.o: $(srcdir)/src/generic/dbgrptg.cpp $(QALIB_ODEP) | |||||||
| 	$(CXXC) -c -o $@ $(QALIB_CXXFLAGS) $(srcdir)/src/generic/dbgrptg.cpp | 	$(CXXC) -c -o $@ $(QALIB_CXXFLAGS) $(srcdir)/src/generic/dbgrptg.cpp | ||||||
| 
 | 
 | ||||||
| xmldll_version_rc.o: $(srcdir)/src/msw/version.rc $(XMLDLL_ODEP) | xmldll_version_rc.o: $(srcdir)/src/msw/version.rc $(XMLDLL_ODEP) | ||||||
| 	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__DEBUG_DEFINE_p_57) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57)   --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_58) $(__INC_TIFF_p_58) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define wxUSE_GUI=0 --define WXUSINGDLL --define WXMAKINGDLL_XML | 	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61)   --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_62) $(__INC_TIFF_p_62) $(__INC_JPEG_p_62) $(__INC_PNG_p_61) $(__INC_ZLIB_p_63) $(__INC_REGEX_p_61) $(__INC_EXPAT_p_61) --define wxUSE_GUI=0 --define WXUSINGDLL --define WXMAKINGDLL_XML | ||||||
| 
 | 
 | ||||||
| xmldll_xml.o: $(srcdir)/src/xml/xml.cpp $(XMLDLL_ODEP) | xmldll_xml.o: $(srcdir)/src/xml/xml.cpp $(XMLDLL_ODEP) | ||||||
| 	$(CXXC) -c -o $@ $(XMLDLL_CXXFLAGS) $(srcdir)/src/xml/xml.cpp | 	$(CXXC) -c -o $@ $(XMLDLL_CXXFLAGS) $(srcdir)/src/xml/xml.cpp | ||||||
| @@ -32711,7 +32711,7 @@ xmllib_xtixml.o: $(srcdir)/src/common/xtixml.cpp $(XMLLIB_ODEP) | |||||||
| 	$(CXXC) -c -o $@ $(XMLLIB_CXXFLAGS) $(srcdir)/src/common/xtixml.cpp | 	$(CXXC) -c -o $@ $(XMLLIB_CXXFLAGS) $(srcdir)/src/common/xtixml.cpp | ||||||
| 
 | 
 | ||||||
| xrcdll_version_rc.o: $(srcdir)/src/msw/version.rc $(XRCDLL_ODEP) | xrcdll_version_rc.o: $(srcdir)/src/msw/version.rc $(XRCDLL_ODEP) | ||||||
| 	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__DEBUG_DEFINE_p_57) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57)   --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_58) $(__INC_TIFF_p_58) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define WXUSINGDLL --define WXMAKINGDLL_XRC | 	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61)   --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_62) $(__INC_TIFF_p_62) $(__INC_JPEG_p_62) $(__INC_PNG_p_61) $(__INC_ZLIB_p_63) $(__INC_REGEX_p_61) $(__INC_EXPAT_p_61) --define WXUSINGDLL --define WXMAKINGDLL_XRC | ||||||
| 
 | 
 | ||||||
| xrcdll_xh_animatctrl.o: $(srcdir)/src/xrc/xh_animatctrl.cpp $(XRCDLL_ODEP) | xrcdll_xh_animatctrl.o: $(srcdir)/src/xrc/xh_animatctrl.cpp $(XRCDLL_ODEP) | ||||||
| 	$(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $(srcdir)/src/xrc/xh_animatctrl.cpp | 	$(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $(srcdir)/src/xrc/xh_animatctrl.cpp | ||||||
| @@ -33080,7 +33080,7 @@ xrclib_xmlrsall.o: $(srcdir)/src/xrc/xmlrsall.cpp $(XRCLIB_ODEP) | |||||||
| 	$(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $(srcdir)/src/xrc/xmlrsall.cpp | 	$(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $(srcdir)/src/xrc/xmlrsall.cpp | ||||||
| 
 | 
 | ||||||
| auidll_version_rc.o: $(srcdir)/src/msw/version.rc $(AUIDLL_ODEP) | auidll_version_rc.o: $(srcdir)/src/msw/version.rc $(AUIDLL_ODEP) | ||||||
| 	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__DEBUG_DEFINE_p_57) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57)   --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_58) $(__INC_TIFF_p_58) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define WXUSINGDLL --define WXMAKINGDLL_AUI | 	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61)   --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_62) $(__INC_TIFF_p_62) $(__INC_JPEG_p_62) $(__INC_PNG_p_61) $(__INC_ZLIB_p_63) $(__INC_REGEX_p_61) $(__INC_EXPAT_p_61) --define WXUSINGDLL --define WXMAKINGDLL_AUI | ||||||
| 
 | 
 | ||||||
| auidll_framemanager.o: $(srcdir)/src/aui/framemanager.cpp $(AUIDLL_ODEP) | auidll_framemanager.o: $(srcdir)/src/aui/framemanager.cpp $(AUIDLL_ODEP) | ||||||
| 	$(CXXC) -c -o $@ $(AUIDLL_CXXFLAGS) $(srcdir)/src/aui/framemanager.cpp | 	$(CXXC) -c -o $@ $(AUIDLL_CXXFLAGS) $(srcdir)/src/aui/framemanager.cpp | ||||||
| @@ -33119,7 +33119,7 @@ auilib_tabmdi.o: $(srcdir)/src/aui/tabmdi.cpp $(AUILIB_ODEP) | |||||||
| 	$(CXXC) -c -o $@ $(AUILIB_CXXFLAGS) $(srcdir)/src/aui/tabmdi.cpp | 	$(CXXC) -c -o $@ $(AUILIB_CXXFLAGS) $(srcdir)/src/aui/tabmdi.cpp | ||||||
| 
 | 
 | ||||||
| ribbondll_version_rc.o: $(srcdir)/src/msw/version.rc $(RIBBONDLL_ODEP) | ribbondll_version_rc.o: $(srcdir)/src/msw/version.rc $(RIBBONDLL_ODEP) | ||||||
| 	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_62)  $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61)   --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_62) $(__INC_TIFF_p_62) $(__INC_JPEG_p_62) $(__INC_PNG_p_61) $(__INC_ZLIB_p_63) $(__INC_REGEX_p_61) $(__INC_EXPAT_p_61) --define WXUSINGDLL --define WXMAKINGDLL_RIBBON | 	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61)   --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_62) $(__INC_TIFF_p_62) $(__INC_JPEG_p_62) $(__INC_PNG_p_61) $(__INC_ZLIB_p_63) $(__INC_REGEX_p_61) $(__INC_EXPAT_p_61) --define WXUSINGDLL --define WXMAKINGDLL_RIBBON | ||||||
| 
 | 
 | ||||||
| ribbondll_art_internal.o: $(srcdir)/src/ribbon/art_internal.cpp $(RIBBONDLL_ODEP) | ribbondll_art_internal.o: $(srcdir)/src/ribbon/art_internal.cpp $(RIBBONDLL_ODEP) | ||||||
| 	$(CXXC) -c -o $@ $(RIBBONDLL_CXXFLAGS) $(srcdir)/src/ribbon/art_internal.cpp | 	$(CXXC) -c -o $@ $(RIBBONDLL_CXXFLAGS) $(srcdir)/src/ribbon/art_internal.cpp | ||||||
| @@ -33182,7 +33182,7 @@ ribbonlib_toolbar.o: $(srcdir)/src/ribbon/toolbar.cpp $(RIBBONLIB_ODEP) | |||||||
| 	$(CXXC) -c -o $@ $(RIBBONLIB_CXXFLAGS) $(srcdir)/src/ribbon/toolbar.cpp | 	$(CXXC) -c -o $@ $(RIBBONLIB_CXXFLAGS) $(srcdir)/src/ribbon/toolbar.cpp | ||||||
| 
 | 
 | ||||||
| propgriddll_version_rc.o: $(srcdir)/src/msw/version.rc $(PROPGRIDDLL_ODEP) | propgriddll_version_rc.o: $(srcdir)/src/msw/version.rc $(PROPGRIDDLL_ODEP) | ||||||
| 	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__DEBUG_DEFINE_p_57) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57)   --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_58) $(__INC_TIFF_p_58) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define WXUSINGDLL --define WXMAKINGDLL_PROPGRID | 	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61)   --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_62) $(__INC_TIFF_p_62) $(__INC_JPEG_p_62) $(__INC_PNG_p_61) $(__INC_ZLIB_p_63) $(__INC_REGEX_p_61) $(__INC_EXPAT_p_61) --define WXUSINGDLL --define WXMAKINGDLL_PROPGRID | ||||||
| 
 | 
 | ||||||
| propgriddll_advprops.o: $(srcdir)/src/propgrid/advprops.cpp $(PROPGRIDDLL_ODEP) | propgriddll_advprops.o: $(srcdir)/src/propgrid/advprops.cpp $(PROPGRIDDLL_ODEP) | ||||||
| 	$(CXXC) -c -o $@ $(PROPGRIDDLL_CXXFLAGS) $(srcdir)/src/propgrid/advprops.cpp | 	$(CXXC) -c -o $@ $(PROPGRIDDLL_CXXFLAGS) $(srcdir)/src/propgrid/advprops.cpp | ||||||
| @@ -33233,7 +33233,7 @@ propgridlib_props.o: $(srcdir)/src/propgrid/props.cpp $(PROPGRIDLIB_ODEP) | |||||||
| 	$(CXXC) -c -o $@ $(PROPGRIDLIB_CXXFLAGS) $(srcdir)/src/propgrid/props.cpp | 	$(CXXC) -c -o $@ $(PROPGRIDLIB_CXXFLAGS) $(srcdir)/src/propgrid/props.cpp | ||||||
| 
 | 
 | ||||||
| richtextdll_version_rc.o: $(srcdir)/src/msw/version.rc $(RICHTEXTDLL_ODEP) | richtextdll_version_rc.o: $(srcdir)/src/msw/version.rc $(RICHTEXTDLL_ODEP) | ||||||
| 	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__DEBUG_DEFINE_p_57) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57)   --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_58) $(__INC_TIFF_p_58) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define WXUSINGDLL --define WXMAKINGDLL_RICHTEXT | 	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61)   --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_62) $(__INC_TIFF_p_62) $(__INC_JPEG_p_62) $(__INC_PNG_p_61) $(__INC_ZLIB_p_63) $(__INC_REGEX_p_61) $(__INC_EXPAT_p_61) --define WXUSINGDLL --define WXMAKINGDLL_RICHTEXT | ||||||
| 
 | 
 | ||||||
| richtextdll_richtextctrl.o: $(srcdir)/src/richtext/richtextctrl.cpp $(RICHTEXTDLL_ODEP) | richtextdll_richtextctrl.o: $(srcdir)/src/richtext/richtextctrl.cpp $(RICHTEXTDLL_ODEP) | ||||||
| 	$(CXXC) -c -o $@ $(RICHTEXTDLL_CXXFLAGS) $(srcdir)/src/richtext/richtextctrl.cpp | 	$(CXXC) -c -o $@ $(RICHTEXTDLL_CXXFLAGS) $(srcdir)/src/richtext/richtextctrl.cpp | ||||||
| @@ -33290,7 +33290,7 @@ richtextlib_richtextprint.o: $(srcdir)/src/richtext/richtextprint.cpp $(RICHTEXT | |||||||
| 	$(CXXC) -c -o $@ $(RICHTEXTLIB_CXXFLAGS) $(srcdir)/src/richtext/richtextprint.cpp | 	$(CXXC) -c -o $@ $(RICHTEXTLIB_CXXFLAGS) $(srcdir)/src/richtext/richtextprint.cpp | ||||||
| 
 | 
 | ||||||
| stcdll_version_rc.o: $(srcdir)/src/msw/version.rc $(STCDLL_ODEP) | stcdll_version_rc.o: $(srcdir)/src/msw/version.rc $(STCDLL_ODEP) | ||||||
| 	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__DEBUG_DEFINE_p_57) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57)   --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_58) $(__INC_TIFF_p_58) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --include-dir $(top_srcdir)/src/stc/scintilla/include --include-dir $(top_srcdir)/src/stc/scintilla/src --define __WX__ --define SCI_LEXER --define LINK_LEXERS --define WXUSINGDLL --define WXMAKINGDLL_STC | 	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61)   --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_62) $(__INC_TIFF_p_62) $(__INC_JPEG_p_62) $(__INC_PNG_p_61) $(__INC_ZLIB_p_63) $(__INC_REGEX_p_61) $(__INC_EXPAT_p_61) --include-dir $(top_srcdir)/src/stc/scintilla/include --include-dir $(top_srcdir)/src/stc/scintilla/src --define __WX__ --define SCI_LEXER --define LINK_LEXERS --define WXUSINGDLL --define WXMAKINGDLL_STC | ||||||
| 
 | 
 | ||||||
| stcdll_stc.o: $(srcdir)/src/stc/stc.cpp $(STCDLL_ODEP) | stcdll_stc.o: $(srcdir)/src/stc/stc.cpp $(STCDLL_ODEP) | ||||||
| 	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/src/stc/stc.cpp | 	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/src/stc/stc.cpp | ||||||
| @@ -33311,7 +33311,7 @@ stclib_ScintillaWX.o: $(srcdir)/src/stc/ScintillaWX.cpp $(STCLIB_ODEP) | |||||||
| 	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/src/stc/ScintillaWX.cpp | 	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/src/stc/ScintillaWX.cpp | ||||||
| 
 | 
 | ||||||
| gldll_version_rc.o: $(srcdir)/src/msw/version.rc $(GLDLL_ODEP) | gldll_version_rc.o: $(srcdir)/src/msw/version.rc $(GLDLL_ODEP) | ||||||
| 	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__DEBUG_DEFINE_p_57) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57)   --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_58) $(__INC_TIFF_p_58) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define WXUSINGDLL --define WXMAKINGDLL_GL | 	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61)   --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_62) $(__INC_TIFF_p_62) $(__INC_JPEG_p_62) $(__INC_PNG_p_61) $(__INC_ZLIB_p_63) $(__INC_REGEX_p_61) $(__INC_EXPAT_p_61) --define WXUSINGDLL --define WXMAKINGDLL_GL | ||||||
| 
 | 
 | ||||||
| gldll_glcmn.o: $(srcdir)/src/common/glcmn.cpp $(GLDLL_ODEP) | gldll_glcmn.o: $(srcdir)/src/common/glcmn.cpp $(GLDLL_ODEP) | ||||||
| 	$(CXXC) -c -o $@ $(GLDLL_CXXFLAGS) $(srcdir)/src/common/glcmn.cpp | 	$(CXXC) -c -o $@ $(GLDLL_CXXFLAGS) $(srcdir)/src/common/glcmn.cpp | ||||||
|   | |||||||
| @@ -68,7 +68,7 @@ dnl ### begin block 20_COND_BUILD_debug[../../demos/bombs/bombs.bkl,../../demos/ | |||||||
|         COND_BUILD_debug="" |         COND_BUILD_debug="" | ||||||
|     fi |     fi | ||||||
|     AC_SUBST(COND_BUILD_debug) |     AC_SUBST(COND_BUILD_debug) | ||||||
| dnl ### begin block 20_COND_BUILD_debug_DEBUG_FLAG_default[../../samples/editlbox/editlbox.bkl,../../samples/flash/flash.bkl,../../samples/mfc/mfc.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/scrollsub/scrollsub.bkl,../../utils/execmon/execmon.bkl] ### | dnl ### begin block 20_COND_BUILD_debug_DEBUG_FLAG_default[../../samples/editlbox/editlbox.bkl,../../samples/flash/flash.bkl,../../samples/mfc/mfc.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/scrollsub/scrollsub.bkl] ### | ||||||
|     COND_BUILD_debug_DEBUG_FLAG_default="#" |     COND_BUILD_debug_DEBUG_FLAG_default="#" | ||||||
|     if test "x$BUILD" = "xdebug" -a "x$DEBUG_FLAG" = "xdefault" ; then |     if test "x$BUILD" = "xdebug" -a "x$DEBUG_FLAG" = "xdefault" ; then | ||||||
|         COND_BUILD_debug_DEBUG_FLAG_default="" |         COND_BUILD_debug_DEBUG_FLAG_default="" | ||||||
| @@ -80,13 +80,13 @@ dnl ### begin block 20_COND_BUILD_debug_DEBUG_INFO_default[../../demos/bombs/bom | |||||||
|         COND_BUILD_debug_DEBUG_INFO_default="" |         COND_BUILD_debug_DEBUG_INFO_default="" | ||||||
|     fi |     fi | ||||||
|     AC_SUBST(COND_BUILD_debug_DEBUG_INFO_default) |     AC_SUBST(COND_BUILD_debug_DEBUG_INFO_default) | ||||||
| dnl ### begin block 20_COND_BUILD_debug_UNICODE_0[../../samples/editlbox/editlbox.bkl,../../samples/flash/flash.bkl,../../samples/mfc/mfc.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/scrollsub/scrollsub.bkl,../../utils/execmon/execmon.bkl] ### | dnl ### begin block 20_COND_BUILD_debug_UNICODE_0[../../samples/editlbox/editlbox.bkl,../../samples/flash/flash.bkl,../../samples/mfc/mfc.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/scrollsub/scrollsub.bkl] ### | ||||||
|     COND_BUILD_debug_UNICODE_0="#" |     COND_BUILD_debug_UNICODE_0="#" | ||||||
|     if test "x$BUILD" = "xdebug" -a "x$UNICODE" = "x0" ; then |     if test "x$BUILD" = "xdebug" -a "x$UNICODE" = "x0" ; then | ||||||
|         COND_BUILD_debug_UNICODE_0="" |         COND_BUILD_debug_UNICODE_0="" | ||||||
|     fi |     fi | ||||||
|     AC_SUBST(COND_BUILD_debug_UNICODE_0) |     AC_SUBST(COND_BUILD_debug_UNICODE_0) | ||||||
| dnl ### begin block 20_COND_BUILD_debug_UNICODE_1[../../samples/editlbox/editlbox.bkl,../../samples/flash/flash.bkl,../../samples/mfc/mfc.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/scrollsub/scrollsub.bkl,../../utils/execmon/execmon.bkl] ### | dnl ### begin block 20_COND_BUILD_debug_UNICODE_1[../../samples/editlbox/editlbox.bkl,../../samples/flash/flash.bkl,../../samples/mfc/mfc.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/scrollsub/scrollsub.bkl] ### | ||||||
|     COND_BUILD_debug_UNICODE_1="#" |     COND_BUILD_debug_UNICODE_1="#" | ||||||
|     if test "x$BUILD" = "xdebug" -a "x$UNICODE" = "x1" ; then |     if test "x$BUILD" = "xdebug" -a "x$UNICODE" = "x1" ; then | ||||||
|         COND_BUILD_debug_UNICODE_1="" |         COND_BUILD_debug_UNICODE_1="" | ||||||
| @@ -104,25 +104,25 @@ dnl ### begin block 20_COND_BUILD_release_DEBUG_INFO_default[../../demos/bombs/b | |||||||
|         COND_BUILD_release_DEBUG_INFO_default="" |         COND_BUILD_release_DEBUG_INFO_default="" | ||||||
|     fi |     fi | ||||||
|     AC_SUBST(COND_BUILD_release_DEBUG_INFO_default) |     AC_SUBST(COND_BUILD_release_DEBUG_INFO_default) | ||||||
| dnl ### begin block 20_COND_BUILD_release_UNICODE_0[../../samples/editlbox/editlbox.bkl,../../samples/flash/flash.bkl,../../samples/mfc/mfc.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/scrollsub/scrollsub.bkl,../../utils/execmon/execmon.bkl] ### | dnl ### begin block 20_COND_BUILD_release_UNICODE_0[../../samples/editlbox/editlbox.bkl,../../samples/flash/flash.bkl,../../samples/mfc/mfc.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/scrollsub/scrollsub.bkl] ### | ||||||
|     COND_BUILD_release_UNICODE_0="#" |     COND_BUILD_release_UNICODE_0="#" | ||||||
|     if test "x$BUILD" = "xrelease" -a "x$UNICODE" = "x0" ; then |     if test "x$BUILD" = "xrelease" -a "x$UNICODE" = "x0" ; then | ||||||
|         COND_BUILD_release_UNICODE_0="" |         COND_BUILD_release_UNICODE_0="" | ||||||
|     fi |     fi | ||||||
|     AC_SUBST(COND_BUILD_release_UNICODE_0) |     AC_SUBST(COND_BUILD_release_UNICODE_0) | ||||||
| dnl ### begin block 20_COND_BUILD_release_UNICODE_1[../../samples/editlbox/editlbox.bkl,../../samples/flash/flash.bkl,../../samples/mfc/mfc.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/scrollsub/scrollsub.bkl,../../utils/execmon/execmon.bkl] ### | dnl ### begin block 20_COND_BUILD_release_UNICODE_1[../../samples/editlbox/editlbox.bkl,../../samples/flash/flash.bkl,../../samples/mfc/mfc.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/scrollsub/scrollsub.bkl] ### | ||||||
|     COND_BUILD_release_UNICODE_1="#" |     COND_BUILD_release_UNICODE_1="#" | ||||||
|     if test "x$BUILD" = "xrelease" -a "x$UNICODE" = "x1" ; then |     if test "x$BUILD" = "xrelease" -a "x$UNICODE" = "x1" ; then | ||||||
|         COND_BUILD_release_UNICODE_1="" |         COND_BUILD_release_UNICODE_1="" | ||||||
|     fi |     fi | ||||||
|     AC_SUBST(COND_BUILD_release_UNICODE_1) |     AC_SUBST(COND_BUILD_release_UNICODE_1) | ||||||
| dnl ### begin block 20_COND_DEBUG_FLAG_0[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ### | dnl ### begin block 20_COND_DEBUG_FLAG_0[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ### | ||||||
|     COND_DEBUG_FLAG_0="#" |     COND_DEBUG_FLAG_0="#" | ||||||
|     if test "x$DEBUG_FLAG" = "x0" ; then |     if test "x$DEBUG_FLAG" = "x0" ; then | ||||||
|         COND_DEBUG_FLAG_0="" |         COND_DEBUG_FLAG_0="" | ||||||
|     fi |     fi | ||||||
|     AC_SUBST(COND_DEBUG_FLAG_0) |     AC_SUBST(COND_DEBUG_FLAG_0) | ||||||
| dnl ### begin block 20_COND_DEBUG_FLAG_1[../../samples/docvwmdi/docvwmdi.bkl,../../samples/editlbox/editlbox.bkl,../../samples/flash/flash.bkl,../../samples/mfc/mfc.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/scrollsub/scrollsub.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/execmon/execmon.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/tex2rtf/src/tex2rtf.bkl] ### | dnl ### begin block 20_COND_DEBUG_FLAG_1[../../samples/docvwmdi/docvwmdi.bkl,../../samples/editlbox/editlbox.bkl,../../samples/flash/flash.bkl,../../samples/mfc/mfc.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/scrollsub/scrollsub.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/tex2rtf/src/tex2rtf.bkl] ### | ||||||
|     COND_DEBUG_FLAG_1="#" |     COND_DEBUG_FLAG_1="#" | ||||||
|     if test "x$DEBUG_FLAG" = "x1" ; then |     if test "x$DEBUG_FLAG" = "x1" ; then | ||||||
|         COND_DEBUG_FLAG_1="" |         COND_DEBUG_FLAG_1="" | ||||||
|   | |||||||
| @@ -4179,7 +4179,7 @@ __RUNTIME_LIBS_5 = | |||||||
| __WXUNIV_DEFINE_p_62 = -d__WXUNIVERSAL__ | __WXUNIV_DEFINE_p_62 = -d__WXUNIVERSAL__ | ||||||
| !endif | !endif | ||||||
| !if "$(DEBUG_FLAG)" == "0" | !if "$(DEBUG_FLAG)" == "0" | ||||||
| __DEBUG_DEFINE_p_57 = -dwxDEBUG_LEVEL=0 | __DEBUG_DEFINE_p_61 = -dwxDEBUG_LEVEL=0 | ||||||
| !endif | !endif | ||||||
| !if "$(USE_EXCEPTIONS)" == "0" | !if "$(USE_EXCEPTIONS)" == "0" | ||||||
| __EXCEPTIONS_DEFINE_p_61 = -dwxNO_EXCEPTIONS | __EXCEPTIONS_DEFINE_p_61 = -dwxNO_EXCEPTIONS | ||||||
|   | |||||||
| @@ -4335,7 +4335,7 @@ ifeq ($(WXUNIV),1) | |||||||
| __WXUNIV_DEFINE_p_62 = --define __WXUNIVERSAL__ | __WXUNIV_DEFINE_p_62 = --define __WXUNIVERSAL__ | ||||||
| endif | endif | ||||||
| ifeq ($(DEBUG_FLAG),0) | ifeq ($(DEBUG_FLAG),0) | ||||||
| __DEBUG_DEFINE_p_57 = --define wxDEBUG_LEVEL=0 | __DEBUG_DEFINE_p_61 = --define wxDEBUG_LEVEL=0 | ||||||
| endif | endif | ||||||
| ifeq ($(USE_EXCEPTIONS),0) | ifeq ($(USE_EXCEPTIONS),0) | ||||||
| __EXCEPTIONS_DEFINE_p_61 = --define wxNO_EXCEPTIONS | __EXCEPTIONS_DEFINE_p_61 = --define wxNO_EXCEPTIONS | ||||||
|   | |||||||
| @@ -4574,7 +4574,7 @@ __NO_VC_CRTDBG_p_68 = /d __NO_VC_CRTDBG__ | |||||||
| __WXUNIV_DEFINE_p_62 = /d __WXUNIVERSAL__ | __WXUNIV_DEFINE_p_62 = /d __WXUNIVERSAL__ | ||||||
| !endif | !endif | ||||||
| !if "$(DEBUG_FLAG)" == "0" | !if "$(DEBUG_FLAG)" == "0" | ||||||
| __DEBUG_DEFINE_p_57 = /d wxDEBUG_LEVEL=0 | __DEBUG_DEFINE_p_61 = /d wxDEBUG_LEVEL=0 | ||||||
| !endif | !endif | ||||||
| !if "$(USE_EXCEPTIONS)" == "0" | !if "$(USE_EXCEPTIONS)" == "0" | ||||||
| __EXCEPTIONS_DEFINE_p_61 = /d wxNO_EXCEPTIONS | __EXCEPTIONS_DEFINE_p_61 = /d wxNO_EXCEPTIONS | ||||||
|   | |||||||
| @@ -47,18 +47,18 @@ RSC=rc.exe | |||||||
| # PROP Output_Dir "..\..\lib\vc_dll" | # PROP Output_Dir "..\..\lib\vc_dll" | ||||||
| # PROP Intermediate_Dir "vc_mswunivudll\ribbon" | # PROP Intermediate_Dir "vc_mswunivudll\ribbon" | ||||||
| # PROP Target_Dir "" | # PROP Target_Dir "" | ||||||
| # ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_ribbondll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv290u_ribbon_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RIBBON" /c | # ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_ribbondll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv291u_ribbon_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RIBBON" /c | ||||||
| # ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_ribbondll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv290u_ribbon_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RIBBON" /c | # ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_ribbondll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv291u_ribbon_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RIBBON" /c | ||||||
| # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RIBBON" /mktyplib203 /win32 | # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RIBBON" /mktyplib203 /win32 | ||||||
| # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RIBBON" /mktyplib203 /win32 | # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RIBBON" /mktyplib203 /win32 | ||||||
| # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv290u_ribbon_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_RIBBON | # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv291u_ribbon_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_RIBBON | ||||||
| # ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv290u_ribbon_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_RIBBON | # ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv291u_ribbon_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_RIBBON | ||||||
| BSC32=bscmake.exe | BSC32=bscmake.exe | ||||||
| # ADD BASE BSC32 /nologo | # ADD BASE BSC32 /nologo | ||||||
| # ADD BSC32 /nologo | # ADD BSC32 /nologo | ||||||
| LINK32=link.exe | LINK32=link.exe | ||||||
| # ADD BASE LINK32 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 wininet.lib ..\..\lib\vc_dll\wxmswuniv29u_adv.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290u_ribbon_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_ribbon.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv290u_ribbon_vc_custom.pdb" | # ADD BASE LINK32 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 wininet.lib ..\..\lib\vc_dll\wxmswuniv29u_adv.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv291u_ribbon_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_ribbon.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv291u_ribbon_vc_custom.pdb" | ||||||
| # ADD LINK32 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 wininet.lib ..\..\lib\vc_dll\wxmswuniv29u_adv.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290u_ribbon_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_ribbon.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv290u_ribbon_vc_custom.pdb" | # ADD LINK32 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 wininet.lib ..\..\lib\vc_dll\wxmswuniv29u_adv.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv291u_ribbon_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_ribbon.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv291u_ribbon_vc_custom.pdb" | ||||||
|  |  | ||||||
| !ELSEIF  "$(CFG)" == "ribbon - Win32 DLL Universal Debug" | !ELSEIF  "$(CFG)" == "ribbon - Win32 DLL Universal Debug" | ||||||
|  |  | ||||||
| @@ -72,18 +72,18 @@ LINK32=link.exe | |||||||
| # PROP Output_Dir "..\..\lib\vc_dll" | # PROP Output_Dir "..\..\lib\vc_dll" | ||||||
| # PROP Intermediate_Dir "vc_mswunivuddll\ribbon" | # PROP Intermediate_Dir "vc_mswunivuddll\ribbon" | ||||||
| # PROP Target_Dir "" | # PROP Target_Dir "" | ||||||
| # ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_ribbondll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv290ud_ribbon_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RIBBON" /c | # ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_ribbondll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv291ud_ribbon_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RIBBON" /c | ||||||
| # ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_ribbondll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv290ud_ribbon_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RIBBON" /c | # ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_ribbondll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv291ud_ribbon_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RIBBON" /c | ||||||
| # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RIBBON" /mktyplib203 /win32 | # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RIBBON" /mktyplib203 /win32 | ||||||
| # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RIBBON" /mktyplib203 /win32 | # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RIBBON" /mktyplib203 /win32 | ||||||
| # ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv290ud_ribbon_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_RIBBON | # ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv291ud_ribbon_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_RIBBON | ||||||
| # ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv290ud_ribbon_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_RIBBON | # ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv291ud_ribbon_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_RIBBON | ||||||
| BSC32=bscmake.exe | BSC32=bscmake.exe | ||||||
| # ADD BASE BSC32 /nologo | # ADD BASE BSC32 /nologo | ||||||
| # ADD BSC32 /nologo | # ADD BSC32 /nologo | ||||||
| LINK32=link.exe | LINK32=link.exe | ||||||
| # ADD BASE LINK32 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 wininet.lib ..\..\lib\vc_dll\wxmswuniv29ud_adv.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290ud_ribbon_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_ribbon.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv290ud_ribbon_vc_custom.pdb" | # ADD BASE LINK32 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 wininet.lib ..\..\lib\vc_dll\wxmswuniv29ud_adv.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv291ud_ribbon_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_ribbon.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv291ud_ribbon_vc_custom.pdb" | ||||||
| # ADD LINK32 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 wininet.lib ..\..\lib\vc_dll\wxmswuniv29ud_adv.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290ud_ribbon_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_ribbon.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv290ud_ribbon_vc_custom.pdb" | # ADD LINK32 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 wininet.lib ..\..\lib\vc_dll\wxmswuniv29ud_adv.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv291ud_ribbon_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_ribbon.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv291ud_ribbon_vc_custom.pdb" | ||||||
|  |  | ||||||
| !ELSEIF  "$(CFG)" == "ribbon - Win32 DLL Release" | !ELSEIF  "$(CFG)" == "ribbon - Win32 DLL Release" | ||||||
|  |  | ||||||
| @@ -97,18 +97,18 @@ LINK32=link.exe | |||||||
| # PROP Output_Dir "..\..\lib\vc_dll" | # PROP Output_Dir "..\..\lib\vc_dll" | ||||||
| # PROP Intermediate_Dir "vc_mswudll\ribbon" | # PROP Intermediate_Dir "vc_mswudll\ribbon" | ||||||
| # PROP Target_Dir "" | # PROP Target_Dir "" | ||||||
| # ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_ribbondll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw290u_ribbon_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RIBBON" /c | # ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_ribbondll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw291u_ribbon_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RIBBON" /c | ||||||
| # ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_ribbondll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw290u_ribbon_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RIBBON" /c | # ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_ribbondll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw291u_ribbon_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RIBBON" /c | ||||||
| # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RIBBON" /mktyplib203 /win32 | # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RIBBON" /mktyplib203 /win32 | ||||||
| # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RIBBON" /mktyplib203 /win32 | # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RIBBON" /mktyplib203 /win32 | ||||||
| # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw290u_ribbon_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_RIBBON | # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw291u_ribbon_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_RIBBON | ||||||
| # ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw290u_ribbon_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_RIBBON | # ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw291u_ribbon_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_RIBBON | ||||||
| BSC32=bscmake.exe | BSC32=bscmake.exe | ||||||
| # ADD BASE BSC32 /nologo | # ADD BASE BSC32 /nologo | ||||||
| # ADD BSC32 /nologo | # ADD BSC32 /nologo | ||||||
| LINK32=link.exe | LINK32=link.exe | ||||||
| # ADD BASE LINK32 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 wininet.lib ..\..\lib\vc_dll\wxmsw29u_adv.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290u_ribbon_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_ribbon.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw290u_ribbon_vc_custom.pdb" | # ADD BASE LINK32 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 wininet.lib ..\..\lib\vc_dll\wxmsw29u_adv.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw291u_ribbon_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_ribbon.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw291u_ribbon_vc_custom.pdb" | ||||||
| # ADD LINK32 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 wininet.lib ..\..\lib\vc_dll\wxmsw29u_adv.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290u_ribbon_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_ribbon.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw290u_ribbon_vc_custom.pdb" | # ADD LINK32 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 wininet.lib ..\..\lib\vc_dll\wxmsw29u_adv.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw291u_ribbon_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_ribbon.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw291u_ribbon_vc_custom.pdb" | ||||||
|  |  | ||||||
| !ELSEIF  "$(CFG)" == "ribbon - Win32 DLL Debug" | !ELSEIF  "$(CFG)" == "ribbon - Win32 DLL Debug" | ||||||
|  |  | ||||||
| @@ -122,18 +122,18 @@ LINK32=link.exe | |||||||
| # PROP Output_Dir "..\..\lib\vc_dll" | # PROP Output_Dir "..\..\lib\vc_dll" | ||||||
| # PROP Intermediate_Dir "vc_mswuddll\ribbon" | # PROP Intermediate_Dir "vc_mswuddll\ribbon" | ||||||
| # PROP Target_Dir "" | # PROP Target_Dir "" | ||||||
| # ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_ribbondll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw290ud_ribbon_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RIBBON" /c | # ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_ribbondll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw291ud_ribbon_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RIBBON" /c | ||||||
| # ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_ribbondll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw290ud_ribbon_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RIBBON" /c | # ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_ribbondll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw291ud_ribbon_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RIBBON" /c | ||||||
| # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RIBBON" /mktyplib203 /win32 | # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RIBBON" /mktyplib203 /win32 | ||||||
| # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RIBBON" /mktyplib203 /win32 | # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RIBBON" /mktyplib203 /win32 | ||||||
| # ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw290ud_ribbon_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_RIBBON | # ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw291ud_ribbon_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_RIBBON | ||||||
| # ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw290ud_ribbon_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_RIBBON | # ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw291ud_ribbon_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_RIBBON | ||||||
| BSC32=bscmake.exe | BSC32=bscmake.exe | ||||||
| # ADD BASE BSC32 /nologo | # ADD BASE BSC32 /nologo | ||||||
| # ADD BSC32 /nologo | # ADD BSC32 /nologo | ||||||
| LINK32=link.exe | LINK32=link.exe | ||||||
| # ADD BASE LINK32 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 wininet.lib ..\..\lib\vc_dll\wxmsw29ud_adv.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290ud_ribbon_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_ribbon.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw290ud_ribbon_vc_custom.pdb" | # ADD BASE LINK32 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 wininet.lib ..\..\lib\vc_dll\wxmsw29ud_adv.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw291ud_ribbon_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_ribbon.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw291ud_ribbon_vc_custom.pdb" | ||||||
| # ADD LINK32 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 wininet.lib ..\..\lib\vc_dll\wxmsw29ud_adv.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290ud_ribbon_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_ribbon.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw290ud_ribbon_vc_custom.pdb" | # ADD LINK32 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 wininet.lib ..\..\lib\vc_dll\wxmsw29ud_adv.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw291ud_ribbon_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_ribbon.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw291ud_ribbon_vc_custom.pdb" | ||||||
|  |  | ||||||
| !ELSEIF  "$(CFG)" == "ribbon - Win32 Universal Release" | !ELSEIF  "$(CFG)" == "ribbon - Win32 Universal Release" | ||||||
|  |  | ||||||
| @@ -170,8 +170,8 @@ LIB32=link.exe -lib | |||||||
| # PROP Output_Dir "..\..\lib\vc_lib" | # PROP Output_Dir "..\..\lib\vc_lib" | ||||||
| # PROP Intermediate_Dir "vc_mswunivud\ribbon" | # PROP Intermediate_Dir "vc_mswunivud\ribbon" | ||||||
| # PROP Target_Dir "" | # PROP Target_Dir "" | ||||||
| # ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_lib\mswunivud" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmswuniv29ud_ribbon.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_ribbonlib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /c | # ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_lib\mswunivud" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmswuniv29ud_ribbon.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_ribbonlib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /c | ||||||
| # ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_lib\mswunivud" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmswuniv29ud_ribbon.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_ribbonlib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /c | # ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_lib\mswunivud" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmswuniv29ud_ribbon.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_ribbonlib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /c | ||||||
| # ADD BASE RSC /l 0x409 | # ADD BASE RSC /l 0x409 | ||||||
| # ADD RSC /l 0x409 | # ADD RSC /l 0x409 | ||||||
| BSC32=bscmake.exe | BSC32=bscmake.exe | ||||||
| @@ -216,8 +216,8 @@ LIB32=link.exe -lib | |||||||
| # PROP Output_Dir "..\..\lib\vc_lib" | # PROP Output_Dir "..\..\lib\vc_lib" | ||||||
| # PROP Intermediate_Dir "vc_mswud\ribbon" | # PROP Intermediate_Dir "vc_mswud\ribbon" | ||||||
| # PROP Target_Dir "" | # PROP Target_Dir "" | ||||||
| # ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_lib\mswud" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmsw29ud_ribbon.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_ribbonlib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /c | # ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_lib\mswud" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmsw29ud_ribbon.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_ribbonlib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /c | ||||||
| # ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_lib\mswud" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmsw29ud_ribbon.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_ribbonlib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /c | # ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_lib\mswud" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmsw29ud_ribbon.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_ribbonlib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /c | ||||||
| # ADD BASE RSC /l 0x409 | # ADD BASE RSC /l 0x409 | ||||||
| # ADD RSC /l 0x409 | # ADD RSC /l 0x409 | ||||||
| BSC32=bscmake.exe | BSC32=bscmake.exe | ||||||
|   | |||||||
| @@ -330,6 +330,22 @@ Global | |||||||
| 		{0937D36F-9EAC-5D3D-B990-44B3F99BFC34}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 | 		{0937D36F-9EAC-5D3D-B990-44B3F99BFC34}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 | ||||||
| 		{0937D36F-9EAC-5D3D-B990-44B3F99BFC34}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 | 		{0937D36F-9EAC-5D3D-B990-44B3F99BFC34}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 | ||||||
| 		{0937D36F-9EAC-5D3D-B990-44B3F99BFC34}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 | 		{0937D36F-9EAC-5D3D-B990-44B3F99BFC34}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 | ||||||
|  | 		{7973B6EB-688A-5E14-8175-A32A51A3DFC8}.Debug|Win32.ActiveCfg = Debug|Win32 | ||||||
|  | 		{7973B6EB-688A-5E14-8175-A32A51A3DFC8}.Debug|Win32.Build.0 = Debug|Win32 | ||||||
|  | 		{7973B6EB-688A-5E14-8175-A32A51A3DFC8}.Release|Win32.ActiveCfg = Release|Win32 | ||||||
|  | 		{7973B6EB-688A-5E14-8175-A32A51A3DFC8}.Release|Win32.Build.0 = Release|Win32 | ||||||
|  | 		{7973B6EB-688A-5E14-8175-A32A51A3DFC8}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 | ||||||
|  | 		{7973B6EB-688A-5E14-8175-A32A51A3DFC8}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 | ||||||
|  | 		{7973B6EB-688A-5E14-8175-A32A51A3DFC8}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 | ||||||
|  | 		{7973B6EB-688A-5E14-8175-A32A51A3DFC8}.Universal Release|Win32.Build.0 = Universal Release|Win32 | ||||||
|  | 		{7973B6EB-688A-5E14-8175-A32A51A3DFC8}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 | ||||||
|  | 		{7973B6EB-688A-5E14-8175-A32A51A3DFC8}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 | ||||||
|  | 		{7973B6EB-688A-5E14-8175-A32A51A3DFC8}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 | ||||||
|  | 		{7973B6EB-688A-5E14-8175-A32A51A3DFC8}.DLL Release|Win32.Build.0 = DLL Release|Win32 | ||||||
|  | 		{7973B6EB-688A-5E14-8175-A32A51A3DFC8}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 | ||||||
|  | 		{7973B6EB-688A-5E14-8175-A32A51A3DFC8}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 | ||||||
|  | 		{7973B6EB-688A-5E14-8175-A32A51A3DFC8}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 | ||||||
|  | 		{7973B6EB-688A-5E14-8175-A32A51A3DFC8}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 | ||||||
| 		{F7A944F0-250D-57CD-8F71-BC38B2513B28}.Debug|Win32.ActiveCfg = Debug|Win32 | 		{F7A944F0-250D-57CD-8F71-BC38B2513B28}.Debug|Win32.ActiveCfg = Debug|Win32 | ||||||
| 		{F7A944F0-250D-57CD-8F71-BC38B2513B28}.Debug|Win32.Build.0 = Debug|Win32 | 		{F7A944F0-250D-57CD-8F71-BC38B2513B28}.Debug|Win32.Build.0 = Debug|Win32 | ||||||
| 		{F7A944F0-250D-57CD-8F71-BC38B2513B28}.Release|Win32.ActiveCfg = Release|Win32 | 		{F7A944F0-250D-57CD-8F71-BC38B2513B28}.Release|Win32.ActiveCfg = Release|Win32 | ||||||
| @@ -344,22 +360,6 @@ Global | |||||||
| 		{F7A944F0-250D-57CD-8F71-BC38B2513B28}.DLL Release|Win32.Build.0 = DLL Release|Win32 | 		{F7A944F0-250D-57CD-8F71-BC38B2513B28}.DLL Release|Win32.Build.0 = DLL Release|Win32 | ||||||
| 		{F7A944F0-250D-57CD-8F71-BC38B2513B28}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 | 		{F7A944F0-250D-57CD-8F71-BC38B2513B28}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 | ||||||
| 		{F7A944F0-250D-57CD-8F71-BC38B2513B28}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 | 		{F7A944F0-250D-57CD-8F71-BC38B2513B28}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 | ||||||
| 		{7973B6EB-688A-5E14-8175-A32A51A3DFC8}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 |  | ||||||
| 		{7973B6EB-688A-5E14-8175-A32A51A3DFC8}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 |  | ||||||
| 		{7973B6EB-688A-5E14-8175-A32A51A3DFC8}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 |  | ||||||
| 		{7973B6EB-688A-5E14-8175-A32A51A3DFC8}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 |  | ||||||
| 		{7973B6EB-688A-5E14-8175-A32A51A3DFC8}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 |  | ||||||
| 		{7973B6EB-688A-5E14-8175-A32A51A3DFC8}.DLL Release|Win32.Build.0 = DLL Release|Win32 |  | ||||||
| 		{7973B6EB-688A-5E14-8175-A32A51A3DFC8}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 |  | ||||||
| 		{7973B6EB-688A-5E14-8175-A32A51A3DFC8}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 |  | ||||||
| 		{7973B6EB-688A-5E14-8175-A32A51A3DFC8}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 |  | ||||||
| 		{7973B6EB-688A-5E14-8175-A32A51A3DFC8}.Universal Release|Win32.Build.0 = Universal Release|Win32 |  | ||||||
| 		{7973B6EB-688A-5E14-8175-A32A51A3DFC8}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 |  | ||||||
| 		{7973B6EB-688A-5E14-8175-A32A51A3DFC8}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 |  | ||||||
| 		{7973B6EB-688A-5E14-8175-A32A51A3DFC8}.Release|Win32.ActiveCfg = Release|Win32 |  | ||||||
| 		{7973B6EB-688A-5E14-8175-A32A51A3DFC8}.Release|Win32.Build.0 = Release|Win32 |  | ||||||
| 		{7973B6EB-688A-5E14-8175-A32A51A3DFC8}.Debug|Win32.ActiveCfg = Debug|Win32 |  | ||||||
| 		{7973B6EB-688A-5E14-8175-A32A51A3DFC8}.Debug|Win32.Build.0 = Debug|Win32 |  | ||||||
| 		{F7A944F0-250D-57CD-8F71-BC38B2513B28}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 | 		{F7A944F0-250D-57CD-8F71-BC38B2513B28}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 | ||||||
| 		{F7A944F0-250D-57CD-8F71-BC38B2513B28}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 | 		{F7A944F0-250D-57CD-8F71-BC38B2513B28}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 | ||||||
| 		{52F16F53-E13D-55CA-AD64-ACB0274B0704}.Debug|Win32.ActiveCfg = Debug|Win32 | 		{52F16F53-E13D-55CA-AD64-ACB0274B0704}.Debug|Win32.ActiveCfg = Debug|Win32 | ||||||
|   | |||||||
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							| @@ -331,6 +331,22 @@ Global | |||||||
| 		{B361C000-79E7-5B8A-8F5F-BC0168C7002E}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 | 		{B361C000-79E7-5B8A-8F5F-BC0168C7002E}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 | ||||||
| 		{B361C000-79E7-5B8A-8F5F-BC0168C7002E}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 | 		{B361C000-79E7-5B8A-8F5F-BC0168C7002E}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 | ||||||
| 		{B361C000-79E7-5B8A-8F5F-BC0168C7002E}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 | 		{B361C000-79E7-5B8A-8F5F-BC0168C7002E}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 | ||||||
|  | 		{F751C47E-8534-571F-8E4A-F0E6AC978D63}.Debug|Win32.ActiveCfg = Debug|Win32 | ||||||
|  | 		{F751C47E-8534-571F-8E4A-F0E6AC978D63}.Debug|Win32.Build.0 = Debug|Win32 | ||||||
|  | 		{F751C47E-8534-571F-8E4A-F0E6AC978D63}.Release|Win32.ActiveCfg = Release|Win32 | ||||||
|  | 		{F751C47E-8534-571F-8E4A-F0E6AC978D63}.Release|Win32.Build.0 = Release|Win32 | ||||||
|  | 		{F751C47E-8534-571F-8E4A-F0E6AC978D63}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 | ||||||
|  | 		{F751C47E-8534-571F-8E4A-F0E6AC978D63}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 | ||||||
|  | 		{F751C47E-8534-571F-8E4A-F0E6AC978D63}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 | ||||||
|  | 		{F751C47E-8534-571F-8E4A-F0E6AC978D63}.Universal Release|Win32.Build.0 = Universal Release|Win32 | ||||||
|  | 		{F751C47E-8534-571F-8E4A-F0E6AC978D63}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 | ||||||
|  | 		{F751C47E-8534-571F-8E4A-F0E6AC978D63}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 | ||||||
|  | 		{F751C47E-8534-571F-8E4A-F0E6AC978D63}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 | ||||||
|  | 		{F751C47E-8534-571F-8E4A-F0E6AC978D63}.DLL Release|Win32.Build.0 = DLL Release|Win32 | ||||||
|  | 		{F751C47E-8534-571F-8E4A-F0E6AC978D63}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 | ||||||
|  | 		{F751C47E-8534-571F-8E4A-F0E6AC978D63}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 | ||||||
|  | 		{F751C47E-8534-571F-8E4A-F0E6AC978D63}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 | ||||||
|  | 		{F751C47E-8534-571F-8E4A-F0E6AC978D63}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 | ||||||
| 		{93781718-26B6-5541-84C5-78C6A8226AEC}.Debug|Win32.ActiveCfg = Debug|Win32 | 		{93781718-26B6-5541-84C5-78C6A8226AEC}.Debug|Win32.ActiveCfg = Debug|Win32 | ||||||
| 		{93781718-26B6-5541-84C5-78C6A8226AEC}.Debug|Win32.Build.0 = Debug|Win32 | 		{93781718-26B6-5541-84C5-78C6A8226AEC}.Debug|Win32.Build.0 = Debug|Win32 | ||||||
| 		{93781718-26B6-5541-84C5-78C6A8226AEC}.Release|Win32.ActiveCfg = Release|Win32 | 		{93781718-26B6-5541-84C5-78C6A8226AEC}.Release|Win32.ActiveCfg = Release|Win32 | ||||||
| @@ -345,22 +361,6 @@ Global | |||||||
| 		{93781718-26B6-5541-84C5-78C6A8226AEC}.DLL Release|Win32.Build.0 = DLL Release|Win32 | 		{93781718-26B6-5541-84C5-78C6A8226AEC}.DLL Release|Win32.Build.0 = DLL Release|Win32 | ||||||
| 		{93781718-26B6-5541-84C5-78C6A8226AEC}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 | 		{93781718-26B6-5541-84C5-78C6A8226AEC}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 | ||||||
| 		{93781718-26B6-5541-84C5-78C6A8226AEC}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 | 		{93781718-26B6-5541-84C5-78C6A8226AEC}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 | ||||||
| 		{F751C47E-8534-571F-8E4A-F0E6AC978D63}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 |  | ||||||
| 		{F751C47E-8534-571F-8E4A-F0E6AC978D63}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 |  | ||||||
| 		{F751C47E-8534-571F-8E4A-F0E6AC978D63}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 |  | ||||||
| 		{F751C47E-8534-571F-8E4A-F0E6AC978D63}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 |  | ||||||
| 		{F751C47E-8534-571F-8E4A-F0E6AC978D63}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 |  | ||||||
| 		{F751C47E-8534-571F-8E4A-F0E6AC978D63}.DLL Release|Win32.Build.0 = DLL Release|Win32 |  | ||||||
| 		{F751C47E-8534-571F-8E4A-F0E6AC978D63}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 |  | ||||||
| 		{F751C47E-8534-571F-8E4A-F0E6AC978D63}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 |  | ||||||
| 		{F751C47E-8534-571F-8E4A-F0E6AC978D63}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 |  | ||||||
| 		{F751C47E-8534-571F-8E4A-F0E6AC978D63}.Universal Release|Win32.Build.0 = Universal Release|Win32 |  | ||||||
| 		{F751C47E-8534-571F-8E4A-F0E6AC978D63}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 |  | ||||||
| 		{F751C47E-8534-571F-8E4A-F0E6AC978D63}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 |  | ||||||
| 		{F751C47E-8534-571F-8E4A-F0E6AC978D63}.Release|Win32.ActiveCfg = Release|Win32 |  | ||||||
| 		{F751C47E-8534-571F-8E4A-F0E6AC978D63}.Release|Win32.Build.0 = Release|Win32 |  | ||||||
| 		{F751C47E-8534-571F-8E4A-F0E6AC978D63}.Debug|Win32.ActiveCfg = Debug|Win32 |  | ||||||
| 		{F751C47E-8534-571F-8E4A-F0E6AC978D63}.Debug|Win32.Build.0 = Debug|Win32 |  | ||||||
| 		{93781718-26B6-5541-84C5-78C6A8226AEC}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 | 		{93781718-26B6-5541-84C5-78C6A8226AEC}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 | ||||||
| 		{93781718-26B6-5541-84C5-78C6A8226AEC}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 | 		{93781718-26B6-5541-84C5-78C6A8226AEC}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 | ||||||
| 		{4928FA3B-C258-5E39-AE05-E4BD709955B3}.Debug|Win32.ActiveCfg = Debug|Win32 | 		{4928FA3B-C258-5E39-AE05-E4BD709955B3}.Debug|Win32.ActiveCfg = Debug|Win32 | ||||||
|   | |||||||
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							| @@ -331,6 +331,22 @@ Global | |||||||
| 		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 | 		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 | ||||||
| 		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 | 		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 | ||||||
| 		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 | 		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 | ||||||
|  | 		{87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Debug|Win32.ActiveCfg = Debug|Win32 | ||||||
|  | 		{87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Debug|Win32.Build.0 = Debug|Win32 | ||||||
|  | 		{87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Release|Win32.ActiveCfg = Release|Win32 | ||||||
|  | 		{87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Release|Win32.Build.0 = Release|Win32 | ||||||
|  | 		{87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 | ||||||
|  | 		{87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 | ||||||
|  | 		{87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 | ||||||
|  | 		{87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Universal Release|Win32.Build.0 = Universal Release|Win32 | ||||||
|  | 		{87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 | ||||||
|  | 		{87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 | ||||||
|  | 		{87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 | ||||||
|  | 		{87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.DLL Release|Win32.Build.0 = DLL Release|Win32 | ||||||
|  | 		{87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 | ||||||
|  | 		{87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 | ||||||
|  | 		{87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 | ||||||
|  | 		{87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 | ||||||
| 		{97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.Debug|Win32.ActiveCfg = Debug|Win32 | 		{97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.Debug|Win32.ActiveCfg = Debug|Win32 | ||||||
| 		{97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.Debug|Win32.Build.0 = Debug|Win32 | 		{97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.Debug|Win32.Build.0 = Debug|Win32 | ||||||
| 		{97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.Release|Win32.ActiveCfg = Release|Win32 | 		{97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.Release|Win32.ActiveCfg = Release|Win32 | ||||||
| @@ -345,22 +361,6 @@ Global | |||||||
| 		{97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.DLL Release|Win32.Build.0 = DLL Release|Win32 | 		{97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.DLL Release|Win32.Build.0 = DLL Release|Win32 | ||||||
| 		{97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 | 		{97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 | ||||||
| 		{97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 | 		{97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 | ||||||
| 		{87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 |  | ||||||
| 		{87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 |  | ||||||
| 		{87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 |  | ||||||
| 		{87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 |  | ||||||
| 		{87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 |  | ||||||
| 		{87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.DLL Release|Win32.Build.0 = DLL Release|Win32 |  | ||||||
| 		{87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 |  | ||||||
| 		{87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 |  | ||||||
| 		{87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 |  | ||||||
| 		{87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Universal Release|Win32.Build.0 = Universal Release|Win32 |  | ||||||
| 		{87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 |  | ||||||
| 		{87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 |  | ||||||
| 		{87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Release|Win32.ActiveCfg = Release|Win32 |  | ||||||
| 		{87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Release|Win32.Build.0 = Release|Win32 |  | ||||||
| 		{87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Debug|Win32.ActiveCfg = Debug|Win32 |  | ||||||
| 		{87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Debug|Win32.Build.0 = Debug|Win32 |  | ||||||
| 		{97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 | 		{97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 | ||||||
| 		{97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 | 		{97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 | ||||||
| 		{7FB0902D-8579-5DCE-B883-DAF66A885005}.Debug|Win32.ActiveCfg = Debug|Win32 | 		{7FB0902D-8579-5DCE-B883-DAF66A885005}.Debug|Win32.ActiveCfg = Debug|Win32 | ||||||
|   | |||||||
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							
							
								
								
									
										94
									
								
								configure
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										94
									
								
								configure
									
									
									
									
										vendored
									
									
								
							| @@ -846,6 +846,7 @@ COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1 | |||||||
| COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1 | COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1 | ||||||
| COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1 | COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1 | ||||||
| COND_MONOLITHIC_0_SHARED_0_USE_PROPGRID_1 | COND_MONOLITHIC_0_SHARED_0_USE_PROPGRID_1 | ||||||
|  | COND_MONOLITHIC_0_SHARED_0_USE_RIBBON_1 | ||||||
| COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1 | COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1 | ||||||
| COND_MONOLITHIC_0_SHARED_0_USE_STC_1 | COND_MONOLITHIC_0_SHARED_0_USE_STC_1 | ||||||
| COND_MONOLITHIC_0_SHARED_0_USE_XRC_1 | COND_MONOLITHIC_0_SHARED_0_USE_XRC_1 | ||||||
| @@ -856,6 +857,7 @@ COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1 | |||||||
| COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1 | COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1 | ||||||
| COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1 | COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1 | ||||||
| COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1 | COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1 | ||||||
|  | COND_MONOLITHIC_0_SHARED_1_USE_RIBBON_1 | ||||||
| COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1 | COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1 | ||||||
| COND_MONOLITHIC_0_SHARED_1_USE_STC_1 | COND_MONOLITHIC_0_SHARED_1_USE_STC_1 | ||||||
| COND_MONOLITHIC_0_SHARED_1_USE_XRC_1 | COND_MONOLITHIC_0_SHARED_1_USE_XRC_1 | ||||||
| @@ -866,6 +868,7 @@ COND_MONOLITHIC_0_USE_HTML_1 | |||||||
| COND_MONOLITHIC_0_USE_MEDIA_1 | COND_MONOLITHIC_0_USE_MEDIA_1 | ||||||
| COND_MONOLITHIC_0_USE_PROPGRID_1 | COND_MONOLITHIC_0_USE_PROPGRID_1 | ||||||
| COND_MONOLITHIC_0_USE_QA_1 | COND_MONOLITHIC_0_USE_QA_1 | ||||||
|  | COND_MONOLITHIC_0_USE_RIBBON_1 | ||||||
| COND_MONOLITHIC_0_USE_RICHTEXT_1 | COND_MONOLITHIC_0_USE_RICHTEXT_1 | ||||||
| COND_MONOLITHIC_0_USE_STC_1 | COND_MONOLITHIC_0_USE_STC_1 | ||||||
| COND_MONOLITHIC_0_USE_XRC_1 | COND_MONOLITHIC_0_USE_XRC_1 | ||||||
| @@ -1761,6 +1764,7 @@ Optional Features: | |||||||
|   --enable-xrc            use XRC resources sub-library |   --enable-xrc            use XRC resources sub-library | ||||||
|   --enable-aui            use AUI docking library |   --enable-aui            use AUI docking library | ||||||
|   --enable-propgrid       use wxPropertyGrid library |   --enable-propgrid       use wxPropertyGrid library | ||||||
|  |   --enable-ribbon         use wxRibbon library | ||||||
|   --enable-stc            use wxStyledTextCtrl library |   --enable-stc            use wxStyledTextCtrl library | ||||||
|   --enable-constraints    use layout-constraints system |   --enable-constraints    use layout-constraints system | ||||||
|   --enable-loggui         use standard GUI logger |   --enable-loggui         use standard GUI logger | ||||||
| @@ -4335,7 +4339,6 @@ echo "$as_me: error: Invalid --enable-debug value, must be yes, no or max" >&2;} | |||||||
|    { (exit 1); exit 1; }; } |    { (exit 1); exit 1; }; } | ||||||
|         fi |         fi | ||||||
| 
 | 
 | ||||||
| 
 |  | ||||||
| else | else | ||||||
|   wxUSE_DEBUG=default |   wxUSE_DEBUG=default | ||||||
| 
 | 
 | ||||||
| @@ -8610,6 +8613,50 @@ fi | |||||||
| echo "${ECHO_T}$result" >&6; } | echo "${ECHO_T}$result" >&6; } | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
|  |           enablestring= | ||||||
|  |           defaultval=$wxUSE_ALL_FEATURES | ||||||
|  |           if test -z "$defaultval"; then | ||||||
|  |               if test x"$enablestring" = xdisable; then | ||||||
|  |                   defaultval=yes | ||||||
|  |               else | ||||||
|  |                   defaultval=no | ||||||
|  |               fi | ||||||
|  |           fi | ||||||
|  | 
 | ||||||
|  |           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-ribbon" >&5 | ||||||
|  | echo $ECHO_N "checking for --${enablestring:-enable}-ribbon... $ECHO_C" >&6; } | ||||||
|  |           # Check whether --enable-ribbon was given. | ||||||
|  | if test "${enable_ribbon+set}" = set; then | ||||||
|  |   enableval=$enable_ribbon; | ||||||
|  |                           if test "$enableval" = yes; then | ||||||
|  |                             wx_cv_use_ribbon='wxUSE_RIBBON=yes' | ||||||
|  |                           else | ||||||
|  |                             wx_cv_use_ribbon='wxUSE_RIBBON=no' | ||||||
|  |                           fi | ||||||
|  | 
 | ||||||
|  | else | ||||||
|  | 
 | ||||||
|  |                           wx_cv_use_ribbon='wxUSE_RIBBON=${'DEFAULT_wxUSE_RIBBON":-$defaultval}" | ||||||
|  | 
 | ||||||
|  | fi | ||||||
|  | 
 | ||||||
|  | 
 | ||||||
|  |           eval "$wx_cv_use_ribbon" | ||||||
|  | 
 | ||||||
|  |           if test x"$enablestring" = xdisable; then | ||||||
|  |             if test $wxUSE_RIBBON = no; then | ||||||
|  |               result=yes | ||||||
|  |             else | ||||||
|  |               result=no | ||||||
|  |             fi | ||||||
|  |           else | ||||||
|  |             result=$wxUSE_RIBBON | ||||||
|  |           fi | ||||||
|  | 
 | ||||||
|  |           { echo "$as_me:$LINENO: result: $result" >&5 | ||||||
|  | echo "${ECHO_T}$result" >&6; } | ||||||
|  | 
 | ||||||
|  | 
 | ||||||
|           enablestring= |           enablestring= | ||||||
|           defaultval=$wxUSE_ALL_FEATURES |           defaultval=$wxUSE_ALL_FEATURES | ||||||
|           if test -z "$defaultval"; then |           if test -z "$defaultval"; then | ||||||
| @@ -46246,6 +46293,16 @@ _ACEOF | |||||||
|    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS propgrid" |    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS propgrid" | ||||||
| fi | fi | ||||||
| 
 | 
 | ||||||
|  | USE_RIBBON=0 | ||||||
|  | if test "$wxUSE_RIBBON" = "yes"; then | ||||||
|  |    cat >>confdefs.h <<\_ACEOF | ||||||
|  | #define wxUSE_RIBBON 1 | ||||||
|  | _ACEOF | ||||||
|  | 
 | ||||||
|  |    USE_RIBBON=1 | ||||||
|  |    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS ribbon" | ||||||
|  | fi | ||||||
|  | 
 | ||||||
| USE_STC=0 | USE_STC=0 | ||||||
| if test "$wxUSE_STC" = "yes"; then | if test "$wxUSE_STC" = "yes"; then | ||||||
|    cat >>confdefs.h <<\_ACEOF |    cat >>confdefs.h <<\_ACEOF | ||||||
| @@ -46982,6 +47039,9 @@ if test "$wxUSE_GUI" = "yes"; then | |||||||
|     if test "$wxUSE_PROPGRID" = "yes" ; then |     if test "$wxUSE_PROPGRID" = "yes" ; then | ||||||
|         BUILT_WX_LIBS="propgrid $BUILT_WX_LIBS" |         BUILT_WX_LIBS="propgrid $BUILT_WX_LIBS" | ||||||
|     fi |     fi | ||||||
|  |     if test "$wxUSE_RIBBON" = "yes" ; then | ||||||
|  |         BUILT_WX_LIBS="ribbon $BUILT_WX_LIBS" | ||||||
|  |     fi | ||||||
|     if test "$wxUSE_RICHTEXT" = "yes" ; then |     if test "$wxUSE_RICHTEXT" = "yes" ; then | ||||||
|         BUILT_WX_LIBS="richtext $BUILT_WX_LIBS" |         BUILT_WX_LIBS="richtext $BUILT_WX_LIBS" | ||||||
|     fi |     fi | ||||||
| @@ -49793,6 +49853,11 @@ EOF | |||||||
|         COND_MONOLITHIC_0_SHARED_0_USE_PROPGRID_1="" |         COND_MONOLITHIC_0_SHARED_0_USE_PROPGRID_1="" | ||||||
|     fi |     fi | ||||||
| 
 | 
 | ||||||
|  |     COND_MONOLITHIC_0_SHARED_0_USE_RIBBON_1="#" | ||||||
|  |     if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_RIBBON" = "x1" ; then | ||||||
|  |         COND_MONOLITHIC_0_SHARED_0_USE_RIBBON_1="" | ||||||
|  |     fi | ||||||
|  | 
 | ||||||
|     COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1="#" |     COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1="#" | ||||||
|     if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_RICHTEXT" = "x1" ; then |     if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_RICHTEXT" = "x1" ; then | ||||||
|         COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1="" |         COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1="" | ||||||
| @@ -49843,6 +49908,11 @@ EOF | |||||||
|         COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1="" |         COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1="" | ||||||
|     fi |     fi | ||||||
| 
 | 
 | ||||||
|  |     COND_MONOLITHIC_0_SHARED_1_USE_RIBBON_1="#" | ||||||
|  |     if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_RIBBON" = "x1" ; then | ||||||
|  |         COND_MONOLITHIC_0_SHARED_1_USE_RIBBON_1="" | ||||||
|  |     fi | ||||||
|  | 
 | ||||||
|     COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1="#" |     COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1="#" | ||||||
|     if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_RICHTEXT" = "x1" ; then |     if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_RICHTEXT" = "x1" ; then | ||||||
|         COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1="" |         COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1="" | ||||||
| @@ -49893,6 +49963,11 @@ EOF | |||||||
|         COND_MONOLITHIC_0_USE_QA_1="" |         COND_MONOLITHIC_0_USE_QA_1="" | ||||||
|     fi |     fi | ||||||
| 
 | 
 | ||||||
|  |     COND_MONOLITHIC_0_USE_RIBBON_1="#" | ||||||
|  |     if test "x$MONOLITHIC" = "x0" -a "x$USE_RIBBON" = "x1" ; then | ||||||
|  |         COND_MONOLITHIC_0_USE_RIBBON_1="" | ||||||
|  |     fi | ||||||
|  | 
 | ||||||
|     COND_MONOLITHIC_0_USE_RICHTEXT_1="#" |     COND_MONOLITHIC_0_USE_RICHTEXT_1="#" | ||||||
|     if test "x$MONOLITHIC" = "x0" -a "x$USE_RICHTEXT" = "x1" ; then |     if test "x$MONOLITHIC" = "x0" -a "x$USE_RICHTEXT" = "x1" ; then | ||||||
|         COND_MONOLITHIC_0_USE_RICHTEXT_1="" |         COND_MONOLITHIC_0_USE_RICHTEXT_1="" | ||||||
| @@ -51977,6 +52052,7 @@ COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1!$COND_MONOLITHIC_0_SHARED_0_USE_ | |||||||
| COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1!$COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1$ac_delim | COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1!$COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1$ac_delim | ||||||
| COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1!$COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1$ac_delim | COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1!$COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1$ac_delim | ||||||
| COND_MONOLITHIC_0_SHARED_0_USE_PROPGRID_1!$COND_MONOLITHIC_0_SHARED_0_USE_PROPGRID_1$ac_delim | COND_MONOLITHIC_0_SHARED_0_USE_PROPGRID_1!$COND_MONOLITHIC_0_SHARED_0_USE_PROPGRID_1$ac_delim | ||||||
|  | COND_MONOLITHIC_0_SHARED_0_USE_RIBBON_1!$COND_MONOLITHIC_0_SHARED_0_USE_RIBBON_1$ac_delim | ||||||
| COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1!$COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1$ac_delim | COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1!$COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1$ac_delim | ||||||
| COND_MONOLITHIC_0_SHARED_0_USE_STC_1!$COND_MONOLITHIC_0_SHARED_0_USE_STC_1$ac_delim | COND_MONOLITHIC_0_SHARED_0_USE_STC_1!$COND_MONOLITHIC_0_SHARED_0_USE_STC_1$ac_delim | ||||||
| COND_MONOLITHIC_0_SHARED_0_USE_XRC_1!$COND_MONOLITHIC_0_SHARED_0_USE_XRC_1$ac_delim | COND_MONOLITHIC_0_SHARED_0_USE_XRC_1!$COND_MONOLITHIC_0_SHARED_0_USE_XRC_1$ac_delim | ||||||
| @@ -51987,6 +52063,7 @@ COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1!$COND_MONOLITHIC_0_SHARED_1_USE_ | |||||||
| COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1!$COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1$ac_delim | COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1!$COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1$ac_delim | ||||||
| COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1!$COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1$ac_delim | COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1!$COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1$ac_delim | ||||||
| COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1!$COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1$ac_delim | COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1!$COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1$ac_delim | ||||||
|  | COND_MONOLITHIC_0_SHARED_1_USE_RIBBON_1!$COND_MONOLITHIC_0_SHARED_1_USE_RIBBON_1$ac_delim | ||||||
| COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1!$COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1$ac_delim | COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1!$COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1$ac_delim | ||||||
| COND_MONOLITHIC_0_SHARED_1_USE_STC_1!$COND_MONOLITHIC_0_SHARED_1_USE_STC_1$ac_delim | COND_MONOLITHIC_0_SHARED_1_USE_STC_1!$COND_MONOLITHIC_0_SHARED_1_USE_STC_1$ac_delim | ||||||
| COND_MONOLITHIC_0_SHARED_1_USE_XRC_1!$COND_MONOLITHIC_0_SHARED_1_USE_XRC_1$ac_delim | COND_MONOLITHIC_0_SHARED_1_USE_XRC_1!$COND_MONOLITHIC_0_SHARED_1_USE_XRC_1$ac_delim | ||||||
| @@ -51997,6 +52074,7 @@ COND_MONOLITHIC_0_USE_HTML_1!$COND_MONOLITHIC_0_USE_HTML_1$ac_delim | |||||||
| COND_MONOLITHIC_0_USE_MEDIA_1!$COND_MONOLITHIC_0_USE_MEDIA_1$ac_delim | COND_MONOLITHIC_0_USE_MEDIA_1!$COND_MONOLITHIC_0_USE_MEDIA_1$ac_delim | ||||||
| COND_MONOLITHIC_0_USE_PROPGRID_1!$COND_MONOLITHIC_0_USE_PROPGRID_1$ac_delim | COND_MONOLITHIC_0_USE_PROPGRID_1!$COND_MONOLITHIC_0_USE_PROPGRID_1$ac_delim | ||||||
| COND_MONOLITHIC_0_USE_QA_1!$COND_MONOLITHIC_0_USE_QA_1$ac_delim | COND_MONOLITHIC_0_USE_QA_1!$COND_MONOLITHIC_0_USE_QA_1$ac_delim | ||||||
|  | COND_MONOLITHIC_0_USE_RIBBON_1!$COND_MONOLITHIC_0_USE_RIBBON_1$ac_delim | ||||||
| COND_MONOLITHIC_0_USE_RICHTEXT_1!$COND_MONOLITHIC_0_USE_RICHTEXT_1$ac_delim | COND_MONOLITHIC_0_USE_RICHTEXT_1!$COND_MONOLITHIC_0_USE_RICHTEXT_1$ac_delim | ||||||
| COND_MONOLITHIC_0_USE_STC_1!$COND_MONOLITHIC_0_USE_STC_1$ac_delim | COND_MONOLITHIC_0_USE_STC_1!$COND_MONOLITHIC_0_USE_STC_1$ac_delim | ||||||
| COND_MONOLITHIC_0_USE_XRC_1!$COND_MONOLITHIC_0_USE_XRC_1$ac_delim | COND_MONOLITHIC_0_USE_XRC_1!$COND_MONOLITHIC_0_USE_XRC_1$ac_delim | ||||||
| @@ -52035,9 +52113,6 @@ COND_SHARED_0_TOOLKIT_MAC_WXUNIV_0!$COND_SHARED_0_TOOLKIT_MAC_WXUNIV_0$ac_delim | |||||||
| COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0!$COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0$ac_delim | COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0!$COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0$ac_delim | ||||||
| COND_SHARED_0_TOOLKIT_PM_WXUNIV_0!$COND_SHARED_0_TOOLKIT_PM_WXUNIV_0$ac_delim | COND_SHARED_0_TOOLKIT_PM_WXUNIV_0!$COND_SHARED_0_TOOLKIT_PM_WXUNIV_0$ac_delim | ||||||
| COND_SHARED_0_USE_GUI_1_USE_OPENGL_1!$COND_SHARED_0_USE_GUI_1_USE_OPENGL_1$ac_delim | COND_SHARED_0_USE_GUI_1_USE_OPENGL_1!$COND_SHARED_0_USE_GUI_1_USE_OPENGL_1$ac_delim | ||||||
| COND_SHARED_0_USE_GUI_1_wxUSE_LIBJPEG_builtin!$COND_SHARED_0_USE_GUI_1_wxUSE_LIBJPEG_builtin$ac_delim |  | ||||||
| COND_SHARED_0_USE_GUI_1_wxUSE_LIBPNG_builtin!$COND_SHARED_0_USE_GUI_1_wxUSE_LIBPNG_builtin$ac_delim |  | ||||||
| COND_SHARED_0_USE_GUI_1_wxUSE_LIBTIFF_builtin!$COND_SHARED_0_USE_GUI_1_wxUSE_LIBTIFF_builtin$ac_delim |  | ||||||
| _ACEOF | _ACEOF | ||||||
| 
 | 
 | ||||||
|   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then |   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then | ||||||
| @@ -52079,6 +52154,9 @@ _ACEOF | |||||||
| ac_delim='%!_!# ' | ac_delim='%!_!# ' | ||||||
| for ac_last_try in false false false false false :; do | for ac_last_try in false false false false false :; do | ||||||
|   cat >conf$$subs.sed <<_ACEOF |   cat >conf$$subs.sed <<_ACEOF | ||||||
|  | COND_SHARED_0_USE_GUI_1_wxUSE_LIBJPEG_builtin!$COND_SHARED_0_USE_GUI_1_wxUSE_LIBJPEG_builtin$ac_delim | ||||||
|  | COND_SHARED_0_USE_GUI_1_wxUSE_LIBPNG_builtin!$COND_SHARED_0_USE_GUI_1_wxUSE_LIBPNG_builtin$ac_delim | ||||||
|  | COND_SHARED_0_USE_GUI_1_wxUSE_LIBTIFF_builtin!$COND_SHARED_0_USE_GUI_1_wxUSE_LIBTIFF_builtin$ac_delim | ||||||
| COND_SHARED_0_USE_STC_1!$COND_SHARED_0_USE_STC_1$ac_delim | COND_SHARED_0_USE_STC_1!$COND_SHARED_0_USE_STC_1$ac_delim | ||||||
| COND_SHARED_0_wxUSE_EXPAT_builtin!$COND_SHARED_0_wxUSE_EXPAT_builtin$ac_delim | COND_SHARED_0_wxUSE_EXPAT_builtin!$COND_SHARED_0_wxUSE_EXPAT_builtin$ac_delim | ||||||
| COND_SHARED_0_wxUSE_REGEX_builtin!$COND_SHARED_0_wxUSE_REGEX_builtin$ac_delim | COND_SHARED_0_wxUSE_REGEX_builtin!$COND_SHARED_0_wxUSE_REGEX_builtin$ac_delim | ||||||
| @@ -52173,9 +52251,6 @@ WX_LIBRARY_BASENAME_NOGUI!$WX_LIBRARY_BASENAME_NOGUI$ac_delim | |||||||
| WX_LIBRARY_BASENAME_GUI!$WX_LIBRARY_BASENAME_GUI$ac_delim | WX_LIBRARY_BASENAME_GUI!$WX_LIBRARY_BASENAME_GUI$ac_delim | ||||||
| USE_GUI!$USE_GUI$ac_delim | USE_GUI!$USE_GUI$ac_delim | ||||||
| AFMINSTALL!$AFMINSTALL$ac_delim | AFMINSTALL!$AFMINSTALL$ac_delim | ||||||
| WIN32INSTALL!$WIN32INSTALL$ac_delim |  | ||||||
| TOOLKIT!$TOOLKIT$ac_delim |  | ||||||
| TOOLKIT_DIR!$TOOLKIT_DIR$ac_delim |  | ||||||
| _ACEOF | _ACEOF | ||||||
| 
 | 
 | ||||||
|   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then |   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then | ||||||
| @@ -52217,6 +52292,9 @@ _ACEOF | |||||||
| ac_delim='%!_!# ' | ac_delim='%!_!# ' | ||||||
| for ac_last_try in false false false false false :; do | for ac_last_try in false false false false false :; do | ||||||
|   cat >conf$$subs.sed <<_ACEOF |   cat >conf$$subs.sed <<_ACEOF | ||||||
|  | WIN32INSTALL!$WIN32INSTALL$ac_delim | ||||||
|  | TOOLKIT!$TOOLKIT$ac_delim | ||||||
|  | TOOLKIT_DIR!$TOOLKIT_DIR$ac_delim | ||||||
| TOOLCHAIN_NAME!$TOOLCHAIN_NAME$ac_delim | TOOLCHAIN_NAME!$TOOLCHAIN_NAME$ac_delim | ||||||
| TOOLCHAIN_FULLNAME!$TOOLCHAIN_FULLNAME$ac_delim | TOOLCHAIN_FULLNAME!$TOOLCHAIN_FULLNAME$ac_delim | ||||||
| cross_compiling!$cross_compiling$ac_delim | cross_compiling!$cross_compiling$ac_delim | ||||||
| @@ -52254,7 +52332,7 @@ LIBOBJS!$LIBOBJS$ac_delim | |||||||
| LTLIBOBJS!$LTLIBOBJS$ac_delim | LTLIBOBJS!$LTLIBOBJS$ac_delim | ||||||
| _ACEOF | _ACEOF | ||||||
| 
 | 
 | ||||||
|   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 35; then |   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 38; then | ||||||
|     break |     break | ||||||
|   elif $ac_last_try; then |   elif $ac_last_try; then | ||||||
|     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 |     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 | ||||||
|   | |||||||
| @@ -1,6 +1,6 @@ | |||||||
| # ========================================================================= | # ========================================================================= | ||||||
| #     This makefile was generated by | #     This makefile was generated by | ||||||
| #     Bakefile 0.2.5 (http://www.bakefile.org) | #     Bakefile 0.2.6 (http://www.bakefile.org) | ||||||
| #     Do not modify, all changes will be overwritten! | #     Do not modify, all changes will be overwritten! | ||||||
| # ========================================================================= | # ========================================================================= | ||||||
|  |  | ||||||
|   | |||||||
| @@ -1,6 +1,6 @@ | |||||||
| # ========================================================================= | # ========================================================================= | ||||||
| #     This makefile was generated by | #     This makefile was generated by | ||||||
| #     Bakefile 0.2.5 (http://www.bakefile.org) | #     Bakefile 0.2.6 (http://www.bakefile.org) | ||||||
| #     Do not modify, all changes will be overwritten! | #     Do not modify, all changes will be overwritten! | ||||||
| # ========================================================================= | # ========================================================================= | ||||||
|  |  | ||||||
|   | |||||||
| @@ -1,6 +1,6 @@ | |||||||
| # ========================================================================= | # ========================================================================= | ||||||
| #     This makefile was generated by | #     This makefile was generated by | ||||||
| #     Bakefile 0.2.5 (http://www.bakefile.org) | #     Bakefile 0.2.6 (http://www.bakefile.org) | ||||||
| #     Do not modify, all changes will be overwritten! | #     Do not modify, all changes will be overwritten! | ||||||
| # ========================================================================= | # ========================================================================= | ||||||
|  |  | ||||||
| @@ -41,9 +41,9 @@ wx_top_builddir = @wx_top_builddir@ | |||||||
|  |  | ||||||
| DESTDIR =  | DESTDIR =  | ||||||
| WX_RELEASE = 2.9 | WX_RELEASE = 2.9 | ||||||
| WX_VERSION = $(WX_RELEASE).0 | WX_VERSION = $(WX_RELEASE).1 | ||||||
| LIBDIRNAME = $(wx_top_builddir)/lib | LIBDIRNAME = $(wx_top_builddir)/lib | ||||||
| RIBBON_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ | RIBBON_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ | ||||||
| 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ | 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ | ||||||
| 	-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \ | 	-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \ | ||||||
| 	$(CPPFLAGS) $(CXXFLAGS) | 	$(CPPFLAGS) $(CXXFLAGS) | ||||||
| @@ -60,8 +60,7 @@ RIBBON_OBJECTS =  \ | |||||||
| @COND_USE_GUI_0@PORTNAME = base | @COND_USE_GUI_0@PORTNAME = base | ||||||
| @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) | @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) | ||||||
| @COND_TOOLKIT_MAC@WXBASEPORT = _carbon | @COND_TOOLKIT_MAC@WXBASEPORT = _carbon | ||||||
| @COND_BUILD_debug_DEBUG_FLAG_default@WXDEBUGFLAG = d | @COND_BUILD_debug@WXDEBUGFLAG = d | ||||||
| @COND_DEBUG_FLAG_1@WXDEBUGFLAG = d |  | ||||||
| @COND_UNICODE_1@WXUNICODEFLAG = u | @COND_UNICODE_1@WXUNICODEFLAG = u | ||||||
| @COND_WXUNIV_1@WXUNIVNAME = univ | @COND_WXUNIV_1@WXUNIVNAME = univ | ||||||
| @COND_MONOLITHIC_0@EXTRALIBS_FOR_BASE = $(EXTRALIBS) | @COND_MONOLITHIC_0@EXTRALIBS_FOR_BASE = $(EXTRALIBS) | ||||||
| @@ -73,6 +72,8 @@ RIBBON_OBJECTS =  \ | |||||||
| @COND_PLATFORM_MAC_1@	$(SETFILE) -t APPL ribbon$(EXEEXT) | @COND_PLATFORM_MAC_1@	$(SETFILE) -t APPL ribbon$(EXEEXT) | ||||||
| @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ | @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ | ||||||
| @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ | @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ | ||||||
|  | @COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 | ||||||
|  | @COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_2 = --define wxDEBUG_LEVEL=0 | ||||||
| @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS | @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS | ||||||
| @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS | @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS | ||||||
| @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI | @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI | ||||||
| @@ -174,7 +175,7 @@ ribbon$(EXEEXT): $(RIBBON_OBJECTS) $(__ribbon___win32rc) | |||||||
| @COND_PLATFORM_MACOSX_1@	echo -n "APPL????" >ribbon.app/Contents/PkgInfo | @COND_PLATFORM_MACOSX_1@	echo -n "APPL????" >ribbon.app/Contents/PkgInfo | ||||||
| @COND_PLATFORM_MACOSX_1@	 | @COND_PLATFORM_MACOSX_1@	 | ||||||
| @COND_PLATFORM_MACOSX_1@	 | @COND_PLATFORM_MACOSX_1@	 | ||||||
| @COND_PLATFORM_MACOSX_1@	mv ribbon$(EXEEXT) ribbon.app/Contents/MacOS/ribbon | @COND_PLATFORM_MACOSX_1@	ln -f ribbon$(EXEEXT) ribbon.app/Contents/MacOS/ribbon | ||||||
| @COND_PLATFORM_MACOSX_1@	 | @COND_PLATFORM_MACOSX_1@	 | ||||||
| @COND_PLATFORM_MACOSX_1@	 | @COND_PLATFORM_MACOSX_1@	 | ||||||
| @COND_PLATFORM_MACOSX_1@	cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns ribbon.app/Contents/Resources/wxmac.icns | @COND_PLATFORM_MACOSX_1@	cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns ribbon.app/Contents/Resources/wxmac.icns | ||||||
| @@ -185,18 +186,9 @@ ribbon_ribbondemo.o: $(srcdir)/ribbondemo.cpp | |||||||
| 	$(CXXC) -c -o $@ $(RIBBON_CXXFLAGS) $(srcdir)/ribbondemo.cpp | 	$(CXXC) -c -o $@ $(RIBBON_CXXFLAGS) $(srcdir)/ribbondemo.cpp | ||||||
|  |  | ||||||
| ribbon_sample_rc.o: $(srcdir)/../sample.rc | ribbon_sample_rc.o: $(srcdir)/../sample.rc | ||||||
| 	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2)  $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2)   --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include | 	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2)   --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include | ||||||
|  |  | ||||||
|  |  | ||||||
| @COND_USE_STC_1@$(srcdir)/include/wx/stc/stc.h: \ |  | ||||||
| @COND_USE_STC_1@$(srcdir)/src/stc/scintilla/include/Scintilla.iface \ |  | ||||||
| @COND_USE_STC_1@$(srcdir)/src/stc/stc.cpp.in \ |  | ||||||
| @COND_USE_STC_1@$(srcdir)/src/stc/stc.h.in \ |  | ||||||
| @COND_USE_STC_1@$(srcdir)/src/stc/gen_iface.py |  | ||||||
| @COND_USE_STC_1@	cd $(srcdir)/src/stc && ./gen_iface.py |  | ||||||
| @COND_USE_STC_1@monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \ |  | ||||||
| @COND_USE_STC_1@    $(srcdir)/include/wx/stc/stc.h |  | ||||||
|  |  | ||||||
| # Include dependency info, if present: | # Include dependency info, if present: | ||||||
| @IF_GNU_MAKE@-include ./.deps/*.d | @IF_GNU_MAKE@-include ./.deps/*.d | ||||||
|  |  | ||||||
|   | |||||||
| @@ -1,6 +1,6 @@ | |||||||
| # ========================================================================= | # ========================================================================= | ||||||
| #     This makefile was generated by | #     This makefile was generated by | ||||||
| #     Bakefile 0.2.5 (http://www.bakefile.org) | #     Bakefile 0.2.6 (http://www.bakefile.org) | ||||||
| #     Do not modify, all changes will be overwritten! | #     Do not modify, all changes will be overwritten! | ||||||
| # ========================================================================= | # ========================================================================= | ||||||
|  |  | ||||||
| @@ -45,10 +45,7 @@ PORTNAME = base | |||||||
| !if "$(USE_GUI)" == "1" | !if "$(USE_GUI)" == "1" | ||||||
| PORTNAME = msw | PORTNAME = msw | ||||||
| !endif | !endif | ||||||
| !if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default" | !if "$(BUILD)" == "debug" | ||||||
| WXDEBUGFLAG = d |  | ||||||
| !endif |  | ||||||
| !if "$(DEBUG_FLAG)" == "1" |  | ||||||
| WXDEBUGFLAG = d | WXDEBUGFLAG = d | ||||||
| !endif | !endif | ||||||
| !if "$(UNICODE)" == "1" | !if "$(UNICODE)" == "1" | ||||||
| @@ -108,17 +105,11 @@ __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ | |||||||
| !if "$(WXUNIV)" == "1" | !if "$(WXUNIV)" == "1" | ||||||
| __WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__ | __WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__ | ||||||
| !endif | !endif | ||||||
| !if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default" | !if "$(DEBUG_FLAG)" == "0" | ||||||
| __DEBUG_DEFINE_p = -D__WXDEBUG__ | __DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 | ||||||
| !endif | !endif | ||||||
| !if "$(DEBUG_FLAG)" == "1" | !if "$(DEBUG_FLAG)" == "0" | ||||||
| __DEBUG_DEFINE_p = -D__WXDEBUG__ | __DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0 | ||||||
| !endif |  | ||||||
| !if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default" |  | ||||||
| __DEBUG_DEFINE_p_1 = -d__WXDEBUG__ |  | ||||||
| !endif |  | ||||||
| !if "$(DEBUG_FLAG)" == "1" |  | ||||||
| __DEBUG_DEFINE_p_1 = -d__WXDEBUG__ |  | ||||||
| !endif | !endif | ||||||
| !if "$(USE_EXCEPTIONS)" == "0" | !if "$(USE_EXCEPTIONS)" == "0" | ||||||
| __EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS | __EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS | ||||||
|   | |||||||
| @@ -1,6 +1,6 @@ | |||||||
| # ========================================================================= | # ========================================================================= | ||||||
| #     This makefile was generated by | #     This makefile was generated by | ||||||
| #     Bakefile 0.2.5 (http://www.bakefile.org) | #     Bakefile 0.2.6 (http://www.bakefile.org) | ||||||
| #     Do not modify, all changes will be overwritten! | #     Do not modify, all changes will be overwritten! | ||||||
| # ========================================================================= | # ========================================================================= | ||||||
|  |  | ||||||
| @@ -43,11 +43,6 @@ ifeq ($(USE_GUI),1) | |||||||
| PORTNAME = msw | PORTNAME = msw | ||||||
| endif | endif | ||||||
| ifeq ($(BUILD),debug) | ifeq ($(BUILD),debug) | ||||||
| ifeq ($(DEBUG_FLAG),default) |  | ||||||
| WXDEBUGFLAG = d |  | ||||||
| endif |  | ||||||
| endif |  | ||||||
| ifeq ($(DEBUG_FLAG),1) |  | ||||||
| WXDEBUGFLAG = d | WXDEBUGFLAG = d | ||||||
| endif | endif | ||||||
| ifeq ($(UNICODE),1) | ifeq ($(UNICODE),1) | ||||||
| @@ -95,21 +90,11 @@ endif | |||||||
| ifeq ($(WXUNIV),1) | ifeq ($(WXUNIV),1) | ||||||
| __WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ | __WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ | ||||||
| endif | endif | ||||||
| ifeq ($(BUILD),debug) | ifeq ($(DEBUG_FLAG),0) | ||||||
| ifeq ($(DEBUG_FLAG),default) | __DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 | ||||||
| __DEBUG_DEFINE_p = -D__WXDEBUG__ |  | ||||||
| endif | endif | ||||||
| endif | ifeq ($(DEBUG_FLAG),0) | ||||||
| ifeq ($(DEBUG_FLAG),1) | __DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0 | ||||||
| __DEBUG_DEFINE_p = -D__WXDEBUG__ |  | ||||||
| endif |  | ||||||
| ifeq ($(BUILD),debug) |  | ||||||
| ifeq ($(DEBUG_FLAG),default) |  | ||||||
| __DEBUG_DEFINE_p_1 = --define __WXDEBUG__ |  | ||||||
| endif |  | ||||||
| endif |  | ||||||
| ifeq ($(DEBUG_FLAG),1) |  | ||||||
| __DEBUG_DEFINE_p_1 = --define __WXDEBUG__ |  | ||||||
| endif | endif | ||||||
| ifeq ($(USE_EXCEPTIONS),0) | ifeq ($(USE_EXCEPTIONS),0) | ||||||
| __EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS | __EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS | ||||||
|   | |||||||
| @@ -1,6 +1,6 @@ | |||||||
| # ========================================================================= | # ========================================================================= | ||||||
| #     This makefile was generated by | #     This makefile was generated by | ||||||
| #     Bakefile 0.2.5 (http://www.bakefile.org) | #     Bakefile 0.2.6 (http://www.bakefile.org) | ||||||
| #     Do not modify, all changes will be overwritten! | #     Do not modify, all changes will be overwritten! | ||||||
| # ========================================================================= | # ========================================================================= | ||||||
|  |  | ||||||
| @@ -11,7 +11,7 @@ | |||||||
| # ------------------------------------------------------------------------- | # ------------------------------------------------------------------------- | ||||||
|  |  | ||||||
| # C++ compiler  | # C++ compiler  | ||||||
| CXX = g++ | CXX = `$(WX_CONFIG) --cxx` | ||||||
|  |  | ||||||
| # Standard flags for C++  | # Standard flags for C++  | ||||||
| CXXFLAGS ?=  | CXXFLAGS ?=  | ||||||
| @@ -26,19 +26,16 @@ LDFLAGS ?= | |||||||
| WX_CONFIG ?= wx-config | WX_CONFIG ?= wx-config | ||||||
|  |  | ||||||
| # Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb] | # 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) --query-toolkit) | ||||||
|  |  | ||||||
| # Use DLL build of wx library to use? [0,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) --query-linkage`; then echo 1; else echo 0; fi) | ||||||
|  |  | ||||||
| # Compile Unicode build of wxWidgets? [0,1] | # 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) --query-chartype | 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/') |  | ||||||
|  |  | ||||||
| # Version of the wx library to build against.  | # 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) --query-version | sed -e 's/\([0-9]*\)\.\([0-9]*\)/\1\2/') | ||||||
|  |  | ||||||
|  |  | ||||||
|  |  | ||||||
| @@ -51,9 +48,8 @@ WX_VERSION ?= $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\. | |||||||
| CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD -MP | CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD -MP | ||||||
| WX_VERSION_MAJOR = $(shell echo $(WX_VERSION) | cut -c1,1) | WX_VERSION_MAJOR = $(shell echo $(WX_VERSION) | cut -c1,1) | ||||||
| WX_VERSION_MINOR = $(shell echo $(WX_VERSION) | cut -c2,2) | WX_VERSION_MINOR = $(shell echo $(WX_VERSION) | cut -c2,2) | ||||||
| WX_CONFIG_FLAGS = $(WX_CONFIG_DEBUG_FLAG) $(WX_CONFIG_UNICODE_FLAG) \ | WX_CONFIG_FLAGS = $(WX_CONFIG_UNICODE_FLAG) $(WX_CONFIG_SHARED_FLAG) \ | ||||||
| 	$(WX_CONFIG_SHARED_FLAG) --toolkit=$(WX_PORT) \ | 	--toolkit=$(WX_PORT) --version=$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) | ||||||
| 	--version=$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) |  | ||||||
| RIBBON_CXXFLAGS = -I. `$(WX_CONFIG) --cxxflags $(WX_CONFIG_FLAGS)` $(CPPFLAGS) \ | RIBBON_CXXFLAGS = -I. `$(WX_CONFIG) --cxxflags $(WX_CONFIG_FLAGS)` $(CPPFLAGS) \ | ||||||
| 	$(CXXFLAGS) | 	$(CXXFLAGS) | ||||||
| RIBBON_OBJECTS =  \ | RIBBON_OBJECTS =  \ | ||||||
| @@ -61,12 +57,6 @@ RIBBON_OBJECTS =  \ | |||||||
|  |  | ||||||
| ### Conditionally set variables: ### | ### Conditionally set variables: ### | ||||||
|  |  | ||||||
| ifeq ($(WX_DEBUG),0) |  | ||||||
| WX_CONFIG_DEBUG_FLAG = --debug=no |  | ||||||
| endif |  | ||||||
| ifeq ($(WX_DEBUG),1) |  | ||||||
| WX_CONFIG_DEBUG_FLAG = --debug=yes |  | ||||||
| endif |  | ||||||
| ifeq ($(WX_UNICODE),0) | ifeq ($(WX_UNICODE),0) | ||||||
| WX_CONFIG_UNICODE_FLAG = --unicode=no | WX_CONFIG_UNICODE_FLAG = --unicode=no | ||||||
| endif | endif | ||||||
|   | |||||||
| @@ -1,6 +1,6 @@ | |||||||
| # ========================================================================= | # ========================================================================= | ||||||
| #     This makefile was generated by | #     This makefile was generated by | ||||||
| #     Bakefile 0.2.5 (http://www.bakefile.org) | #     Bakefile 0.2.6 (http://www.bakefile.org) | ||||||
| #     Do not modify, all changes will be overwritten! | #     Do not modify, all changes will be overwritten! | ||||||
| # ========================================================================= | # ========================================================================= | ||||||
|  |  | ||||||
| @@ -40,10 +40,10 @@ PORTNAME = base | |||||||
| !if "$(USE_GUI)" == "1" | !if "$(USE_GUI)" == "1" | ||||||
| PORTNAME = msw | PORTNAME = msw | ||||||
| !endif | !endif | ||||||
| !if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default" | !if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" | ||||||
| WXDEBUGFLAG = d | WXDEBUGFLAG = d | ||||||
| !endif | !endif | ||||||
| !if "$(DEBUG_FLAG)" == "1" | !if "$(DEBUG_RUNTIME_LIBS)" == "1" | ||||||
| WXDEBUGFLAG = d | WXDEBUGFLAG = d | ||||||
| !endif | !endif | ||||||
| !if "$(UNICODE)" == "1" | !if "$(UNICODE)" == "1" | ||||||
| @@ -199,17 +199,11 @@ __WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ | |||||||
| !if "$(WXUNIV)" == "1" | !if "$(WXUNIV)" == "1" | ||||||
| __WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ | __WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ | ||||||
| !endif | !endif | ||||||
| !if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default" | !if "$(DEBUG_FLAG)" == "0" | ||||||
| __DEBUG_DEFINE_p = /D__WXDEBUG__ | __DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 | ||||||
| !endif | !endif | ||||||
| !if "$(DEBUG_FLAG)" == "1" | !if "$(DEBUG_FLAG)" == "0" | ||||||
| __DEBUG_DEFINE_p = /D__WXDEBUG__ | __DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 | ||||||
| !endif |  | ||||||
| !if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default" |  | ||||||
| __DEBUG_DEFINE_p_1 = /d __WXDEBUG__ |  | ||||||
| !endif |  | ||||||
| !if "$(DEBUG_FLAG)" == "1" |  | ||||||
| __DEBUG_DEFINE_p_1 = /d __WXDEBUG__ |  | ||||||
| !endif | !endif | ||||||
| !if "$(USE_EXCEPTIONS)" == "0" | !if "$(USE_EXCEPTIONS)" == "0" | ||||||
| __EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS | __EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS | ||||||
|   | |||||||
| @@ -1,6 +1,6 @@ | |||||||
| # ========================================================================= | # ========================================================================= | ||||||
| #     This makefile was generated by | #     This makefile was generated by | ||||||
| #     Bakefile 0.2.5 (http://www.bakefile.org) | #     Bakefile 0.2.6 (http://www.bakefile.org) | ||||||
| #     Do not modify, all changes will be overwritten! | #     Do not modify, all changes will be overwritten! | ||||||
| # ========================================================================= | # ========================================================================= | ||||||
|  |  | ||||||
| @@ -18,7 +18,11 @@ | |||||||
| !  loaddll wpp      wppdi86 | !  loaddll wpp      wppdi86 | ||||||
| !  loaddll wppaxp   wppdaxp | !  loaddll wppaxp   wppdaxp | ||||||
| !  loaddll wpp386   wppd386 | !  loaddll wpp386   wppd386 | ||||||
|  | ! if $(__VERSION__) >= 1280 | ||||||
|  | !  loaddll wlink    wlinkd | ||||||
|  | ! else | ||||||
| !  loaddll wlink    wlink | !  loaddll wlink    wlink | ||||||
|  | ! endif | ||||||
| !  loaddll wlib     wlibd | !  loaddll wlib     wlibd | ||||||
| !endif | !endif | ||||||
|  |  | ||||||
| @@ -36,11 +40,6 @@ PORTNAME = msw | |||||||
| !endif | !endif | ||||||
| WXDEBUGFLAG = | WXDEBUGFLAG = | ||||||
| !ifeq BUILD debug | !ifeq BUILD debug | ||||||
| !ifeq DEBUG_FLAG default |  | ||||||
| WXDEBUGFLAG = d |  | ||||||
| !endif |  | ||||||
| !endif |  | ||||||
| !ifeq DEBUG_FLAG 1 |  | ||||||
| WXDEBUGFLAG = d | WXDEBUGFLAG = d | ||||||
| !endif | !endif | ||||||
| WXUNICODEFLAG = | WXUNICODEFLAG = | ||||||
| @@ -184,13 +183,8 @@ __WXUNIV_DEFINE_p = | |||||||
| __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ | __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ | ||||||
| !endif | !endif | ||||||
| __DEBUG_DEFINE_p = | __DEBUG_DEFINE_p = | ||||||
| !ifeq BUILD debug | !ifeq DEBUG_FLAG 0 | ||||||
| !ifeq DEBUG_FLAG default | __DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 | ||||||
| __DEBUG_DEFINE_p = -d__WXDEBUG__ |  | ||||||
| !endif |  | ||||||
| !endif |  | ||||||
| !ifeq DEBUG_FLAG 1 |  | ||||||
| __DEBUG_DEFINE_p = -d__WXDEBUG__ |  | ||||||
| !endif | !endif | ||||||
| __EXCEPTIONS_DEFINE_p = | __EXCEPTIONS_DEFINE_p = | ||||||
| !ifeq USE_EXCEPTIONS 0 | !ifeq USE_EXCEPTIONS 0 | ||||||
|   | |||||||
| @@ -72,12 +72,12 @@ LINK32=link.exe | |||||||
| # PROP Output_Dir "vc_mswunivuddll" | # PROP Output_Dir "vc_mswunivuddll" | ||||||
| # PROP Intermediate_Dir "vc_mswunivuddll\ribbon" | # PROP Intermediate_Dir "vc_mswunivuddll\ribbon" | ||||||
| # PROP Target_Dir "" | # PROP Target_Dir "" | ||||||
| # ADD BASE CPP /nologo /FD /MDd /Zi /Fdvc_mswunivuddll\ribbon.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c | # ADD BASE CPP /nologo /FD /MDd /Zi /Fdvc_mswunivuddll\ribbon.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c | ||||||
| # ADD CPP /nologo /FD /MDd /Zi /Fdvc_mswunivuddll\ribbon.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c | # ADD CPP /nologo /FD /MDd /Zi /Fdvc_mswunivuddll\ribbon.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c | ||||||
| # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 | # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 | ||||||
| # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 | # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 | ||||||
| # ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivud" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH | # ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivud" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH | ||||||
| # ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivud" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH | # ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivud" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH | ||||||
| BSC32=bscmake.exe | BSC32=bscmake.exe | ||||||
| # ADD BASE BSC32 /nologo | # ADD BASE BSC32 /nologo | ||||||
| # ADD BSC32 /nologo | # ADD BSC32 /nologo | ||||||
| @@ -122,12 +122,12 @@ LINK32=link.exe | |||||||
| # PROP Output_Dir "vc_mswuddll" | # PROP Output_Dir "vc_mswuddll" | ||||||
| # PROP Intermediate_Dir "vc_mswuddll\ribbon" | # PROP Intermediate_Dir "vc_mswuddll\ribbon" | ||||||
| # PROP Target_Dir "" | # PROP Target_Dir "" | ||||||
| # ADD BASE CPP /nologo /FD /MDd /Zi /Fdvc_mswuddll\ribbon.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_dll\mswud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c | # ADD BASE CPP /nologo /FD /MDd /Zi /Fdvc_mswuddll\ribbon.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_dll\mswud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c | ||||||
| # ADD CPP /nologo /FD /MDd /Zi /Fdvc_mswuddll\ribbon.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_dll\mswud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c | # ADD CPP /nologo /FD /MDd /Zi /Fdvc_mswuddll\ribbon.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_dll\mswud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c | ||||||
| # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 | # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 | ||||||
| # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 | # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 | ||||||
| # ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswud" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH | # ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswud" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH | ||||||
| # ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswud" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH | # ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswud" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH | ||||||
| BSC32=bscmake.exe | BSC32=bscmake.exe | ||||||
| # ADD BASE BSC32 /nologo | # ADD BASE BSC32 /nologo | ||||||
| # ADD BSC32 /nologo | # ADD BSC32 /nologo | ||||||
| @@ -172,12 +172,12 @@ LINK32=link.exe | |||||||
| # PROP Output_Dir "vc_mswunivud" | # PROP Output_Dir "vc_mswunivud" | ||||||
| # PROP Intermediate_Dir "vc_mswunivud\ribbon" | # PROP Intermediate_Dir "vc_mswunivud\ribbon" | ||||||
| # PROP Target_Dir "" | # PROP Target_Dir "" | ||||||
| # ADD BASE CPP /nologo /FD /MDd /Zi /Fdvc_mswunivud\ribbon.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c | # ADD BASE CPP /nologo /FD /MDd /Zi /Fdvc_mswunivud\ribbon.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c | ||||||
| # ADD CPP /nologo /FD /MDd /Zi /Fdvc_mswunivud\ribbon.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c | # ADD CPP /nologo /FD /MDd /Zi /Fdvc_mswunivud\ribbon.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c | ||||||
| # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 | # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 | ||||||
| # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 | # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 | ||||||
| # ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivud" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH | # ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivud" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH | ||||||
| # ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivud" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH | # ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivud" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH | ||||||
| BSC32=bscmake.exe | BSC32=bscmake.exe | ||||||
| # ADD BASE BSC32 /nologo | # ADD BASE BSC32 /nologo | ||||||
| # ADD BSC32 /nologo | # ADD BSC32 /nologo | ||||||
| @@ -222,12 +222,12 @@ LINK32=link.exe | |||||||
| # PROP Output_Dir "vc_mswud" | # PROP Output_Dir "vc_mswud" | ||||||
| # PROP Intermediate_Dir "vc_mswud\ribbon" | # PROP Intermediate_Dir "vc_mswud\ribbon" | ||||||
| # PROP Target_Dir "" | # PROP Target_Dir "" | ||||||
| # ADD BASE CPP /nologo /FD /MDd /Zi /Fdvc_mswud\ribbon.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_lib\mswud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c | # ADD BASE CPP /nologo /FD /MDd /Zi /Fdvc_mswud\ribbon.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_lib\mswud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c | ||||||
| # ADD CPP /nologo /FD /MDd /Zi /Fdvc_mswud\ribbon.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_lib\mswud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c | # ADD CPP /nologo /FD /MDd /Zi /Fdvc_mswud\ribbon.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_lib\mswud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c | ||||||
| # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 | # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 | ||||||
| # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 | # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 | ||||||
| # ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswud" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH | # ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswud" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH | ||||||
| # ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswud" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH | # ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswud" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH | ||||||
| BSC32=bscmake.exe | BSC32=bscmake.exe | ||||||
| # ADD BASE BSC32 /nologo | # ADD BASE BSC32 /nologo | ||||||
| # ADD BSC32 /nologo | # ADD BSC32 /nologo | ||||||
|   | |||||||
| @@ -3,32 +3,32 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ribbon", "ribbon_vc7.vcproj | |||||||
| EndProject | EndProject | ||||||
| Global | Global | ||||||
| 	GlobalSection(SolutionConfigurationPlatforms) = preSolution | 	GlobalSection(SolutionConfigurationPlatforms) = preSolution | ||||||
| 		DLL Universal Release|Win32 = DLL Universal Release|Win32 |  | ||||||
| 		DLL Universal Debug|Win32 = DLL Universal Debug|Win32 |  | ||||||
| 		DLL Release|Win32 = DLL Release|Win32 |  | ||||||
| 		DLL Debug|Win32 = DLL Debug|Win32 |  | ||||||
| 		Universal Release|Win32 = Universal Release|Win32 |  | ||||||
| 		Universal Debug|Win32 = Universal Debug|Win32 |  | ||||||
| 		Release|Win32 = Release|Win32 |  | ||||||
| 		Debug|Win32 = Debug|Win32 | 		Debug|Win32 = Debug|Win32 | ||||||
|  | 		Release|Win32 = Release|Win32 | ||||||
|  | 		Universal Debug|Win32 = Universal Debug|Win32 | ||||||
|  | 		Universal Release|Win32 = Universal Release|Win32 | ||||||
|  | 		DLL Debug|Win32 = DLL Debug|Win32 | ||||||
|  | 		DLL Release|Win32 = DLL Release|Win32 | ||||||
|  | 		DLL Universal Debug|Win32 = DLL Universal Debug|Win32 | ||||||
|  | 		DLL Universal Release|Win32 = DLL Universal Release|Win32 | ||||||
| 	EndGlobalSection | 	EndGlobalSection | ||||||
| 	GlobalSection(ProjectConfigurationPlatforms) = postSolution | 	GlobalSection(ProjectConfigurationPlatforms) = postSolution | ||||||
| 		{717E754A-A748-5A81-AA86-AA4640D51560}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 |  | ||||||
| 		{717E754A-A748-5A81-AA86-AA4640D51560}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 |  | ||||||
| 		{717E754A-A748-5A81-AA86-AA4640D51560}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 |  | ||||||
| 		{717E754A-A748-5A81-AA86-AA4640D51560}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 |  | ||||||
| 		{717E754A-A748-5A81-AA86-AA4640D51560}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 |  | ||||||
| 		{717E754A-A748-5A81-AA86-AA4640D51560}.DLL Release|Win32.Build.0 = DLL Release|Win32 |  | ||||||
| 		{717E754A-A748-5A81-AA86-AA4640D51560}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 |  | ||||||
| 		{717E754A-A748-5A81-AA86-AA4640D51560}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 |  | ||||||
| 		{717E754A-A748-5A81-AA86-AA4640D51560}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 |  | ||||||
| 		{717E754A-A748-5A81-AA86-AA4640D51560}.Universal Release|Win32.Build.0 = Universal Release|Win32 |  | ||||||
| 		{717E754A-A748-5A81-AA86-AA4640D51560}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 |  | ||||||
| 		{717E754A-A748-5A81-AA86-AA4640D51560}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 |  | ||||||
| 		{717E754A-A748-5A81-AA86-AA4640D51560}.Release|Win32.ActiveCfg = Release|Win32 |  | ||||||
| 		{717E754A-A748-5A81-AA86-AA4640D51560}.Release|Win32.Build.0 = Release|Win32 |  | ||||||
| 		{717E754A-A748-5A81-AA86-AA4640D51560}.Debug|Win32.ActiveCfg = Debug|Win32 | 		{717E754A-A748-5A81-AA86-AA4640D51560}.Debug|Win32.ActiveCfg = Debug|Win32 | ||||||
| 		{717E754A-A748-5A81-AA86-AA4640D51560}.Debug|Win32.Build.0 = Debug|Win32 | 		{717E754A-A748-5A81-AA86-AA4640D51560}.Debug|Win32.Build.0 = Debug|Win32 | ||||||
|  | 		{717E754A-A748-5A81-AA86-AA4640D51560}.Release|Win32.ActiveCfg = Release|Win32 | ||||||
|  | 		{717E754A-A748-5A81-AA86-AA4640D51560}.Release|Win32.Build.0 = Release|Win32 | ||||||
|  | 		{717E754A-A748-5A81-AA86-AA4640D51560}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 | ||||||
|  | 		{717E754A-A748-5A81-AA86-AA4640D51560}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 | ||||||
|  | 		{717E754A-A748-5A81-AA86-AA4640D51560}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 | ||||||
|  | 		{717E754A-A748-5A81-AA86-AA4640D51560}.Universal Release|Win32.Build.0 = Universal Release|Win32 | ||||||
|  | 		{717E754A-A748-5A81-AA86-AA4640D51560}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 | ||||||
|  | 		{717E754A-A748-5A81-AA86-AA4640D51560}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 | ||||||
|  | 		{717E754A-A748-5A81-AA86-AA4640D51560}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 | ||||||
|  | 		{717E754A-A748-5A81-AA86-AA4640D51560}.DLL Release|Win32.Build.0 = DLL Release|Win32 | ||||||
|  | 		{717E754A-A748-5A81-AA86-AA4640D51560}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 | ||||||
|  | 		{717E754A-A748-5A81-AA86-AA4640D51560}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 | ||||||
|  | 		{717E754A-A748-5A81-AA86-AA4640D51560}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 | ||||||
|  | 		{717E754A-A748-5A81-AA86-AA4640D51560}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 | ||||||
| 	EndGlobalSection | 	EndGlobalSection | ||||||
| 	GlobalSection(SolutionProperties) = preSolution | 	GlobalSection(SolutionProperties) = preSolution | ||||||
| 		HideSolutionNode = FALSE | 		HideSolutionNode = FALSE | ||||||
|   | |||||||
| @@ -1,8 +1,8 @@ | |||||||
| <?xml version="1.0" encoding="Windows-1252"?> | <?xml version="1.0" encoding="Windows-1252"?> | ||||||
| <!-- | <!-- | ||||||
|  |  | ||||||
|   This makefile was generated by |   This project was generated by | ||||||
|   Bakefile 0.2.5 (http://www.bakefile.org) |   Bakefile 0.2.6 (http://www.bakefile.org) | ||||||
|   Do not modify, all changes will be overwritten! |   Do not modify, all changes will be overwritten! | ||||||
|  |  | ||||||
| --> | --> | ||||||
| @@ -17,70 +17,9 @@ | |||||||
| 	</Platforms> | 	</Platforms> | ||||||
| 	<Configurations> | 	<Configurations> | ||||||
| 		<Configuration | 		<Configuration | ||||||
| 			Name="DLL Universal Release|Win32" | 			Name="Debug|Win32" | ||||||
| 			OutputDirectory="vc_mswunivudll" | 			OutputDirectory="vc_mswud" | ||||||
| 			IntermediateDirectory="vc_mswunivudll\ribbon" | 			IntermediateDirectory="vc_mswud\ribbon" | ||||||
| 			ConfigurationType="1" |  | ||||||
| 			UseOfMFC="0" |  | ||||||
| 			ATLMinimizesCRunTimeLibraryUsage="FALSE" |  | ||||||
| 			CharacterSet="1"> |  | ||||||
| 			<Tool |  | ||||||
| 				Name="VCCLCompilerTool" |  | ||||||
| 				Optimization="2" |  | ||||||
| 				AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples" |  | ||||||
| 				PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" |  | ||||||
| 				ExceptionHandling="TRUE" |  | ||||||
| 				RuntimeLibrary="2" |  | ||||||
| 				RuntimeTypeInfo="TRUE" |  | ||||||
| 				AssemblerListingLocation="vc_mswunivudll\ribbon\" |  | ||||||
| 				ObjectFile="vc_mswunivudll\ribbon\" |  | ||||||
| 				ProgramDataBaseFileName="vc_mswunivudll\ribbon.pdb" |  | ||||||
| 				WarningLevel="4" |  | ||||||
| 				SuppressStartupBanner="TRUE" |  | ||||||
| 				Detect64BitPortabilityProblems="TRUE" |  | ||||||
| 				DebugInformationFormat="3"/> |  | ||||||
| 			<Tool |  | ||||||
| 				Name="VCCustomBuildTool"/> |  | ||||||
| 			<Tool |  | ||||||
| 				Name="VCLinkerTool" |  | ||||||
| 				AdditionalOptions="" |  | ||||||
| 				AdditionalDependencies="wxmswuniv29u_ribbon.lib  wxmswuniv29u_adv.lib  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 wininet.lib" |  | ||||||
| 				OutputFile="vc_mswunivudll\ribbon.exe" |  | ||||||
| 				LinkIncremental="2" |  | ||||||
| 				SuppressStartupBanner="TRUE" |  | ||||||
| 				AdditionalLibraryDirectories=".\..\..\lib\vc_dll" |  | ||||||
| 				GenerateDebugInformation="TRUE" |  | ||||||
| 				ProgramDatabaseFile="vc_mswunivudll\ribbon.pdb" |  | ||||||
| 				SubSystem="2" |  | ||||||
| 				TargetMachine="1"/> |  | ||||||
| 			<Tool |  | ||||||
| 				Name="VCMIDLTool"/> |  | ||||||
| 			<Tool |  | ||||||
| 				Name="VCPostBuildEventTool"/> |  | ||||||
| 			<Tool |  | ||||||
| 				Name="VCPreBuildEventTool"/> |  | ||||||
| 			<Tool |  | ||||||
| 				Name="VCPreLinkEventTool"/> |  | ||||||
| 			<Tool |  | ||||||
| 				Name="VCResourceCompilerTool" |  | ||||||
| 				PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" |  | ||||||
| 				Culture="1033" |  | ||||||
| 				AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> |  | ||||||
| 			<Tool |  | ||||||
| 				Name="VCWebServiceProxyGeneratorTool"/> |  | ||||||
| 			<Tool |  | ||||||
| 				Name="VCXMLDataGeneratorTool"/> |  | ||||||
| 			<Tool |  | ||||||
| 				Name="VCWebDeploymentTool"/> |  | ||||||
| 			<Tool |  | ||||||
| 				Name="VCManagedWrapperGeneratorTool"/> |  | ||||||
| 			<Tool |  | ||||||
| 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/> |  | ||||||
| 		</Configuration> |  | ||||||
| 		<Configuration |  | ||||||
| 			Name="DLL Universal Debug|Win32" |  | ||||||
| 			OutputDirectory="vc_mswunivuddll" |  | ||||||
| 			IntermediateDirectory="vc_mswunivuddll\ribbon" |  | ||||||
| 			ConfigurationType="1" | 			ConfigurationType="1" | ||||||
| 			UseOfMFC="0" | 			UseOfMFC="0" | ||||||
| 			ATLMinimizesCRunTimeLibraryUsage="FALSE" | 			ATLMinimizesCRunTimeLibraryUsage="FALSE" | ||||||
| @@ -88,142 +27,16 @@ | |||||||
| 			<Tool | 			<Tool | ||||||
| 				Name="VCCLCompilerTool" | 				Name="VCCLCompilerTool" | ||||||
| 				Optimization="0" | 				Optimization="0" | ||||||
| 				AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples" | 				AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples" | ||||||
| 				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" | 				PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH" | ||||||
| 				MinimalRebuild="TRUE" | 				MinimalRebuild="TRUE" | ||||||
| 				ExceptionHandling="TRUE" | 				ExceptionHandling="TRUE" | ||||||
| 				BasicRuntimeChecks="3" | 				BasicRuntimeChecks="3" | ||||||
| 				RuntimeLibrary="3" | 				RuntimeLibrary="3" | ||||||
| 				BufferSecurityCheck="TRUE" | 				BufferSecurityCheck="TRUE" | ||||||
| 				RuntimeTypeInfo="TRUE" | 				RuntimeTypeInfo="TRUE" | ||||||
| 				AssemblerListingLocation="vc_mswunivuddll\ribbon\" | 				ObjectFile="vc_mswud\ribbon\" | ||||||
| 				ObjectFile="vc_mswunivuddll\ribbon\" | 				ProgramDataBaseFileName="vc_mswud\ribbon.pdb" | ||||||
| 				ProgramDataBaseFileName="vc_mswunivuddll\ribbon.pdb" |  | ||||||
| 				WarningLevel="4" |  | ||||||
| 				SuppressStartupBanner="TRUE" |  | ||||||
| 				Detect64BitPortabilityProblems="TRUE" |  | ||||||
| 				DebugInformationFormat="3"/> |  | ||||||
| 			<Tool |  | ||||||
| 				Name="VCCustomBuildTool"/> |  | ||||||
| 			<Tool |  | ||||||
| 				Name="VCLinkerTool" |  | ||||||
| 				AdditionalOptions="" |  | ||||||
| 				AdditionalDependencies="wxmswuniv29ud_ribbon.lib  wxmswuniv29ud_adv.lib  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 wininet.lib" |  | ||||||
| 				OutputFile="vc_mswunivuddll\ribbon.exe" |  | ||||||
| 				LinkIncremental="2" |  | ||||||
| 				SuppressStartupBanner="TRUE" |  | ||||||
| 				AdditionalLibraryDirectories=".\..\..\lib\vc_dll" |  | ||||||
| 				GenerateDebugInformation="TRUE" |  | ||||||
| 				ProgramDatabaseFile="vc_mswunivuddll\ribbon.pdb" |  | ||||||
| 				SubSystem="2" |  | ||||||
| 				TargetMachine="1"/> |  | ||||||
| 			<Tool |  | ||||||
| 				Name="VCMIDLTool"/> |  | ||||||
| 			<Tool |  | ||||||
| 				Name="VCPostBuildEventTool"/> |  | ||||||
| 			<Tool |  | ||||||
| 				Name="VCPreBuildEventTool"/> |  | ||||||
| 			<Tool |  | ||||||
| 				Name="VCPreLinkEventTool"/> |  | ||||||
| 			<Tool |  | ||||||
| 				Name="VCResourceCompilerTool" |  | ||||||
| 				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" |  | ||||||
| 				Culture="1033" |  | ||||||
| 				AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> |  | ||||||
| 			<Tool |  | ||||||
| 				Name="VCWebServiceProxyGeneratorTool"/> |  | ||||||
| 			<Tool |  | ||||||
| 				Name="VCXMLDataGeneratorTool"/> |  | ||||||
| 			<Tool |  | ||||||
| 				Name="VCWebDeploymentTool"/> |  | ||||||
| 			<Tool |  | ||||||
| 				Name="VCManagedWrapperGeneratorTool"/> |  | ||||||
| 			<Tool |  | ||||||
| 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/> |  | ||||||
| 		</Configuration> |  | ||||||
| 		<Configuration |  | ||||||
| 			Name="DLL Release|Win32" |  | ||||||
| 			OutputDirectory="vc_mswudll" |  | ||||||
| 			IntermediateDirectory="vc_mswudll\ribbon" |  | ||||||
| 			ConfigurationType="1" |  | ||||||
| 			UseOfMFC="0" |  | ||||||
| 			ATLMinimizesCRunTimeLibraryUsage="FALSE" |  | ||||||
| 			CharacterSet="1"> |  | ||||||
| 			<Tool |  | ||||||
| 				Name="VCCLCompilerTool" |  | ||||||
| 				Optimization="2" |  | ||||||
| 				AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples" |  | ||||||
| 				PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" |  | ||||||
| 				ExceptionHandling="TRUE" |  | ||||||
| 				RuntimeLibrary="2" |  | ||||||
| 				RuntimeTypeInfo="TRUE" |  | ||||||
| 				AssemblerListingLocation="vc_mswudll\ribbon\" |  | ||||||
| 				ObjectFile="vc_mswudll\ribbon\" |  | ||||||
| 				ProgramDataBaseFileName="vc_mswudll\ribbon.pdb" |  | ||||||
| 				WarningLevel="4" |  | ||||||
| 				SuppressStartupBanner="TRUE" |  | ||||||
| 				Detect64BitPortabilityProblems="TRUE" |  | ||||||
| 				DebugInformationFormat="3"/> |  | ||||||
| 			<Tool |  | ||||||
| 				Name="VCCustomBuildTool"/> |  | ||||||
| 			<Tool |  | ||||||
| 				Name="VCLinkerTool" |  | ||||||
| 				AdditionalOptions="" |  | ||||||
| 				AdditionalDependencies="wxmsw29u_ribbon.lib  wxmsw29u_adv.lib  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 wininet.lib" |  | ||||||
| 				OutputFile="vc_mswudll\ribbon.exe" |  | ||||||
| 				LinkIncremental="2" |  | ||||||
| 				SuppressStartupBanner="TRUE" |  | ||||||
| 				AdditionalLibraryDirectories=".\..\..\lib\vc_dll" |  | ||||||
| 				GenerateDebugInformation="TRUE" |  | ||||||
| 				ProgramDatabaseFile="vc_mswudll\ribbon.pdb" |  | ||||||
| 				SubSystem="2" |  | ||||||
| 				TargetMachine="1"/> |  | ||||||
| 			<Tool |  | ||||||
| 				Name="VCMIDLTool"/> |  | ||||||
| 			<Tool |  | ||||||
| 				Name="VCPostBuildEventTool"/> |  | ||||||
| 			<Tool |  | ||||||
| 				Name="VCPreBuildEventTool"/> |  | ||||||
| 			<Tool |  | ||||||
| 				Name="VCPreLinkEventTool"/> |  | ||||||
| 			<Tool |  | ||||||
| 				Name="VCResourceCompilerTool" |  | ||||||
| 				PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" |  | ||||||
| 				Culture="1033" |  | ||||||
| 				AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> |  | ||||||
| 			<Tool |  | ||||||
| 				Name="VCWebServiceProxyGeneratorTool"/> |  | ||||||
| 			<Tool |  | ||||||
| 				Name="VCXMLDataGeneratorTool"/> |  | ||||||
| 			<Tool |  | ||||||
| 				Name="VCWebDeploymentTool"/> |  | ||||||
| 			<Tool |  | ||||||
| 				Name="VCManagedWrapperGeneratorTool"/> |  | ||||||
| 			<Tool |  | ||||||
| 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/> |  | ||||||
| 		</Configuration> |  | ||||||
| 		<Configuration |  | ||||||
| 			Name="DLL Debug|Win32" |  | ||||||
| 			OutputDirectory="vc_mswuddll" |  | ||||||
| 			IntermediateDirectory="vc_mswuddll\ribbon" |  | ||||||
| 			ConfigurationType="1" |  | ||||||
| 			UseOfMFC="0" |  | ||||||
| 			ATLMinimizesCRunTimeLibraryUsage="FALSE" |  | ||||||
| 			CharacterSet="1"> |  | ||||||
| 			<Tool |  | ||||||
| 				Name="VCCLCompilerTool" |  | ||||||
| 				Optimization="0" |  | ||||||
| 				AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples" |  | ||||||
| 				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" |  | ||||||
| 				MinimalRebuild="TRUE" |  | ||||||
| 				ExceptionHandling="TRUE" |  | ||||||
| 				BasicRuntimeChecks="3" |  | ||||||
| 				RuntimeLibrary="3" |  | ||||||
| 				BufferSecurityCheck="TRUE" |  | ||||||
| 				RuntimeTypeInfo="TRUE" |  | ||||||
| 				AssemblerListingLocation="vc_mswuddll\ribbon\" |  | ||||||
| 				ObjectFile="vc_mswuddll\ribbon\" |  | ||||||
| 				ProgramDataBaseFileName="vc_mswuddll\ribbon.pdb" |  | ||||||
| 				WarningLevel="4" | 				WarningLevel="4" | ||||||
| 				SuppressStartupBanner="TRUE" | 				SuppressStartupBanner="TRUE" | ||||||
| 				Detect64BitPortabilityProblems="TRUE" | 				Detect64BitPortabilityProblems="TRUE" | ||||||
| @@ -234,77 +47,18 @@ | |||||||
| 				Name="VCLinkerTool" | 				Name="VCLinkerTool" | ||||||
| 				AdditionalOptions="" | 				AdditionalOptions="" | ||||||
| 				AdditionalDependencies="wxmsw29ud_ribbon.lib  wxmsw29ud_adv.lib  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 wininet.lib" | 				AdditionalDependencies="wxmsw29ud_ribbon.lib  wxmsw29ud_adv.lib  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 wininet.lib" | ||||||
| 				OutputFile="vc_mswuddll\ribbon.exe" | 				OutputFile="vc_mswud\ribbon.exe" | ||||||
| 				LinkIncremental="2" |  | ||||||
| 				SuppressStartupBanner="TRUE" |  | ||||||
| 				AdditionalLibraryDirectories=".\..\..\lib\vc_dll" |  | ||||||
| 				GenerateDebugInformation="TRUE" |  | ||||||
| 				ProgramDatabaseFile="vc_mswuddll\ribbon.pdb" |  | ||||||
| 				SubSystem="2" |  | ||||||
| 				TargetMachine="1"/> |  | ||||||
| 			<Tool |  | ||||||
| 				Name="VCMIDLTool"/> |  | ||||||
| 			<Tool |  | ||||||
| 				Name="VCPostBuildEventTool"/> |  | ||||||
| 			<Tool |  | ||||||
| 				Name="VCPreBuildEventTool"/> |  | ||||||
| 			<Tool |  | ||||||
| 				Name="VCPreLinkEventTool"/> |  | ||||||
| 			<Tool |  | ||||||
| 				Name="VCResourceCompilerTool" |  | ||||||
| 				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" |  | ||||||
| 				Culture="1033" |  | ||||||
| 				AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> |  | ||||||
| 			<Tool |  | ||||||
| 				Name="VCWebServiceProxyGeneratorTool"/> |  | ||||||
| 			<Tool |  | ||||||
| 				Name="VCXMLDataGeneratorTool"/> |  | ||||||
| 			<Tool |  | ||||||
| 				Name="VCWebDeploymentTool"/> |  | ||||||
| 			<Tool |  | ||||||
| 				Name="VCManagedWrapperGeneratorTool"/> |  | ||||||
| 			<Tool |  | ||||||
| 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/> |  | ||||||
| 		</Configuration> |  | ||||||
| 		<Configuration |  | ||||||
| 			Name="Universal Release|Win32" |  | ||||||
| 			OutputDirectory="vc_mswunivu" |  | ||||||
| 			IntermediateDirectory="vc_mswunivu\ribbon" |  | ||||||
| 			ConfigurationType="1" |  | ||||||
| 			UseOfMFC="0" |  | ||||||
| 			ATLMinimizesCRunTimeLibraryUsage="FALSE" |  | ||||||
| 			CharacterSet="1"> |  | ||||||
| 			<Tool |  | ||||||
| 				Name="VCCLCompilerTool" |  | ||||||
| 				Optimization="2" |  | ||||||
| 				AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples" |  | ||||||
| 				PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH" |  | ||||||
| 				ExceptionHandling="TRUE" |  | ||||||
| 				RuntimeLibrary="2" |  | ||||||
| 				RuntimeTypeInfo="TRUE" |  | ||||||
| 				AssemblerListingLocation="vc_mswunivu\ribbon\" |  | ||||||
| 				ObjectFile="vc_mswunivu\ribbon\" |  | ||||||
| 				ProgramDataBaseFileName="vc_mswunivu\ribbon.pdb" |  | ||||||
| 				WarningLevel="4" |  | ||||||
| 				SuppressStartupBanner="TRUE" |  | ||||||
| 				Detect64BitPortabilityProblems="TRUE" |  | ||||||
| 				DebugInformationFormat="3"/> |  | ||||||
| 			<Tool |  | ||||||
| 				Name="VCCustomBuildTool"/> |  | ||||||
| 			<Tool |  | ||||||
| 				Name="VCLinkerTool" |  | ||||||
| 				AdditionalOptions="" |  | ||||||
| 				AdditionalDependencies="wxmswuniv29u_ribbon.lib  wxmswuniv29u_adv.lib  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 wininet.lib" |  | ||||||
| 				OutputFile="vc_mswunivu\ribbon.exe" |  | ||||||
| 				LinkIncremental="2" | 				LinkIncremental="2" | ||||||
| 				SuppressStartupBanner="TRUE" | 				SuppressStartupBanner="TRUE" | ||||||
| 				AdditionalLibraryDirectories=".\..\..\lib\vc_lib" | 				AdditionalLibraryDirectories=".\..\..\lib\vc_lib" | ||||||
| 				GenerateDebugInformation="TRUE" | 				GenerateDebugInformation="TRUE" | ||||||
| 				ProgramDatabaseFile="vc_mswunivu\ribbon.pdb" | 				ProgramDatabaseFile="vc_mswud\ribbon.pdb" | ||||||
| 				SubSystem="2" | 				SubSystem="2" | ||||||
| 				TargetMachine="1"/> | 				TargetMachine="1"/> | ||||||
| 			<Tool | 			<Tool | ||||||
| 				Name="VCMIDLTool"/> | 				Name="VCMIDLTool" | ||||||
|  | 				PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH" | ||||||
|  | 				AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> | ||||||
| 			<Tool | 			<Tool | ||||||
| 				Name="VCPostBuildEventTool"/> | 				Name="VCPostBuildEventTool"/> | ||||||
| 			<Tool | 			<Tool | ||||||
| @@ -313,73 +67,9 @@ | |||||||
| 				Name="VCPreLinkEventTool"/> | 				Name="VCPreLinkEventTool"/> | ||||||
| 			<Tool | 			<Tool | ||||||
| 				Name="VCResourceCompilerTool" | 				Name="VCResourceCompilerTool" | ||||||
| 				PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH" | 				PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH" | ||||||
| 				Culture="1033" | 				Culture="1033" | ||||||
| 				AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> | 				AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> | ||||||
| 			<Tool |  | ||||||
| 				Name="VCWebServiceProxyGeneratorTool"/> |  | ||||||
| 			<Tool |  | ||||||
| 				Name="VCXMLDataGeneratorTool"/> |  | ||||||
| 			<Tool |  | ||||||
| 				Name="VCWebDeploymentTool"/> |  | ||||||
| 			<Tool |  | ||||||
| 				Name="VCManagedWrapperGeneratorTool"/> |  | ||||||
| 			<Tool |  | ||||||
| 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/> |  | ||||||
| 		</Configuration> |  | ||||||
| 		<Configuration |  | ||||||
| 			Name="Universal Debug|Win32" |  | ||||||
| 			OutputDirectory="vc_mswunivud" |  | ||||||
| 			IntermediateDirectory="vc_mswunivud\ribbon" |  | ||||||
| 			ConfigurationType="1" |  | ||||||
| 			UseOfMFC="0" |  | ||||||
| 			ATLMinimizesCRunTimeLibraryUsage="FALSE" |  | ||||||
| 			CharacterSet="1"> |  | ||||||
| 			<Tool |  | ||||||
| 				Name="VCCLCompilerTool" |  | ||||||
| 				Optimization="0" |  | ||||||
| 				AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples" |  | ||||||
| 				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" |  | ||||||
| 				MinimalRebuild="TRUE" |  | ||||||
| 				ExceptionHandling="TRUE" |  | ||||||
| 				BasicRuntimeChecks="3" |  | ||||||
| 				RuntimeLibrary="3" |  | ||||||
| 				BufferSecurityCheck="TRUE" |  | ||||||
| 				RuntimeTypeInfo="TRUE" |  | ||||||
| 				AssemblerListingLocation="vc_mswunivud\ribbon\" |  | ||||||
| 				ObjectFile="vc_mswunivud\ribbon\" |  | ||||||
| 				ProgramDataBaseFileName="vc_mswunivud\ribbon.pdb" |  | ||||||
| 				WarningLevel="4" |  | ||||||
| 				SuppressStartupBanner="TRUE" |  | ||||||
| 				Detect64BitPortabilityProblems="TRUE" |  | ||||||
| 				DebugInformationFormat="3"/> |  | ||||||
| 			<Tool |  | ||||||
| 				Name="VCCustomBuildTool"/> |  | ||||||
| 			<Tool |  | ||||||
| 				Name="VCLinkerTool" |  | ||||||
| 				AdditionalOptions="" |  | ||||||
| 				AdditionalDependencies="wxmswuniv29ud_ribbon.lib  wxmswuniv29ud_adv.lib  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 wininet.lib" |  | ||||||
| 				OutputFile="vc_mswunivud\ribbon.exe" |  | ||||||
| 				LinkIncremental="2" |  | ||||||
| 				SuppressStartupBanner="TRUE" |  | ||||||
| 				AdditionalLibraryDirectories=".\..\..\lib\vc_lib" |  | ||||||
| 				GenerateDebugInformation="TRUE" |  | ||||||
| 				ProgramDatabaseFile="vc_mswunivud\ribbon.pdb" |  | ||||||
| 				SubSystem="2" |  | ||||||
| 				TargetMachine="1"/> |  | ||||||
| 			<Tool |  | ||||||
| 				Name="VCMIDLTool"/> |  | ||||||
| 			<Tool |  | ||||||
| 				Name="VCPostBuildEventTool"/> |  | ||||||
| 			<Tool |  | ||||||
| 				Name="VCPreBuildEventTool"/> |  | ||||||
| 			<Tool |  | ||||||
| 				Name="VCPreLinkEventTool"/> |  | ||||||
| 			<Tool |  | ||||||
| 				Name="VCResourceCompilerTool" |  | ||||||
| 				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" |  | ||||||
| 				Culture="1033" |  | ||||||
| 				AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> |  | ||||||
| 			<Tool | 			<Tool | ||||||
| 				Name="VCWebServiceProxyGeneratorTool"/> | 				Name="VCWebServiceProxyGeneratorTool"/> | ||||||
| 			<Tool | 			<Tool | ||||||
| @@ -403,11 +93,10 @@ | |||||||
| 				Name="VCCLCompilerTool" | 				Name="VCCLCompilerTool" | ||||||
| 				Optimization="2" | 				Optimization="2" | ||||||
| 				AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples" | 				AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples" | ||||||
| 				PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH" | 				PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH" | ||||||
| 				ExceptionHandling="TRUE" | 				ExceptionHandling="TRUE" | ||||||
| 				RuntimeLibrary="2" | 				RuntimeLibrary="2" | ||||||
| 				RuntimeTypeInfo="TRUE" | 				RuntimeTypeInfo="TRUE" | ||||||
| 				AssemblerListingLocation="vc_mswu\ribbon\" |  | ||||||
| 				ObjectFile="vc_mswu\ribbon\" | 				ObjectFile="vc_mswu\ribbon\" | ||||||
| 				ProgramDataBaseFileName="vc_mswu\ribbon.pdb" | 				ProgramDataBaseFileName="vc_mswu\ribbon.pdb" | ||||||
| 				WarningLevel="4" | 				WarningLevel="4" | ||||||
| @@ -429,7 +118,9 @@ | |||||||
| 				SubSystem="2" | 				SubSystem="2" | ||||||
| 				TargetMachine="1"/> | 				TargetMachine="1"/> | ||||||
| 			<Tool | 			<Tool | ||||||
| 				Name="VCMIDLTool"/> | 				Name="VCMIDLTool" | ||||||
|  | 				PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH" | ||||||
|  | 				AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> | ||||||
| 			<Tool | 			<Tool | ||||||
| 				Name="VCPostBuildEventTool"/> | 				Name="VCPostBuildEventTool"/> | ||||||
| 			<Tool | 			<Tool | ||||||
| @@ -453,9 +144,9 @@ | |||||||
| 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/> | 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/> | ||||||
| 		</Configuration> | 		</Configuration> | ||||||
| 		<Configuration | 		<Configuration | ||||||
| 			Name="Debug|Win32" | 			Name="Universal Debug|Win32" | ||||||
| 			OutputDirectory="vc_mswud" | 			OutputDirectory="vc_mswunivud" | ||||||
| 			IntermediateDirectory="vc_mswud\ribbon" | 			IntermediateDirectory="vc_mswunivud\ribbon" | ||||||
| 			ConfigurationType="1" | 			ConfigurationType="1" | ||||||
| 			UseOfMFC="0" | 			UseOfMFC="0" | ||||||
| 			ATLMinimizesCRunTimeLibraryUsage="FALSE" | 			ATLMinimizesCRunTimeLibraryUsage="FALSE" | ||||||
| @@ -463,17 +154,143 @@ | |||||||
| 			<Tool | 			<Tool | ||||||
| 				Name="VCCLCompilerTool" | 				Name="VCCLCompilerTool" | ||||||
| 				Optimization="0" | 				Optimization="0" | ||||||
| 				AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples" | 				AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples" | ||||||
| 				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" | 				PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH" | ||||||
| 				MinimalRebuild="TRUE" | 				MinimalRebuild="TRUE" | ||||||
| 				ExceptionHandling="TRUE" | 				ExceptionHandling="TRUE" | ||||||
| 				BasicRuntimeChecks="3" | 				BasicRuntimeChecks="3" | ||||||
| 				RuntimeLibrary="3" | 				RuntimeLibrary="3" | ||||||
| 				BufferSecurityCheck="TRUE" | 				BufferSecurityCheck="TRUE" | ||||||
| 				RuntimeTypeInfo="TRUE" | 				RuntimeTypeInfo="TRUE" | ||||||
| 				AssemblerListingLocation="vc_mswud\ribbon\" | 				ObjectFile="vc_mswunivud\ribbon\" | ||||||
| 				ObjectFile="vc_mswud\ribbon\" | 				ProgramDataBaseFileName="vc_mswunivud\ribbon.pdb" | ||||||
| 				ProgramDataBaseFileName="vc_mswud\ribbon.pdb" | 				WarningLevel="4" | ||||||
|  | 				SuppressStartupBanner="TRUE" | ||||||
|  | 				Detect64BitPortabilityProblems="TRUE" | ||||||
|  | 				DebugInformationFormat="3"/> | ||||||
|  | 			<Tool | ||||||
|  | 				Name="VCCustomBuildTool"/> | ||||||
|  | 			<Tool | ||||||
|  | 				Name="VCLinkerTool" | ||||||
|  | 				AdditionalOptions="" | ||||||
|  | 				AdditionalDependencies="wxmswuniv29ud_ribbon.lib  wxmswuniv29ud_adv.lib  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 wininet.lib" | ||||||
|  | 				OutputFile="vc_mswunivud\ribbon.exe" | ||||||
|  | 				LinkIncremental="2" | ||||||
|  | 				SuppressStartupBanner="TRUE" | ||||||
|  | 				AdditionalLibraryDirectories=".\..\..\lib\vc_lib" | ||||||
|  | 				GenerateDebugInformation="TRUE" | ||||||
|  | 				ProgramDatabaseFile="vc_mswunivud\ribbon.pdb" | ||||||
|  | 				SubSystem="2" | ||||||
|  | 				TargetMachine="1"/> | ||||||
|  | 			<Tool | ||||||
|  | 				Name="VCMIDLTool" | ||||||
|  | 				PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH" | ||||||
|  | 				AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> | ||||||
|  | 			<Tool | ||||||
|  | 				Name="VCPostBuildEventTool"/> | ||||||
|  | 			<Tool | ||||||
|  | 				Name="VCPreBuildEventTool"/> | ||||||
|  | 			<Tool | ||||||
|  | 				Name="VCPreLinkEventTool"/> | ||||||
|  | 			<Tool | ||||||
|  | 				Name="VCResourceCompilerTool" | ||||||
|  | 				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH" | ||||||
|  | 				Culture="1033" | ||||||
|  | 				AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> | ||||||
|  | 			<Tool | ||||||
|  | 				Name="VCWebServiceProxyGeneratorTool"/> | ||||||
|  | 			<Tool | ||||||
|  | 				Name="VCXMLDataGeneratorTool"/> | ||||||
|  | 			<Tool | ||||||
|  | 				Name="VCWebDeploymentTool"/> | ||||||
|  | 			<Tool | ||||||
|  | 				Name="VCManagedWrapperGeneratorTool"/> | ||||||
|  | 			<Tool | ||||||
|  | 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/> | ||||||
|  | 		</Configuration> | ||||||
|  | 		<Configuration | ||||||
|  | 			Name="Universal Release|Win32" | ||||||
|  | 			OutputDirectory="vc_mswunivu" | ||||||
|  | 			IntermediateDirectory="vc_mswunivu\ribbon" | ||||||
|  | 			ConfigurationType="1" | ||||||
|  | 			UseOfMFC="0" | ||||||
|  | 			ATLMinimizesCRunTimeLibraryUsage="FALSE" | ||||||
|  | 			CharacterSet="1"> | ||||||
|  | 			<Tool | ||||||
|  | 				Name="VCCLCompilerTool" | ||||||
|  | 				Optimization="2" | ||||||
|  | 				AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples" | ||||||
|  | 				PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH" | ||||||
|  | 				ExceptionHandling="TRUE" | ||||||
|  | 				RuntimeLibrary="2" | ||||||
|  | 				RuntimeTypeInfo="TRUE" | ||||||
|  | 				ObjectFile="vc_mswunivu\ribbon\" | ||||||
|  | 				ProgramDataBaseFileName="vc_mswunivu\ribbon.pdb" | ||||||
|  | 				WarningLevel="4" | ||||||
|  | 				SuppressStartupBanner="TRUE" | ||||||
|  | 				Detect64BitPortabilityProblems="TRUE" | ||||||
|  | 				DebugInformationFormat="3"/> | ||||||
|  | 			<Tool | ||||||
|  | 				Name="VCCustomBuildTool"/> | ||||||
|  | 			<Tool | ||||||
|  | 				Name="VCLinkerTool" | ||||||
|  | 				AdditionalOptions="" | ||||||
|  | 				AdditionalDependencies="wxmswuniv29u_ribbon.lib  wxmswuniv29u_adv.lib  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 wininet.lib" | ||||||
|  | 				OutputFile="vc_mswunivu\ribbon.exe" | ||||||
|  | 				LinkIncremental="2" | ||||||
|  | 				SuppressStartupBanner="TRUE" | ||||||
|  | 				AdditionalLibraryDirectories=".\..\..\lib\vc_lib" | ||||||
|  | 				GenerateDebugInformation="TRUE" | ||||||
|  | 				ProgramDatabaseFile="vc_mswunivu\ribbon.pdb" | ||||||
|  | 				SubSystem="2" | ||||||
|  | 				TargetMachine="1"/> | ||||||
|  | 			<Tool | ||||||
|  | 				Name="VCMIDLTool" | ||||||
|  | 				PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH" | ||||||
|  | 				AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> | ||||||
|  | 			<Tool | ||||||
|  | 				Name="VCPostBuildEventTool"/> | ||||||
|  | 			<Tool | ||||||
|  | 				Name="VCPreBuildEventTool"/> | ||||||
|  | 			<Tool | ||||||
|  | 				Name="VCPreLinkEventTool"/> | ||||||
|  | 			<Tool | ||||||
|  | 				Name="VCResourceCompilerTool" | ||||||
|  | 				PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH" | ||||||
|  | 				Culture="1033" | ||||||
|  | 				AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> | ||||||
|  | 			<Tool | ||||||
|  | 				Name="VCWebServiceProxyGeneratorTool"/> | ||||||
|  | 			<Tool | ||||||
|  | 				Name="VCXMLDataGeneratorTool"/> | ||||||
|  | 			<Tool | ||||||
|  | 				Name="VCWebDeploymentTool"/> | ||||||
|  | 			<Tool | ||||||
|  | 				Name="VCManagedWrapperGeneratorTool"/> | ||||||
|  | 			<Tool | ||||||
|  | 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/> | ||||||
|  | 		</Configuration> | ||||||
|  | 		<Configuration | ||||||
|  | 			Name="DLL Debug|Win32" | ||||||
|  | 			OutputDirectory="vc_mswuddll" | ||||||
|  | 			IntermediateDirectory="vc_mswuddll\ribbon" | ||||||
|  | 			ConfigurationType="1" | ||||||
|  | 			UseOfMFC="0" | ||||||
|  | 			ATLMinimizesCRunTimeLibraryUsage="FALSE" | ||||||
|  | 			CharacterSet="1"> | ||||||
|  | 			<Tool | ||||||
|  | 				Name="VCCLCompilerTool" | ||||||
|  | 				Optimization="0" | ||||||
|  | 				AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples" | ||||||
|  | 				PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" | ||||||
|  | 				MinimalRebuild="TRUE" | ||||||
|  | 				ExceptionHandling="TRUE" | ||||||
|  | 				BasicRuntimeChecks="3" | ||||||
|  | 				RuntimeLibrary="3" | ||||||
|  | 				BufferSecurityCheck="TRUE" | ||||||
|  | 				RuntimeTypeInfo="TRUE" | ||||||
|  | 				ObjectFile="vc_mswuddll\ribbon\" | ||||||
|  | 				ProgramDataBaseFileName="vc_mswuddll\ribbon.pdb" | ||||||
| 				WarningLevel="4" | 				WarningLevel="4" | ||||||
| 				SuppressStartupBanner="TRUE" | 				SuppressStartupBanner="TRUE" | ||||||
| 				Detect64BitPortabilityProblems="TRUE" | 				Detect64BitPortabilityProblems="TRUE" | ||||||
| @@ -484,16 +301,18 @@ | |||||||
| 				Name="VCLinkerTool" | 				Name="VCLinkerTool" | ||||||
| 				AdditionalOptions="" | 				AdditionalOptions="" | ||||||
| 				AdditionalDependencies="wxmsw29ud_ribbon.lib  wxmsw29ud_adv.lib  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 wininet.lib" | 				AdditionalDependencies="wxmsw29ud_ribbon.lib  wxmsw29ud_adv.lib  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 wininet.lib" | ||||||
| 				OutputFile="vc_mswud\ribbon.exe" | 				OutputFile="vc_mswuddll\ribbon.exe" | ||||||
| 				LinkIncremental="2" | 				LinkIncremental="2" | ||||||
| 				SuppressStartupBanner="TRUE" | 				SuppressStartupBanner="TRUE" | ||||||
| 				AdditionalLibraryDirectories=".\..\..\lib\vc_lib" | 				AdditionalLibraryDirectories=".\..\..\lib\vc_dll" | ||||||
| 				GenerateDebugInformation="TRUE" | 				GenerateDebugInformation="TRUE" | ||||||
| 				ProgramDatabaseFile="vc_mswud\ribbon.pdb" | 				ProgramDatabaseFile="vc_mswuddll\ribbon.pdb" | ||||||
| 				SubSystem="2" | 				SubSystem="2" | ||||||
| 				TargetMachine="1"/> | 				TargetMachine="1"/> | ||||||
| 			<Tool | 			<Tool | ||||||
| 				Name="VCMIDLTool"/> | 				Name="VCMIDLTool" | ||||||
|  | 				PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" | ||||||
|  | 				AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> | ||||||
| 			<Tool | 			<Tool | ||||||
| 				Name="VCPostBuildEventTool"/> | 				Name="VCPostBuildEventTool"/> | ||||||
| 			<Tool | 			<Tool | ||||||
| @@ -502,9 +321,198 @@ | |||||||
| 				Name="VCPreLinkEventTool"/> | 				Name="VCPreLinkEventTool"/> | ||||||
| 			<Tool | 			<Tool | ||||||
| 				Name="VCResourceCompilerTool" | 				Name="VCResourceCompilerTool" | ||||||
| 				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" | 				PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" | ||||||
| 				Culture="1033" | 				Culture="1033" | ||||||
| 				AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> | 				AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> | ||||||
|  | 			<Tool | ||||||
|  | 				Name="VCWebServiceProxyGeneratorTool"/> | ||||||
|  | 			<Tool | ||||||
|  | 				Name="VCXMLDataGeneratorTool"/> | ||||||
|  | 			<Tool | ||||||
|  | 				Name="VCWebDeploymentTool"/> | ||||||
|  | 			<Tool | ||||||
|  | 				Name="VCManagedWrapperGeneratorTool"/> | ||||||
|  | 			<Tool | ||||||
|  | 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/> | ||||||
|  | 		</Configuration> | ||||||
|  | 		<Configuration | ||||||
|  | 			Name="DLL Release|Win32" | ||||||
|  | 			OutputDirectory="vc_mswudll" | ||||||
|  | 			IntermediateDirectory="vc_mswudll\ribbon" | ||||||
|  | 			ConfigurationType="1" | ||||||
|  | 			UseOfMFC="0" | ||||||
|  | 			ATLMinimizesCRunTimeLibraryUsage="FALSE" | ||||||
|  | 			CharacterSet="1"> | ||||||
|  | 			<Tool | ||||||
|  | 				Name="VCCLCompilerTool" | ||||||
|  | 				Optimization="2" | ||||||
|  | 				AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples" | ||||||
|  | 				PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" | ||||||
|  | 				ExceptionHandling="TRUE" | ||||||
|  | 				RuntimeLibrary="2" | ||||||
|  | 				RuntimeTypeInfo="TRUE" | ||||||
|  | 				ObjectFile="vc_mswudll\ribbon\" | ||||||
|  | 				ProgramDataBaseFileName="vc_mswudll\ribbon.pdb" | ||||||
|  | 				WarningLevel="4" | ||||||
|  | 				SuppressStartupBanner="TRUE" | ||||||
|  | 				Detect64BitPortabilityProblems="TRUE" | ||||||
|  | 				DebugInformationFormat="3"/> | ||||||
|  | 			<Tool | ||||||
|  | 				Name="VCCustomBuildTool"/> | ||||||
|  | 			<Tool | ||||||
|  | 				Name="VCLinkerTool" | ||||||
|  | 				AdditionalOptions="" | ||||||
|  | 				AdditionalDependencies="wxmsw29u_ribbon.lib  wxmsw29u_adv.lib  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 wininet.lib" | ||||||
|  | 				OutputFile="vc_mswudll\ribbon.exe" | ||||||
|  | 				LinkIncremental="2" | ||||||
|  | 				SuppressStartupBanner="TRUE" | ||||||
|  | 				AdditionalLibraryDirectories=".\..\..\lib\vc_dll" | ||||||
|  | 				GenerateDebugInformation="TRUE" | ||||||
|  | 				ProgramDatabaseFile="vc_mswudll\ribbon.pdb" | ||||||
|  | 				SubSystem="2" | ||||||
|  | 				TargetMachine="1"/> | ||||||
|  | 			<Tool | ||||||
|  | 				Name="VCMIDLTool" | ||||||
|  | 				PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" | ||||||
|  | 				AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> | ||||||
|  | 			<Tool | ||||||
|  | 				Name="VCPostBuildEventTool"/> | ||||||
|  | 			<Tool | ||||||
|  | 				Name="VCPreBuildEventTool"/> | ||||||
|  | 			<Tool | ||||||
|  | 				Name="VCPreLinkEventTool"/> | ||||||
|  | 			<Tool | ||||||
|  | 				Name="VCResourceCompilerTool" | ||||||
|  | 				PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" | ||||||
|  | 				Culture="1033" | ||||||
|  | 				AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> | ||||||
|  | 			<Tool | ||||||
|  | 				Name="VCWebServiceProxyGeneratorTool"/> | ||||||
|  | 			<Tool | ||||||
|  | 				Name="VCXMLDataGeneratorTool"/> | ||||||
|  | 			<Tool | ||||||
|  | 				Name="VCWebDeploymentTool"/> | ||||||
|  | 			<Tool | ||||||
|  | 				Name="VCManagedWrapperGeneratorTool"/> | ||||||
|  | 			<Tool | ||||||
|  | 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/> | ||||||
|  | 		</Configuration> | ||||||
|  | 		<Configuration | ||||||
|  | 			Name="DLL Universal Debug|Win32" | ||||||
|  | 			OutputDirectory="vc_mswunivuddll" | ||||||
|  | 			IntermediateDirectory="vc_mswunivuddll\ribbon" | ||||||
|  | 			ConfigurationType="1" | ||||||
|  | 			UseOfMFC="0" | ||||||
|  | 			ATLMinimizesCRunTimeLibraryUsage="FALSE" | ||||||
|  | 			CharacterSet="1"> | ||||||
|  | 			<Tool | ||||||
|  | 				Name="VCCLCompilerTool" | ||||||
|  | 				Optimization="0" | ||||||
|  | 				AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples" | ||||||
|  | 				PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" | ||||||
|  | 				MinimalRebuild="TRUE" | ||||||
|  | 				ExceptionHandling="TRUE" | ||||||
|  | 				BasicRuntimeChecks="3" | ||||||
|  | 				RuntimeLibrary="3" | ||||||
|  | 				BufferSecurityCheck="TRUE" | ||||||
|  | 				RuntimeTypeInfo="TRUE" | ||||||
|  | 				ObjectFile="vc_mswunivuddll\ribbon\" | ||||||
|  | 				ProgramDataBaseFileName="vc_mswunivuddll\ribbon.pdb" | ||||||
|  | 				WarningLevel="4" | ||||||
|  | 				SuppressStartupBanner="TRUE" | ||||||
|  | 				Detect64BitPortabilityProblems="TRUE" | ||||||
|  | 				DebugInformationFormat="3"/> | ||||||
|  | 			<Tool | ||||||
|  | 				Name="VCCustomBuildTool"/> | ||||||
|  | 			<Tool | ||||||
|  | 				Name="VCLinkerTool" | ||||||
|  | 				AdditionalOptions="" | ||||||
|  | 				AdditionalDependencies="wxmswuniv29ud_ribbon.lib  wxmswuniv29ud_adv.lib  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 wininet.lib" | ||||||
|  | 				OutputFile="vc_mswunivuddll\ribbon.exe" | ||||||
|  | 				LinkIncremental="2" | ||||||
|  | 				SuppressStartupBanner="TRUE" | ||||||
|  | 				AdditionalLibraryDirectories=".\..\..\lib\vc_dll" | ||||||
|  | 				GenerateDebugInformation="TRUE" | ||||||
|  | 				ProgramDatabaseFile="vc_mswunivuddll\ribbon.pdb" | ||||||
|  | 				SubSystem="2" | ||||||
|  | 				TargetMachine="1"/> | ||||||
|  | 			<Tool | ||||||
|  | 				Name="VCMIDLTool" | ||||||
|  | 				PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" | ||||||
|  | 				AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> | ||||||
|  | 			<Tool | ||||||
|  | 				Name="VCPostBuildEventTool"/> | ||||||
|  | 			<Tool | ||||||
|  | 				Name="VCPreBuildEventTool"/> | ||||||
|  | 			<Tool | ||||||
|  | 				Name="VCPreLinkEventTool"/> | ||||||
|  | 			<Tool | ||||||
|  | 				Name="VCResourceCompilerTool" | ||||||
|  | 				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" | ||||||
|  | 				Culture="1033" | ||||||
|  | 				AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> | ||||||
|  | 			<Tool | ||||||
|  | 				Name="VCWebServiceProxyGeneratorTool"/> | ||||||
|  | 			<Tool | ||||||
|  | 				Name="VCXMLDataGeneratorTool"/> | ||||||
|  | 			<Tool | ||||||
|  | 				Name="VCWebDeploymentTool"/> | ||||||
|  | 			<Tool | ||||||
|  | 				Name="VCManagedWrapperGeneratorTool"/> | ||||||
|  | 			<Tool | ||||||
|  | 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/> | ||||||
|  | 		</Configuration> | ||||||
|  | 		<Configuration | ||||||
|  | 			Name="DLL Universal Release|Win32" | ||||||
|  | 			OutputDirectory="vc_mswunivudll" | ||||||
|  | 			IntermediateDirectory="vc_mswunivudll\ribbon" | ||||||
|  | 			ConfigurationType="1" | ||||||
|  | 			UseOfMFC="0" | ||||||
|  | 			ATLMinimizesCRunTimeLibraryUsage="FALSE" | ||||||
|  | 			CharacterSet="1"> | ||||||
|  | 			<Tool | ||||||
|  | 				Name="VCCLCompilerTool" | ||||||
|  | 				Optimization="2" | ||||||
|  | 				AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples" | ||||||
|  | 				PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" | ||||||
|  | 				ExceptionHandling="TRUE" | ||||||
|  | 				RuntimeLibrary="2" | ||||||
|  | 				RuntimeTypeInfo="TRUE" | ||||||
|  | 				ObjectFile="vc_mswunivudll\ribbon\" | ||||||
|  | 				ProgramDataBaseFileName="vc_mswunivudll\ribbon.pdb" | ||||||
|  | 				WarningLevel="4" | ||||||
|  | 				SuppressStartupBanner="TRUE" | ||||||
|  | 				Detect64BitPortabilityProblems="TRUE" | ||||||
|  | 				DebugInformationFormat="3"/> | ||||||
|  | 			<Tool | ||||||
|  | 				Name="VCCustomBuildTool"/> | ||||||
|  | 			<Tool | ||||||
|  | 				Name="VCLinkerTool" | ||||||
|  | 				AdditionalOptions="" | ||||||
|  | 				AdditionalDependencies="wxmswuniv29u_ribbon.lib  wxmswuniv29u_adv.lib  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 wininet.lib" | ||||||
|  | 				OutputFile="vc_mswunivudll\ribbon.exe" | ||||||
|  | 				LinkIncremental="2" | ||||||
|  | 				SuppressStartupBanner="TRUE" | ||||||
|  | 				AdditionalLibraryDirectories=".\..\..\lib\vc_dll" | ||||||
|  | 				GenerateDebugInformation="TRUE" | ||||||
|  | 				ProgramDatabaseFile="vc_mswunivudll\ribbon.pdb" | ||||||
|  | 				SubSystem="2" | ||||||
|  | 				TargetMachine="1"/> | ||||||
|  | 			<Tool | ||||||
|  | 				Name="VCMIDLTool" | ||||||
|  | 				PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" | ||||||
|  | 				AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> | ||||||
|  | 			<Tool | ||||||
|  | 				Name="VCPostBuildEventTool"/> | ||||||
|  | 			<Tool | ||||||
|  | 				Name="VCPreBuildEventTool"/> | ||||||
|  | 			<Tool | ||||||
|  | 				Name="VCPreLinkEventTool"/> | ||||||
|  | 			<Tool | ||||||
|  | 				Name="VCResourceCompilerTool" | ||||||
|  | 				PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" | ||||||
|  | 				Culture="1033" | ||||||
|  | 				AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> | ||||||
| 			<Tool | 			<Tool | ||||||
| 				Name="VCWebServiceProxyGeneratorTool"/> | 				Name="VCWebServiceProxyGeneratorTool"/> | ||||||
| 			<Tool | 			<Tool | ||||||
| @@ -534,7 +542,7 @@ | |||||||
| 			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}"> | 			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"> | ||||||
| 			<File | 			<File | ||||||
| 				RelativePath=".\..\sample.rc"> | 				RelativePath="..\sample.rc"> | ||||||
| 			</File> | 			</File> | ||||||
| 		</Filter> | 		</Filter> | ||||||
| 	</Files> | 	</Files> | ||||||
|   | |||||||
| @@ -4,32 +4,32 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ribbon", "ribbon_vc8.vcproj | |||||||
| EndProject | EndProject | ||||||
| Global | Global | ||||||
| 	GlobalSection(SolutionConfigurationPlatforms) = preSolution | 	GlobalSection(SolutionConfigurationPlatforms) = preSolution | ||||||
| 		DLL Universal Release|Win32 = DLL Universal Release|Win32 |  | ||||||
| 		DLL Universal Debug|Win32 = DLL Universal Debug|Win32 |  | ||||||
| 		DLL Release|Win32 = DLL Release|Win32 |  | ||||||
| 		DLL Debug|Win32 = DLL Debug|Win32 |  | ||||||
| 		Universal Release|Win32 = Universal Release|Win32 |  | ||||||
| 		Universal Debug|Win32 = Universal Debug|Win32 |  | ||||||
| 		Release|Win32 = Release|Win32 |  | ||||||
| 		Debug|Win32 = Debug|Win32 | 		Debug|Win32 = Debug|Win32 | ||||||
|  | 		Release|Win32 = Release|Win32 | ||||||
|  | 		Universal Debug|Win32 = Universal Debug|Win32 | ||||||
|  | 		Universal Release|Win32 = Universal Release|Win32 | ||||||
|  | 		DLL Debug|Win32 = DLL Debug|Win32 | ||||||
|  | 		DLL Release|Win32 = DLL Release|Win32 | ||||||
|  | 		DLL Universal Debug|Win32 = DLL Universal Debug|Win32 | ||||||
|  | 		DLL Universal Release|Win32 = DLL Universal Release|Win32 | ||||||
| 	EndGlobalSection | 	EndGlobalSection | ||||||
| 	GlobalSection(ProjectConfigurationPlatforms) = postSolution | 	GlobalSection(ProjectConfigurationPlatforms) = postSolution | ||||||
| 		{BA2417EE-232B-5AEC-9EBA-D4CEE724CE81}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 |  | ||||||
| 		{BA2417EE-232B-5AEC-9EBA-D4CEE724CE81}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 |  | ||||||
| 		{BA2417EE-232B-5AEC-9EBA-D4CEE724CE81}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 |  | ||||||
| 		{BA2417EE-232B-5AEC-9EBA-D4CEE724CE81}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 |  | ||||||
| 		{BA2417EE-232B-5AEC-9EBA-D4CEE724CE81}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 |  | ||||||
| 		{BA2417EE-232B-5AEC-9EBA-D4CEE724CE81}.DLL Release|Win32.Build.0 = DLL Release|Win32 |  | ||||||
| 		{BA2417EE-232B-5AEC-9EBA-D4CEE724CE81}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 |  | ||||||
| 		{BA2417EE-232B-5AEC-9EBA-D4CEE724CE81}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 |  | ||||||
| 		{BA2417EE-232B-5AEC-9EBA-D4CEE724CE81}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 |  | ||||||
| 		{BA2417EE-232B-5AEC-9EBA-D4CEE724CE81}.Universal Release|Win32.Build.0 = Universal Release|Win32 |  | ||||||
| 		{BA2417EE-232B-5AEC-9EBA-D4CEE724CE81}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 |  | ||||||
| 		{BA2417EE-232B-5AEC-9EBA-D4CEE724CE81}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 |  | ||||||
| 		{BA2417EE-232B-5AEC-9EBA-D4CEE724CE81}.Release|Win32.ActiveCfg = Release|Win32 |  | ||||||
| 		{BA2417EE-232B-5AEC-9EBA-D4CEE724CE81}.Release|Win32.Build.0 = Release|Win32 |  | ||||||
| 		{BA2417EE-232B-5AEC-9EBA-D4CEE724CE81}.Debug|Win32.ActiveCfg = Debug|Win32 | 		{BA2417EE-232B-5AEC-9EBA-D4CEE724CE81}.Debug|Win32.ActiveCfg = Debug|Win32 | ||||||
| 		{BA2417EE-232B-5AEC-9EBA-D4CEE724CE81}.Debug|Win32.Build.0 = Debug|Win32 | 		{BA2417EE-232B-5AEC-9EBA-D4CEE724CE81}.Debug|Win32.Build.0 = Debug|Win32 | ||||||
|  | 		{BA2417EE-232B-5AEC-9EBA-D4CEE724CE81}.Release|Win32.ActiveCfg = Release|Win32 | ||||||
|  | 		{BA2417EE-232B-5AEC-9EBA-D4CEE724CE81}.Release|Win32.Build.0 = Release|Win32 | ||||||
|  | 		{BA2417EE-232B-5AEC-9EBA-D4CEE724CE81}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 | ||||||
|  | 		{BA2417EE-232B-5AEC-9EBA-D4CEE724CE81}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 | ||||||
|  | 		{BA2417EE-232B-5AEC-9EBA-D4CEE724CE81}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 | ||||||
|  | 		{BA2417EE-232B-5AEC-9EBA-D4CEE724CE81}.Universal Release|Win32.Build.0 = Universal Release|Win32 | ||||||
|  | 		{BA2417EE-232B-5AEC-9EBA-D4CEE724CE81}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 | ||||||
|  | 		{BA2417EE-232B-5AEC-9EBA-D4CEE724CE81}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 | ||||||
|  | 		{BA2417EE-232B-5AEC-9EBA-D4CEE724CE81}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 | ||||||
|  | 		{BA2417EE-232B-5AEC-9EBA-D4CEE724CE81}.DLL Release|Win32.Build.0 = DLL Release|Win32 | ||||||
|  | 		{BA2417EE-232B-5AEC-9EBA-D4CEE724CE81}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 | ||||||
|  | 		{BA2417EE-232B-5AEC-9EBA-D4CEE724CE81}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 | ||||||
|  | 		{BA2417EE-232B-5AEC-9EBA-D4CEE724CE81}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 | ||||||
|  | 		{BA2417EE-232B-5AEC-9EBA-D4CEE724CE81}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 | ||||||
| 	EndGlobalSection | 	EndGlobalSection | ||||||
| 	GlobalSection(SolutionProperties) = preSolution | 	GlobalSection(SolutionProperties) = preSolution | ||||||
| 		HideSolutionNode = FALSE | 		HideSolutionNode = FALSE | ||||||
|   | |||||||
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							| @@ -4,32 +4,32 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ribbon", "ribbon_vc9.vcproj | |||||||
| EndProject | EndProject | ||||||
| Global | Global | ||||||
| 	GlobalSection(SolutionConfigurationPlatforms) = preSolution | 	GlobalSection(SolutionConfigurationPlatforms) = preSolution | ||||||
| 		DLL Universal Release|Win32 = DLL Universal Release|Win32 |  | ||||||
| 		DLL Universal Debug|Win32 = DLL Universal Debug|Win32 |  | ||||||
| 		DLL Release|Win32 = DLL Release|Win32 |  | ||||||
| 		DLL Debug|Win32 = DLL Debug|Win32 |  | ||||||
| 		Universal Release|Win32 = Universal Release|Win32 |  | ||||||
| 		Universal Debug|Win32 = Universal Debug|Win32 |  | ||||||
| 		Release|Win32 = Release|Win32 |  | ||||||
| 		Debug|Win32 = Debug|Win32 | 		Debug|Win32 = Debug|Win32 | ||||||
|  | 		Release|Win32 = Release|Win32 | ||||||
|  | 		Universal Debug|Win32 = Universal Debug|Win32 | ||||||
|  | 		Universal Release|Win32 = Universal Release|Win32 | ||||||
|  | 		DLL Debug|Win32 = DLL Debug|Win32 | ||||||
|  | 		DLL Release|Win32 = DLL Release|Win32 | ||||||
|  | 		DLL Universal Debug|Win32 = DLL Universal Debug|Win32 | ||||||
|  | 		DLL Universal Release|Win32 = DLL Universal Release|Win32 | ||||||
| 	EndGlobalSection | 	EndGlobalSection | ||||||
| 	GlobalSection(ProjectConfigurationPlatforms) = postSolution | 	GlobalSection(ProjectConfigurationPlatforms) = postSolution | ||||||
| 		{B56D7915-3E5D-5D62-9C6C-05DE05427191}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 |  | ||||||
| 		{B56D7915-3E5D-5D62-9C6C-05DE05427191}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 |  | ||||||
| 		{B56D7915-3E5D-5D62-9C6C-05DE05427191}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 |  | ||||||
| 		{B56D7915-3E5D-5D62-9C6C-05DE05427191}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 |  | ||||||
| 		{B56D7915-3E5D-5D62-9C6C-05DE05427191}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 |  | ||||||
| 		{B56D7915-3E5D-5D62-9C6C-05DE05427191}.DLL Release|Win32.Build.0 = DLL Release|Win32 |  | ||||||
| 		{B56D7915-3E5D-5D62-9C6C-05DE05427191}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 |  | ||||||
| 		{B56D7915-3E5D-5D62-9C6C-05DE05427191}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 |  | ||||||
| 		{B56D7915-3E5D-5D62-9C6C-05DE05427191}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 |  | ||||||
| 		{B56D7915-3E5D-5D62-9C6C-05DE05427191}.Universal Release|Win32.Build.0 = Universal Release|Win32 |  | ||||||
| 		{B56D7915-3E5D-5D62-9C6C-05DE05427191}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 |  | ||||||
| 		{B56D7915-3E5D-5D62-9C6C-05DE05427191}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 |  | ||||||
| 		{B56D7915-3E5D-5D62-9C6C-05DE05427191}.Release|Win32.ActiveCfg = Release|Win32 |  | ||||||
| 		{B56D7915-3E5D-5D62-9C6C-05DE05427191}.Release|Win32.Build.0 = Release|Win32 |  | ||||||
| 		{B56D7915-3E5D-5D62-9C6C-05DE05427191}.Debug|Win32.ActiveCfg = Debug|Win32 | 		{B56D7915-3E5D-5D62-9C6C-05DE05427191}.Debug|Win32.ActiveCfg = Debug|Win32 | ||||||
| 		{B56D7915-3E5D-5D62-9C6C-05DE05427191}.Debug|Win32.Build.0 = Debug|Win32 | 		{B56D7915-3E5D-5D62-9C6C-05DE05427191}.Debug|Win32.Build.0 = Debug|Win32 | ||||||
|  | 		{B56D7915-3E5D-5D62-9C6C-05DE05427191}.Release|Win32.ActiveCfg = Release|Win32 | ||||||
|  | 		{B56D7915-3E5D-5D62-9C6C-05DE05427191}.Release|Win32.Build.0 = Release|Win32 | ||||||
|  | 		{B56D7915-3E5D-5D62-9C6C-05DE05427191}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 | ||||||
|  | 		{B56D7915-3E5D-5D62-9C6C-05DE05427191}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 | ||||||
|  | 		{B56D7915-3E5D-5D62-9C6C-05DE05427191}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 | ||||||
|  | 		{B56D7915-3E5D-5D62-9C6C-05DE05427191}.Universal Release|Win32.Build.0 = Universal Release|Win32 | ||||||
|  | 		{B56D7915-3E5D-5D62-9C6C-05DE05427191}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 | ||||||
|  | 		{B56D7915-3E5D-5D62-9C6C-05DE05427191}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 | ||||||
|  | 		{B56D7915-3E5D-5D62-9C6C-05DE05427191}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 | ||||||
|  | 		{B56D7915-3E5D-5D62-9C6C-05DE05427191}.DLL Release|Win32.Build.0 = DLL Release|Win32 | ||||||
|  | 		{B56D7915-3E5D-5D62-9C6C-05DE05427191}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 | ||||||
|  | 		{B56D7915-3E5D-5D62-9C6C-05DE05427191}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 | ||||||
|  | 		{B56D7915-3E5D-5D62-9C6C-05DE05427191}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 | ||||||
|  | 		{B56D7915-3E5D-5D62-9C6C-05DE05427191}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 | ||||||
| 	EndGlobalSection | 	EndGlobalSection | ||||||
| 	GlobalSection(SolutionProperties) = preSolution | 	GlobalSection(SolutionProperties) = preSolution | ||||||
| 		HideSolutionNode = FALSE | 		HideSolutionNode = FALSE | ||||||
|   | |||||||
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							| @@ -1,6 +1,6 @@ | |||||||
| # ========================================================================= | # ========================================================================= | ||||||
| #     This makefile was generated by | #     This makefile was generated by | ||||||
| #     Bakefile 0.2.5 (http://www.bakefile.org) | #     Bakefile 0.2.6 (http://www.bakefile.org) | ||||||
| #     Do not modify, all changes will be overwritten! | #     Do not modify, all changes will be overwritten! | ||||||
| # ========================================================================= | # ========================================================================= | ||||||
|  |  | ||||||
|   | |||||||
| @@ -43,7 +43,7 @@ | |||||||
| 				Name="VCWebServiceProxyGeneratorTool" | 				Name="VCWebServiceProxyGeneratorTool" | ||||||
| 			/> | 			/> | ||||||
| 			<Tool | 			<Tool | ||||||
| 				Name="VCMIDLTool" | 				Name="VCIDLTool" | ||||||
| 				PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0" | 				PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0" | ||||||
| 				AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;." | 				AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;." | ||||||
| 			/> | 			/> | ||||||
| @@ -136,7 +136,7 @@ | |||||||
| 				Name="VCWebServiceProxyGeneratorTool" | 				Name="VCWebServiceProxyGeneratorTool" | ||||||
| 			/> | 			/> | ||||||
| 			<Tool | 			<Tool | ||||||
| 				Name="VCMIDLTool" | 				Name="VCIDLTool" | ||||||
| 				PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0" | 				PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0" | ||||||
| 				AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;." | 				AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;." | ||||||
| 			/> | 			/> | ||||||
| @@ -227,7 +227,7 @@ | |||||||
| 				Name="VCWebServiceProxyGeneratorTool" | 				Name="VCWebServiceProxyGeneratorTool" | ||||||
| 			/> | 			/> | ||||||
| 			<Tool | 			<Tool | ||||||
| 				Name="VCMIDLTool" | 				Name="VCIDLTool" | ||||||
| 				PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0" | 				PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0" | ||||||
| 				AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;." | 				AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;." | ||||||
| 			/> | 			/> | ||||||
| @@ -320,7 +320,7 @@ | |||||||
| 				Name="VCWebServiceProxyGeneratorTool" | 				Name="VCWebServiceProxyGeneratorTool" | ||||||
| 			/> | 			/> | ||||||
| 			<Tool | 			<Tool | ||||||
| 				Name="VCMIDLTool" | 				Name="VCIDLTool" | ||||||
| 				PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0" | 				PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0" | ||||||
| 				AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;." | 				AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;." | ||||||
| 			/> | 			/> | ||||||
| @@ -411,7 +411,7 @@ | |||||||
| 				Name="VCWebServiceProxyGeneratorTool" | 				Name="VCWebServiceProxyGeneratorTool" | ||||||
| 			/> | 			/> | ||||||
| 			<Tool | 			<Tool | ||||||
| 				Name="VCMIDLTool" | 				Name="VCIDLTool" | ||||||
| 				PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0" | 				PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0" | ||||||
| 				AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;." | 				AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;." | ||||||
| 			/> | 			/> | ||||||
| @@ -504,7 +504,7 @@ | |||||||
| 				Name="VCWebServiceProxyGeneratorTool" | 				Name="VCWebServiceProxyGeneratorTool" | ||||||
| 			/> | 			/> | ||||||
| 			<Tool | 			<Tool | ||||||
| 				Name="VCMIDLTool" | 				Name="VCIDLTool" | ||||||
| 				PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0" | 				PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0" | ||||||
| 				AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;." | 				AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;." | ||||||
| 			/> | 			/> | ||||||
| @@ -595,7 +595,7 @@ | |||||||
| 				Name="VCWebServiceProxyGeneratorTool" | 				Name="VCWebServiceProxyGeneratorTool" | ||||||
| 			/> | 			/> | ||||||
| 			<Tool | 			<Tool | ||||||
| 				Name="VCMIDLTool" | 				Name="VCIDLTool" | ||||||
| 				PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0" | 				PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0" | ||||||
| 				AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;." | 				AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;." | ||||||
| 			/> | 			/> | ||||||
| @@ -688,7 +688,7 @@ | |||||||
| 				Name="VCWebServiceProxyGeneratorTool" | 				Name="VCWebServiceProxyGeneratorTool" | ||||||
| 			/> | 			/> | ||||||
| 			<Tool | 			<Tool | ||||||
| 				Name="VCMIDLTool" | 				Name="VCIDLTool" | ||||||
| 				PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0" | 				PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0" | ||||||
| 				AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;." | 				AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;." | ||||||
| 			/> | 			/> | ||||||
|   | |||||||
| @@ -1,191 +1,191 @@ | |||||||
| # ========================================================================= | # ========================================================================= | ||||||
| #     This makefile was generated by | #     This makefile was generated by | ||||||
| #     Bakefile 0.2.6 (http://www.bakefile.org) | #     Bakefile 0.2.6 (http://www.bakefile.org) | ||||||
| #     Do not modify, all changes will be overwritten! | #     Do not modify, all changes will be overwritten! | ||||||
| # ========================================================================= | # ========================================================================= | ||||||
|  |  | ||||||
| .autodepend | .autodepend | ||||||
|  |  | ||||||
| !ifndef BCCDIR | !ifndef BCCDIR | ||||||
| !ifndef MAKEDIR | !ifndef MAKEDIR | ||||||
| !error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 | !error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 | ||||||
| !endif | !endif | ||||||
| BCCDIR = $(MAKEDIR)\.. | BCCDIR = $(MAKEDIR)\.. | ||||||
| !endif | !endif | ||||||
|  |  | ||||||
| !include ../../build/msw/config.bcc | !include ../../build/msw/config.bcc | ||||||
|  |  | ||||||
| # ------------------------------------------------------------------------- | # ------------------------------------------------------------------------- | ||||||
| # Do not modify the rest of this file! | # Do not modify the rest of this file! | ||||||
| # ------------------------------------------------------------------------- | # ------------------------------------------------------------------------- | ||||||
|  |  | ||||||
| ### Variables: ### | ### Variables: ### | ||||||
|  |  | ||||||
| WX_RELEASE_NODOT = 29 | WX_RELEASE_NODOT = 29 | ||||||
| COMPILER_PREFIX = bcc | COMPILER_PREFIX = bcc | ||||||
| OBJS = \ | OBJS = \ | ||||||
| 	$(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) | 	$(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) | ||||||
| LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) | LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) | ||||||
| SETUPHDIR = \ | SETUPHDIR = \ | ||||||
| 	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) | 	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) | ||||||
| EXECMON_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \ | EXECMON_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \ | ||||||
| 	$(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ | 	$(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ | ||||||
| 	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ | 	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ | ||||||
| 	$(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ | 	$(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ | ||||||
| 	$(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \ | 	$(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \ | ||||||
| 	-DwxUSE_GUI=0 $(CPPFLAGS) $(CXXFLAGS) | 	-DwxUSE_GUI=0 $(CPPFLAGS) $(CXXFLAGS) | ||||||
| EXECMON_OBJECTS =  \ | EXECMON_OBJECTS =  \ | ||||||
| 	$(OBJS)\execmon_execmon.obj | 	$(OBJS)\execmon_execmon.obj | ||||||
|  |  | ||||||
| ### Conditionally set variables: ### | ### Conditionally set variables: ### | ||||||
|  |  | ||||||
| !if "$(USE_GUI)" == "0" | !if "$(USE_GUI)" == "0" | ||||||
| PORTNAME = base | PORTNAME = base | ||||||
| !endif | !endif | ||||||
| !if "$(USE_GUI)" == "1" | !if "$(USE_GUI)" == "1" | ||||||
| PORTNAME = msw | PORTNAME = msw | ||||||
| !endif | !endif | ||||||
| !if "$(BUILD)" == "debug" | !if "$(BUILD)" == "debug" | ||||||
| WXDEBUGFLAG = d | WXDEBUGFLAG = d | ||||||
| !endif | !endif | ||||||
| !if "$(UNICODE)" == "1" | !if "$(UNICODE)" == "1" | ||||||
| WXUNICODEFLAG = u | WXUNICODEFLAG = u | ||||||
| !endif | !endif | ||||||
| !if "$(WXUNIV)" == "1" | !if "$(WXUNIV)" == "1" | ||||||
| WXUNIVNAME = univ | WXUNIVNAME = univ | ||||||
| !endif | !endif | ||||||
| !if "$(SHARED)" == "1" | !if "$(SHARED)" == "1" | ||||||
| WXDLLFLAG = dll | WXDLLFLAG = dll | ||||||
| !endif | !endif | ||||||
| !if "$(SHARED)" == "0" | !if "$(SHARED)" == "0" | ||||||
| LIBTYPE_SUFFIX = lib | LIBTYPE_SUFFIX = lib | ||||||
| !endif | !endif | ||||||
| !if "$(SHARED)" == "1" | !if "$(SHARED)" == "1" | ||||||
| LIBTYPE_SUFFIX = dll | LIBTYPE_SUFFIX = dll | ||||||
| !endif | !endif | ||||||
| !if "$(MONOLITHIC)" == "0" | !if "$(MONOLITHIC)" == "0" | ||||||
| EXTRALIBS_FOR_BASE =  | EXTRALIBS_FOR_BASE =  | ||||||
| !endif | !endif | ||||||
| !if "$(MONOLITHIC)" == "1" | !if "$(MONOLITHIC)" == "1" | ||||||
| EXTRALIBS_FOR_BASE =   | EXTRALIBS_FOR_BASE =   | ||||||
| !endif | !endif | ||||||
| !if "$(USE_XRC)" == "1" | !if "$(USE_XRC)" == "1" | ||||||
| __execmon___depname = $(OBJS)\execmon.exe | __execmon___depname = $(OBJS)\execmon.exe | ||||||
| !endif | !endif | ||||||
| !if "$(BUILD)" == "debug" | !if "$(BUILD)" == "debug" | ||||||
| __OPTIMIZEFLAG_2 = -Od | __OPTIMIZEFLAG_2 = -Od | ||||||
| !endif | !endif | ||||||
| !if "$(BUILD)" == "release" | !if "$(BUILD)" == "release" | ||||||
| __OPTIMIZEFLAG_2 = -O2 | __OPTIMIZEFLAG_2 = -O2 | ||||||
| !endif | !endif | ||||||
| !if "$(USE_THREADS)" == "0" | !if "$(USE_THREADS)" == "0" | ||||||
| __THREADSFLAG_5 =  | __THREADSFLAG_5 =  | ||||||
| !endif | !endif | ||||||
| !if "$(USE_THREADS)" == "1" | !if "$(USE_THREADS)" == "1" | ||||||
| __THREADSFLAG_5 = mt | __THREADSFLAG_5 = mt | ||||||
| !endif | !endif | ||||||
| !if "$(USE_THREADS)" == "0" | !if "$(USE_THREADS)" == "0" | ||||||
| __THREADSFLAG_6 =  | __THREADSFLAG_6 =  | ||||||
| !endif | !endif | ||||||
| !if "$(USE_THREADS)" == "1" | !if "$(USE_THREADS)" == "1" | ||||||
| __THREADSFLAG_6 = -tWM | __THREADSFLAG_6 = -tWM | ||||||
| !endif | !endif | ||||||
| !if "$(RUNTIME_LIBS)" == "dynamic" | !if "$(RUNTIME_LIBS)" == "dynamic" | ||||||
| __RUNTIME_LIBS_7 = -tWR | __RUNTIME_LIBS_7 = -tWR | ||||||
| !endif | !endif | ||||||
| !if "$(RUNTIME_LIBS)" == "static" | !if "$(RUNTIME_LIBS)" == "static" | ||||||
| __RUNTIME_LIBS_7 =  | __RUNTIME_LIBS_7 =  | ||||||
| !endif | !endif | ||||||
| !if "$(RUNTIME_LIBS)" == "dynamic" | !if "$(RUNTIME_LIBS)" == "dynamic" | ||||||
| __RUNTIME_LIBS_8 = i | __RUNTIME_LIBS_8 = i | ||||||
| !endif | !endif | ||||||
| !if "$(RUNTIME_LIBS)" == "static" | !if "$(RUNTIME_LIBS)" == "static" | ||||||
| __RUNTIME_LIBS_8 =  | __RUNTIME_LIBS_8 =  | ||||||
| !endif | !endif | ||||||
| !if "$(WXUNIV)" == "1" | !if "$(WXUNIV)" == "1" | ||||||
| __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ | __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ | ||||||
| !endif | !endif | ||||||
| !if "$(DEBUG_FLAG)" == "0" | !if "$(DEBUG_FLAG)" == "0" | ||||||
| __DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 | __DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 | ||||||
| !endif | !endif | ||||||
| !if "$(USE_EXCEPTIONS)" == "0" | !if "$(USE_EXCEPTIONS)" == "0" | ||||||
| __EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS | __EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS | ||||||
| !endif | !endif | ||||||
| !if "$(USE_RTTI)" == "0" | !if "$(USE_RTTI)" == "0" | ||||||
| __RTTI_DEFINE_p = -DwxNO_RTTI | __RTTI_DEFINE_p = -DwxNO_RTTI | ||||||
| !endif | !endif | ||||||
| !if "$(USE_THREADS)" == "0" | !if "$(USE_THREADS)" == "0" | ||||||
| __THREAD_DEFINE_p = -DwxNO_THREADS | __THREAD_DEFINE_p = -DwxNO_THREADS | ||||||
| !endif | !endif | ||||||
| !if "$(UNICODE)" == "0" | !if "$(UNICODE)" == "0" | ||||||
| __UNICODE_DEFINE_p = -DwxUSE_UNICODE=0 | __UNICODE_DEFINE_p = -DwxUSE_UNICODE=0 | ||||||
| !endif | !endif | ||||||
| !if "$(UNICODE)" == "1" | !if "$(UNICODE)" == "1" | ||||||
| __UNICODE_DEFINE_p = -D_UNICODE | __UNICODE_DEFINE_p = -D_UNICODE | ||||||
| !endif | !endif | ||||||
| !if "$(MSLU)" == "1" | !if "$(MSLU)" == "1" | ||||||
| __MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1 | __MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1 | ||||||
| !endif | !endif | ||||||
| !if "$(USE_GDIPLUS)" == "1" | !if "$(USE_GDIPLUS)" == "1" | ||||||
| __GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1 | __GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1 | ||||||
| !endif | !endif | ||||||
| !if "$(SHARED)" == "1" | !if "$(SHARED)" == "1" | ||||||
| __DLLFLAG_p = -DWXUSINGDLL | __DLLFLAG_p = -DWXUSINGDLL | ||||||
| !endif | !endif | ||||||
| !if "$(MONOLITHIC)" == "0" | !if "$(MONOLITHIC)" == "0" | ||||||
| __WXLIB_BASE_p = \ | __WXLIB_BASE_p = \ | ||||||
| 	wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib | 	wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib | ||||||
| !endif | !endif | ||||||
| !if "$(MONOLITHIC)" == "1" | !if "$(MONOLITHIC)" == "1" | ||||||
| __WXLIB_MONO_p = \ | __WXLIB_MONO_p = \ | ||||||
| 	wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib | 	wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib | ||||||
| !endif | !endif | ||||||
| !if "$(MSLU)" == "1" | !if "$(MSLU)" == "1" | ||||||
| __UNICOWS_LIB_p = unicows.lib | __UNICOWS_LIB_p = unicows.lib | ||||||
| !endif | !endif | ||||||
| !if "$(USE_GDIPLUS)" == "1" | !if "$(USE_GDIPLUS)" == "1" | ||||||
| __GDIPLUS_LIB_p = gdiplus.lib | __GDIPLUS_LIB_p = gdiplus.lib | ||||||
| !endif | !endif | ||||||
| !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" | !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" | ||||||
| __DEBUGINFO = -v | __DEBUGINFO = -v | ||||||
| !endif | !endif | ||||||
| !if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" | !if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" | ||||||
| __DEBUGINFO = -v- | __DEBUGINFO = -v- | ||||||
| !endif | !endif | ||||||
| !if "$(DEBUG_INFO)" == "0" | !if "$(DEBUG_INFO)" == "0" | ||||||
| __DEBUGINFO = -v- | __DEBUGINFO = -v- | ||||||
| !endif | !endif | ||||||
| !if "$(DEBUG_INFO)" == "1" | !if "$(DEBUG_INFO)" == "1" | ||||||
| __DEBUGINFO = -v | __DEBUGINFO = -v | ||||||
| !endif | !endif | ||||||
|  |  | ||||||
|  |  | ||||||
| all: $(OBJS) | all: $(OBJS) | ||||||
| $(OBJS): | $(OBJS): | ||||||
| 	-if not exist $(OBJS) mkdir $(OBJS) | 	-if not exist $(OBJS) mkdir $(OBJS) | ||||||
|  |  | ||||||
| ### Targets: ### | ### Targets: ### | ||||||
|  |  | ||||||
| all: $(__execmon___depname) | all: $(__execmon___depname) | ||||||
|  |  | ||||||
| clean:  | clean:  | ||||||
| 	-if exist $(OBJS)\*.obj del $(OBJS)\*.obj | 	-if exist $(OBJS)\*.obj del $(OBJS)\*.obj | ||||||
| 	-if exist $(OBJS)\*.res del $(OBJS)\*.res | 	-if exist $(OBJS)\*.res del $(OBJS)\*.res | ||||||
| 	-if exist $(OBJS)\*.csm del $(OBJS)\*.csm | 	-if exist $(OBJS)\*.csm del $(OBJS)\*.csm | ||||||
| 	-if exist $(OBJS)\execmon.exe del $(OBJS)\execmon.exe | 	-if exist $(OBJS)\execmon.exe del $(OBJS)\execmon.exe | ||||||
| 	-if exist $(OBJS)\execmon.tds del $(OBJS)\execmon.tds | 	-if exist $(OBJS)\execmon.tds del $(OBJS)\execmon.tds | ||||||
| 	-if exist $(OBJS)\execmon.ilc del $(OBJS)\execmon.ilc | 	-if exist $(OBJS)\execmon.ilc del $(OBJS)\execmon.ilc | ||||||
| 	-if exist $(OBJS)\execmon.ild del $(OBJS)\execmon.ild | 	-if exist $(OBJS)\execmon.ild del $(OBJS)\execmon.ild | ||||||
| 	-if exist $(OBJS)\execmon.ilf del $(OBJS)\execmon.ilf | 	-if exist $(OBJS)\execmon.ilf del $(OBJS)\execmon.ilf | ||||||
| 	-if exist $(OBJS)\execmon.ils del $(OBJS)\execmon.ils | 	-if exist $(OBJS)\execmon.ils del $(OBJS)\execmon.ils | ||||||
|  |  | ||||||
| !if "$(USE_XRC)" == "1" | !if "$(USE_XRC)" == "1" | ||||||
| $(OBJS)\execmon.exe: $(EXECMON_OBJECTS) | $(OBJS)\execmon.exe: $(EXECMON_OBJECTS) | ||||||
| 	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -ap $(LDFLAGS) @&&| | 	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -ap $(LDFLAGS) @&&| | ||||||
| 	c0x32.obj $(EXECMON_OBJECTS),$@,, $(__WXLIB_BASE_p)  $(__WXLIB_MONO_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,, | 	c0x32.obj $(EXECMON_OBJECTS),$@,, $(__WXLIB_BASE_p)  $(__WXLIB_MONO_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,, | ||||||
| | | | | ||||||
| !endif | !endif | ||||||
|  |  | ||||||
| $(OBJS)\execmon_execmon.obj: .\execmon.cpp | $(OBJS)\execmon_execmon.obj: .\execmon.cpp | ||||||
| 	$(CXX) -q -c -P -o$@ $(EXECMON_CXXFLAGS) .\execmon.cpp | 	$(CXX) -q -c -P -o$@ $(EXECMON_CXXFLAGS) .\execmon.cpp | ||||||
|  |  | ||||||
|   | |||||||
| @@ -1,184 +1,184 @@ | |||||||
| # ========================================================================= | # ========================================================================= | ||||||
| #     This makefile was generated by | #     This makefile was generated by | ||||||
| #     Bakefile 0.2.6 (http://www.bakefile.org) | #     Bakefile 0.2.6 (http://www.bakefile.org) | ||||||
| #     Do not modify, all changes will be overwritten! | #     Do not modify, all changes will be overwritten! | ||||||
| # ========================================================================= | # ========================================================================= | ||||||
|  |  | ||||||
| include ../../build/msw/config.gcc | include ../../build/msw/config.gcc | ||||||
|  |  | ||||||
| # ------------------------------------------------------------------------- | # ------------------------------------------------------------------------- | ||||||
| # Do not modify the rest of this file! | # Do not modify the rest of this file! | ||||||
| # ------------------------------------------------------------------------- | # ------------------------------------------------------------------------- | ||||||
|  |  | ||||||
| ### Variables: ### | ### Variables: ### | ||||||
|  |  | ||||||
| CPPDEPS = -MT$@ -MF$@.d -MD -MP | CPPDEPS = -MT$@ -MF$@.d -MD -MP | ||||||
| WX_RELEASE_NODOT = 29 | WX_RELEASE_NODOT = 29 | ||||||
| COMPILER_PREFIX = gcc | COMPILER_PREFIX = gcc | ||||||
| OBJS = \ | OBJS = \ | ||||||
| 	$(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) | 	$(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) | ||||||
| LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) | LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) | ||||||
| SETUPHDIR = \ | SETUPHDIR = \ | ||||||
| 	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) | 	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) | ||||||
| EXECMON_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \ | EXECMON_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \ | ||||||
| 	$(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ | 	$(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ | ||||||
| 	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ | 	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ | ||||||
| 	$(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ | 	$(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ | ||||||
| 	$(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \ | 	$(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \ | ||||||
| 	$(__DLLFLAG_p) -DwxUSE_GUI=0 $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \ | 	$(__DLLFLAG_p) -DwxUSE_GUI=0 $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \ | ||||||
| 	-Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS) | 	-Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS) | ||||||
| EXECMON_OBJECTS =  \ | EXECMON_OBJECTS =  \ | ||||||
| 	$(OBJS)\execmon_execmon.o | 	$(OBJS)\execmon_execmon.o | ||||||
|  |  | ||||||
| ### Conditionally set variables: ### | ### Conditionally set variables: ### | ||||||
|  |  | ||||||
| ifeq ($(GCC_VERSION),2.95) | ifeq ($(GCC_VERSION),2.95) | ||||||
| GCCFLAGS = -fvtable-thunks | GCCFLAGS = -fvtable-thunks | ||||||
| endif | endif | ||||||
| ifeq ($(USE_GUI),0) | ifeq ($(USE_GUI),0) | ||||||
| PORTNAME = base | PORTNAME = base | ||||||
| endif | endif | ||||||
| ifeq ($(USE_GUI),1) | ifeq ($(USE_GUI),1) | ||||||
| PORTNAME = msw | PORTNAME = msw | ||||||
| endif | endif | ||||||
| ifeq ($(BUILD),debug) | ifeq ($(BUILD),debug) | ||||||
| WXDEBUGFLAG = d | WXDEBUGFLAG = d | ||||||
| endif | endif | ||||||
| ifeq ($(UNICODE),1) | ifeq ($(UNICODE),1) | ||||||
| WXUNICODEFLAG = u | WXUNICODEFLAG = u | ||||||
| endif | endif | ||||||
| ifeq ($(WXUNIV),1) | ifeq ($(WXUNIV),1) | ||||||
| WXUNIVNAME = univ | WXUNIVNAME = univ | ||||||
| endif | endif | ||||||
| ifeq ($(SHARED),1) | ifeq ($(SHARED),1) | ||||||
| WXDLLFLAG = dll | WXDLLFLAG = dll | ||||||
| endif | endif | ||||||
| ifeq ($(SHARED),0) | ifeq ($(SHARED),0) | ||||||
| LIBTYPE_SUFFIX = lib | LIBTYPE_SUFFIX = lib | ||||||
| endif | endif | ||||||
| ifeq ($(SHARED),1) | ifeq ($(SHARED),1) | ||||||
| LIBTYPE_SUFFIX = dll | LIBTYPE_SUFFIX = dll | ||||||
| endif | endif | ||||||
| ifeq ($(MONOLITHIC),0) | ifeq ($(MONOLITHIC),0) | ||||||
| EXTRALIBS_FOR_BASE =  | EXTRALIBS_FOR_BASE =  | ||||||
| endif | endif | ||||||
| ifeq ($(MONOLITHIC),1) | ifeq ($(MONOLITHIC),1) | ||||||
| EXTRALIBS_FOR_BASE =   | EXTRALIBS_FOR_BASE =   | ||||||
| endif | endif | ||||||
| ifeq ($(USE_XRC),1) | ifeq ($(USE_XRC),1) | ||||||
| __execmon___depname = $(OBJS)\execmon.exe | __execmon___depname = $(OBJS)\execmon.exe | ||||||
| endif | endif | ||||||
| ifeq ($(BUILD),debug) | ifeq ($(BUILD),debug) | ||||||
| __OPTIMIZEFLAG_2 = -O0 | __OPTIMIZEFLAG_2 = -O0 | ||||||
| endif | endif | ||||||
| ifeq ($(BUILD),release) | ifeq ($(BUILD),release) | ||||||
| __OPTIMIZEFLAG_2 = -O2 | __OPTIMIZEFLAG_2 = -O2 | ||||||
| endif | endif | ||||||
| ifeq ($(USE_RTTI),0) | ifeq ($(USE_RTTI),0) | ||||||
| __RTTIFLAG_5 = -fno-rtti | __RTTIFLAG_5 = -fno-rtti | ||||||
| endif | endif | ||||||
| ifeq ($(USE_RTTI),1) | ifeq ($(USE_RTTI),1) | ||||||
| __RTTIFLAG_5 =  | __RTTIFLAG_5 =  | ||||||
| endif | endif | ||||||
| ifeq ($(USE_EXCEPTIONS),0) | ifeq ($(USE_EXCEPTIONS),0) | ||||||
| __EXCEPTIONSFLAG_6 = -fno-exceptions | __EXCEPTIONSFLAG_6 = -fno-exceptions | ||||||
| endif | endif | ||||||
| ifeq ($(USE_EXCEPTIONS),1) | ifeq ($(USE_EXCEPTIONS),1) | ||||||
| __EXCEPTIONSFLAG_6 =  | __EXCEPTIONSFLAG_6 =  | ||||||
| endif | endif | ||||||
| ifeq ($(WXUNIV),1) | ifeq ($(WXUNIV),1) | ||||||
| __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ | __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ | ||||||
| endif | endif | ||||||
| ifeq ($(DEBUG_FLAG),0) | ifeq ($(DEBUG_FLAG),0) | ||||||
| __DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 | __DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 | ||||||
| endif | endif | ||||||
| ifeq ($(USE_EXCEPTIONS),0) | ifeq ($(USE_EXCEPTIONS),0) | ||||||
| __EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS | __EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS | ||||||
| endif | endif | ||||||
| ifeq ($(USE_RTTI),0) | ifeq ($(USE_RTTI),0) | ||||||
| __RTTI_DEFINE_p = -DwxNO_RTTI | __RTTI_DEFINE_p = -DwxNO_RTTI | ||||||
| endif | endif | ||||||
| ifeq ($(USE_THREADS),0) | ifeq ($(USE_THREADS),0) | ||||||
| __THREAD_DEFINE_p = -DwxNO_THREADS | __THREAD_DEFINE_p = -DwxNO_THREADS | ||||||
| endif | endif | ||||||
| ifeq ($(UNICODE),0) | ifeq ($(UNICODE),0) | ||||||
| __UNICODE_DEFINE_p = -DwxUSE_UNICODE=0 | __UNICODE_DEFINE_p = -DwxUSE_UNICODE=0 | ||||||
| endif | endif | ||||||
| ifeq ($(UNICODE),1) | ifeq ($(UNICODE),1) | ||||||
| __UNICODE_DEFINE_p = -D_UNICODE | __UNICODE_DEFINE_p = -D_UNICODE | ||||||
| endif | endif | ||||||
| ifeq ($(MSLU),1) | ifeq ($(MSLU),1) | ||||||
| __MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1 | __MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1 | ||||||
| endif | endif | ||||||
| ifeq ($(USE_GDIPLUS),1) | ifeq ($(USE_GDIPLUS),1) | ||||||
| __GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1 | __GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1 | ||||||
| endif | endif | ||||||
| ifeq ($(SHARED),1) | ifeq ($(SHARED),1) | ||||||
| __DLLFLAG_p = -DWXUSINGDLL | __DLLFLAG_p = -DWXUSINGDLL | ||||||
| endif | endif | ||||||
| ifeq ($(MONOLITHIC),0) | ifeq ($(MONOLITHIC),0) | ||||||
| __WXLIB_BASE_p = \ | __WXLIB_BASE_p = \ | ||||||
| 	-lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) | 	-lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) | ||||||
| endif | endif | ||||||
| ifeq ($(MONOLITHIC),1) | ifeq ($(MONOLITHIC),1) | ||||||
| __WXLIB_MONO_p = \ | __WXLIB_MONO_p = \ | ||||||
| 	-lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) | 	-lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) | ||||||
| endif | endif | ||||||
| ifeq ($(MSLU),1) | ifeq ($(MSLU),1) | ||||||
| __UNICOWS_LIB_p = -lunicows | __UNICOWS_LIB_p = -lunicows | ||||||
| endif | endif | ||||||
| ifeq ($(USE_GDIPLUS),1) | ifeq ($(USE_GDIPLUS),1) | ||||||
| __GDIPLUS_LIB_p = -lgdiplus | __GDIPLUS_LIB_p = -lgdiplus | ||||||
| endif | endif | ||||||
| ifeq ($(BUILD),debug) | ifeq ($(BUILD),debug) | ||||||
| ifeq ($(DEBUG_INFO),default) | ifeq ($(DEBUG_INFO),default) | ||||||
| __DEBUGINFO = -g | __DEBUGINFO = -g | ||||||
| endif | endif | ||||||
| endif | endif | ||||||
| ifeq ($(BUILD),release) | ifeq ($(BUILD),release) | ||||||
| ifeq ($(DEBUG_INFO),default) | ifeq ($(DEBUG_INFO),default) | ||||||
| __DEBUGINFO =  | __DEBUGINFO =  | ||||||
| endif | endif | ||||||
| endif | endif | ||||||
| ifeq ($(DEBUG_INFO),0) | ifeq ($(DEBUG_INFO),0) | ||||||
| __DEBUGINFO =  | __DEBUGINFO =  | ||||||
| endif | endif | ||||||
| ifeq ($(DEBUG_INFO),1) | ifeq ($(DEBUG_INFO),1) | ||||||
| __DEBUGINFO = -g | __DEBUGINFO = -g | ||||||
| endif | endif | ||||||
| ifeq ($(USE_THREADS),0) | ifeq ($(USE_THREADS),0) | ||||||
| __THREADSFLAG =  | __THREADSFLAG =  | ||||||
| endif | endif | ||||||
| ifeq ($(USE_THREADS),1) | ifeq ($(USE_THREADS),1) | ||||||
| __THREADSFLAG = -mthreads | __THREADSFLAG = -mthreads | ||||||
| endif | endif | ||||||
|  |  | ||||||
|  |  | ||||||
| all: $(OBJS) | all: $(OBJS) | ||||||
| $(OBJS): | $(OBJS): | ||||||
| 	-if not exist $(OBJS) mkdir $(OBJS) | 	-if not exist $(OBJS) mkdir $(OBJS) | ||||||
|  |  | ||||||
| ### Targets: ### | ### Targets: ### | ||||||
|  |  | ||||||
| all: $(__execmon___depname) | all: $(__execmon___depname) | ||||||
|  |  | ||||||
| clean:  | clean:  | ||||||
| 	-if exist $(OBJS)\*.o del $(OBJS)\*.o | 	-if exist $(OBJS)\*.o del $(OBJS)\*.o | ||||||
| 	-if exist $(OBJS)\*.d del $(OBJS)\*.d | 	-if exist $(OBJS)\*.d del $(OBJS)\*.d | ||||||
| 	-if exist $(OBJS)\execmon.exe del $(OBJS)\execmon.exe | 	-if exist $(OBJS)\execmon.exe del $(OBJS)\execmon.exe | ||||||
|  |  | ||||||
| ifeq ($(USE_XRC),1) | ifeq ($(USE_XRC),1) | ||||||
| $(OBJS)\execmon.exe: $(EXECMON_OBJECTS) | $(OBJS)\execmon.exe: $(EXECMON_OBJECTS) | ||||||
| 	$(CXX) -o $@ $(EXECMON_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME)  $(LDFLAGS)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_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 -lwininet | 	$(CXX) -o $@ $(EXECMON_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME)  $(LDFLAGS)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_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 -lwininet | ||||||
| endif | endif | ||||||
|  |  | ||||||
| $(OBJS)\execmon_execmon.o: ./execmon.cpp | $(OBJS)\execmon_execmon.o: ./execmon.cpp | ||||||
| 	$(CXX) -c -o $@ $(EXECMON_CXXFLAGS) $(CPPDEPS) $< | 	$(CXX) -c -o $@ $(EXECMON_CXXFLAGS) $(CPPDEPS) $< | ||||||
|  |  | ||||||
| .PHONY: all clean | .PHONY: all clean | ||||||
|  |  | ||||||
|  |  | ||||||
| SHELL := $(COMSPEC) | SHELL := $(COMSPEC) | ||||||
|  |  | ||||||
| # Dependencies tracking: | # Dependencies tracking: | ||||||
| -include $(OBJS)/*.d | -include $(OBJS)/*.d | ||||||
|   | |||||||
| @@ -1,251 +1,251 @@ | |||||||
| # ========================================================================= | # ========================================================================= | ||||||
| #     This makefile was generated by | #     This makefile was generated by | ||||||
| #     Bakefile 0.2.6 (http://www.bakefile.org) | #     Bakefile 0.2.6 (http://www.bakefile.org) | ||||||
| #     Do not modify, all changes will be overwritten! | #     Do not modify, all changes will be overwritten! | ||||||
| # ========================================================================= | # ========================================================================= | ||||||
|  |  | ||||||
| !include <../../build/msw/config.vc> | !include <../../build/msw/config.vc> | ||||||
|  |  | ||||||
| # ------------------------------------------------------------------------- | # ------------------------------------------------------------------------- | ||||||
| # Do not modify the rest of this file! | # Do not modify the rest of this file! | ||||||
| # ------------------------------------------------------------------------- | # ------------------------------------------------------------------------- | ||||||
|  |  | ||||||
| ### Variables: ### | ### Variables: ### | ||||||
|  |  | ||||||
| WX_RELEASE_NODOT = 29 | WX_RELEASE_NODOT = 29 | ||||||
| COMPILER_PREFIX = vc | COMPILER_PREFIX = vc | ||||||
| OBJS = \ | OBJS = \ | ||||||
| 	$(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) | 	$(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) | ||||||
| LIBDIRNAME = \ | LIBDIRNAME = \ | ||||||
| 	.\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) | 	.\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) | ||||||
| SETUPHDIR = \ | SETUPHDIR = \ | ||||||
| 	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) | 	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) | ||||||
| EXECMON_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \ | EXECMON_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \ | ||||||
| 	$(__DEBUGINFO_0) /Fd$(OBJS)\execmon.pdb $(____DEBUGRUNTIME_2_p) \ | 	$(__DEBUGINFO_0) /Fd$(OBJS)\execmon.pdb $(____DEBUGRUNTIME_2_p) \ | ||||||
| 	$(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ | 	$(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ | ||||||
| 	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ | 	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ | ||||||
| 	$(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ | 	$(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ | ||||||
| 	$(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ | 	$(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ | ||||||
| 	/D_CONSOLE /DwxUSE_GUI=0 $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) $(CPPFLAGS) \ | 	/D_CONSOLE /DwxUSE_GUI=0 $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) $(CPPFLAGS) \ | ||||||
| 	$(CXXFLAGS) | 	$(CXXFLAGS) | ||||||
| EXECMON_OBJECTS =  \ | EXECMON_OBJECTS =  \ | ||||||
| 	$(OBJS)\execmon_execmon.obj | 	$(OBJS)\execmon_execmon.obj | ||||||
|  |  | ||||||
| ### Conditionally set variables: ### | ### Conditionally set variables: ### | ||||||
|  |  | ||||||
| !if "$(USE_GUI)" == "0" | !if "$(USE_GUI)" == "0" | ||||||
| PORTNAME = base | PORTNAME = base | ||||||
| !endif | !endif | ||||||
| !if "$(USE_GUI)" == "1" | !if "$(USE_GUI)" == "1" | ||||||
| PORTNAME = msw | PORTNAME = msw | ||||||
| !endif | !endif | ||||||
| !if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" | !if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" | ||||||
| WXDEBUGFLAG = d | WXDEBUGFLAG = d | ||||||
| !endif | !endif | ||||||
| !if "$(DEBUG_RUNTIME_LIBS)" == "1" | !if "$(DEBUG_RUNTIME_LIBS)" == "1" | ||||||
| WXDEBUGFLAG = d | WXDEBUGFLAG = d | ||||||
| !endif | !endif | ||||||
| !if "$(UNICODE)" == "1" | !if "$(UNICODE)" == "1" | ||||||
| WXUNICODEFLAG = u | WXUNICODEFLAG = u | ||||||
| !endif | !endif | ||||||
| !if "$(WXUNIV)" == "1" | !if "$(WXUNIV)" == "1" | ||||||
| WXUNIVNAME = univ | WXUNIVNAME = univ | ||||||
| !endif | !endif | ||||||
| !if "$(TARGET_CPU)" == "AMD64" | !if "$(TARGET_CPU)" == "AMD64" | ||||||
| DIR_SUFFIX_CPU = _amd64 | DIR_SUFFIX_CPU = _amd64 | ||||||
| !endif | !endif | ||||||
| !if "$(TARGET_CPU)" == "IA64" | !if "$(TARGET_CPU)" == "IA64" | ||||||
| DIR_SUFFIX_CPU = _ia64 | DIR_SUFFIX_CPU = _ia64 | ||||||
| !endif | !endif | ||||||
| !if "$(TARGET_CPU)" == "amd64" | !if "$(TARGET_CPU)" == "amd64" | ||||||
| DIR_SUFFIX_CPU = _amd64 | DIR_SUFFIX_CPU = _amd64 | ||||||
| !endif | !endif | ||||||
| !if "$(TARGET_CPU)" == "ia64" | !if "$(TARGET_CPU)" == "ia64" | ||||||
| DIR_SUFFIX_CPU = _ia64 | DIR_SUFFIX_CPU = _ia64 | ||||||
| !endif | !endif | ||||||
| !if "$(SHARED)" == "1" | !if "$(SHARED)" == "1" | ||||||
| WXDLLFLAG = dll | WXDLLFLAG = dll | ||||||
| !endif | !endif | ||||||
| !if "$(SHARED)" == "0" | !if "$(SHARED)" == "0" | ||||||
| LIBTYPE_SUFFIX = lib | LIBTYPE_SUFFIX = lib | ||||||
| !endif | !endif | ||||||
| !if "$(SHARED)" == "1" | !if "$(SHARED)" == "1" | ||||||
| LIBTYPE_SUFFIX = dll | LIBTYPE_SUFFIX = dll | ||||||
| !endif | !endif | ||||||
| !if "$(TARGET_CPU)" == "AMD64" | !if "$(TARGET_CPU)" == "AMD64" | ||||||
| LINK_TARGET_CPU = /MACHINE:AMD64 | LINK_TARGET_CPU = /MACHINE:AMD64 | ||||||
| !endif | !endif | ||||||
| !if "$(TARGET_CPU)" == "IA64" | !if "$(TARGET_CPU)" == "IA64" | ||||||
| LINK_TARGET_CPU = /MACHINE:IA64 | LINK_TARGET_CPU = /MACHINE:IA64 | ||||||
| !endif | !endif | ||||||
| !if "$(TARGET_CPU)" == "amd64" | !if "$(TARGET_CPU)" == "amd64" | ||||||
| LINK_TARGET_CPU = /MACHINE:AMD64 | LINK_TARGET_CPU = /MACHINE:AMD64 | ||||||
| !endif | !endif | ||||||
| !if "$(TARGET_CPU)" == "ia64" | !if "$(TARGET_CPU)" == "ia64" | ||||||
| LINK_TARGET_CPU = /MACHINE:IA64 | LINK_TARGET_CPU = /MACHINE:IA64 | ||||||
| !endif | !endif | ||||||
| !if "$(MONOLITHIC)" == "0" | !if "$(MONOLITHIC)" == "0" | ||||||
| EXTRALIBS_FOR_BASE =  | EXTRALIBS_FOR_BASE =  | ||||||
| !endif | !endif | ||||||
| !if "$(MONOLITHIC)" == "1" | !if "$(MONOLITHIC)" == "1" | ||||||
| EXTRALIBS_FOR_BASE =   | EXTRALIBS_FOR_BASE =   | ||||||
| !endif | !endif | ||||||
| !if "$(USE_XRC)" == "1" | !if "$(USE_XRC)" == "1" | ||||||
| __execmon___depname = $(OBJS)\execmon.exe | __execmon___depname = $(OBJS)\execmon.exe | ||||||
| !endif | !endif | ||||||
| !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" | !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" | ||||||
| __DEBUGINFO_0 = /Zi | __DEBUGINFO_0 = /Zi | ||||||
| !endif | !endif | ||||||
| !if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" | !if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" | ||||||
| __DEBUGINFO_0 =  | __DEBUGINFO_0 =  | ||||||
| !endif | !endif | ||||||
| !if "$(DEBUG_INFO)" == "0" | !if "$(DEBUG_INFO)" == "0" | ||||||
| __DEBUGINFO_0 =  | __DEBUGINFO_0 =  | ||||||
| !endif | !endif | ||||||
| !if "$(DEBUG_INFO)" == "1" | !if "$(DEBUG_INFO)" == "1" | ||||||
| __DEBUGINFO_0 = /Zi | __DEBUGINFO_0 = /Zi | ||||||
| !endif | !endif | ||||||
| !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" | !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" | ||||||
| __DEBUGINFO_1 = /DEBUG | __DEBUGINFO_1 = /DEBUG | ||||||
| !endif | !endif | ||||||
| !if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" | !if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" | ||||||
| __DEBUGINFO_1 =  | __DEBUGINFO_1 =  | ||||||
| !endif | !endif | ||||||
| !if "$(DEBUG_INFO)" == "0" | !if "$(DEBUG_INFO)" == "0" | ||||||
| __DEBUGINFO_1 =  | __DEBUGINFO_1 =  | ||||||
| !endif | !endif | ||||||
| !if "$(DEBUG_INFO)" == "1" | !if "$(DEBUG_INFO)" == "1" | ||||||
| __DEBUGINFO_1 = /DEBUG | __DEBUGINFO_1 = /DEBUG | ||||||
| !endif | !endif | ||||||
| !if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" | !if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" | ||||||
| ____DEBUGRUNTIME_2_p = /D_DEBUG | ____DEBUGRUNTIME_2_p = /D_DEBUG | ||||||
| !endif | !endif | ||||||
| !if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" | !if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" | ||||||
| ____DEBUGRUNTIME_2_p =  | ____DEBUGRUNTIME_2_p =  | ||||||
| !endif | !endif | ||||||
| !if "$(DEBUG_RUNTIME_LIBS)" == "0" | !if "$(DEBUG_RUNTIME_LIBS)" == "0" | ||||||
| ____DEBUGRUNTIME_2_p =  | ____DEBUGRUNTIME_2_p =  | ||||||
| !endif | !endif | ||||||
| !if "$(DEBUG_RUNTIME_LIBS)" == "1" | !if "$(DEBUG_RUNTIME_LIBS)" == "1" | ||||||
| ____DEBUGRUNTIME_2_p = /D_DEBUG | ____DEBUGRUNTIME_2_p = /D_DEBUG | ||||||
| !endif | !endif | ||||||
| !if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" | !if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" | ||||||
| __DEBUGRUNTIME_3 = d | __DEBUGRUNTIME_3 = d | ||||||
| !endif | !endif | ||||||
| !if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" | !if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" | ||||||
| __DEBUGRUNTIME_3 =  | __DEBUGRUNTIME_3 =  | ||||||
| !endif | !endif | ||||||
| !if "$(DEBUG_RUNTIME_LIBS)" == "0" | !if "$(DEBUG_RUNTIME_LIBS)" == "0" | ||||||
| __DEBUGRUNTIME_3 =  | __DEBUGRUNTIME_3 =  | ||||||
| !endif | !endif | ||||||
| !if "$(DEBUG_RUNTIME_LIBS)" == "1" | !if "$(DEBUG_RUNTIME_LIBS)" == "1" | ||||||
| __DEBUGRUNTIME_3 = d | __DEBUGRUNTIME_3 = d | ||||||
| !endif | !endif | ||||||
| !if "$(BUILD)" == "debug" | !if "$(BUILD)" == "debug" | ||||||
| __OPTIMIZEFLAG_4 = /Od | __OPTIMIZEFLAG_4 = /Od | ||||||
| !endif | !endif | ||||||
| !if "$(BUILD)" == "release" | !if "$(BUILD)" == "release" | ||||||
| __OPTIMIZEFLAG_4 = /O2 | __OPTIMIZEFLAG_4 = /O2 | ||||||
| !endif | !endif | ||||||
| !if "$(USE_THREADS)" == "0" | !if "$(USE_THREADS)" == "0" | ||||||
| __THREADSFLAG_7 = L | __THREADSFLAG_7 = L | ||||||
| !endif | !endif | ||||||
| !if "$(USE_THREADS)" == "1" | !if "$(USE_THREADS)" == "1" | ||||||
| __THREADSFLAG_7 = T | __THREADSFLAG_7 = T | ||||||
| !endif | !endif | ||||||
| !if "$(RUNTIME_LIBS)" == "dynamic" | !if "$(RUNTIME_LIBS)" == "dynamic" | ||||||
| __RUNTIME_LIBS_8 = D | __RUNTIME_LIBS_8 = D | ||||||
| !endif | !endif | ||||||
| !if "$(RUNTIME_LIBS)" == "static" | !if "$(RUNTIME_LIBS)" == "static" | ||||||
| __RUNTIME_LIBS_8 = $(__THREADSFLAG_7) | __RUNTIME_LIBS_8 = $(__THREADSFLAG_7) | ||||||
| !endif | !endif | ||||||
| !if "$(USE_RTTI)" == "0" | !if "$(USE_RTTI)" == "0" | ||||||
| __RTTIFLAG_9 =  | __RTTIFLAG_9 =  | ||||||
| !endif | !endif | ||||||
| !if "$(USE_RTTI)" == "1" | !if "$(USE_RTTI)" == "1" | ||||||
| __RTTIFLAG_9 = /GR | __RTTIFLAG_9 = /GR | ||||||
| !endif | !endif | ||||||
| !if "$(USE_EXCEPTIONS)" == "0" | !if "$(USE_EXCEPTIONS)" == "0" | ||||||
| __EXCEPTIONSFLAG_10 =  | __EXCEPTIONSFLAG_10 =  | ||||||
| !endif | !endif | ||||||
| !if "$(USE_EXCEPTIONS)" == "1" | !if "$(USE_EXCEPTIONS)" == "1" | ||||||
| __EXCEPTIONSFLAG_10 = /EHsc | __EXCEPTIONSFLAG_10 = /EHsc | ||||||
| !endif | !endif | ||||||
| !if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" | !if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" | ||||||
| __NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ | __NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ | ||||||
| !endif | !endif | ||||||
| !if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" | !if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" | ||||||
| __NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ | __NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ | ||||||
| !endif | !endif | ||||||
| !if "$(WXUNIV)" == "1" | !if "$(WXUNIV)" == "1" | ||||||
| __WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ | __WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ | ||||||
| !endif | !endif | ||||||
| !if "$(DEBUG_FLAG)" == "0" | !if "$(DEBUG_FLAG)" == "0" | ||||||
| __DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 | __DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 | ||||||
| !endif | !endif | ||||||
| !if "$(USE_EXCEPTIONS)" == "0" | !if "$(USE_EXCEPTIONS)" == "0" | ||||||
| __EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS | __EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS | ||||||
| !endif | !endif | ||||||
| !if "$(USE_RTTI)" == "0" | !if "$(USE_RTTI)" == "0" | ||||||
| __RTTI_DEFINE_p = /DwxNO_RTTI | __RTTI_DEFINE_p = /DwxNO_RTTI | ||||||
| !endif | !endif | ||||||
| !if "$(USE_THREADS)" == "0" | !if "$(USE_THREADS)" == "0" | ||||||
| __THREAD_DEFINE_p = /DwxNO_THREADS | __THREAD_DEFINE_p = /DwxNO_THREADS | ||||||
| !endif | !endif | ||||||
| !if "$(UNICODE)" == "0" | !if "$(UNICODE)" == "0" | ||||||
| __UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 | __UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 | ||||||
| !endif | !endif | ||||||
| !if "$(UNICODE)" == "1" | !if "$(UNICODE)" == "1" | ||||||
| __UNICODE_DEFINE_p = /D_UNICODE | __UNICODE_DEFINE_p = /D_UNICODE | ||||||
| !endif | !endif | ||||||
| !if "$(MSLU)" == "1" | !if "$(MSLU)" == "1" | ||||||
| __MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 | __MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 | ||||||
| !endif | !endif | ||||||
| !if "$(USE_GDIPLUS)" == "1" | !if "$(USE_GDIPLUS)" == "1" | ||||||
| __GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 | __GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 | ||||||
| !endif | !endif | ||||||
| !if "$(SHARED)" == "1" | !if "$(SHARED)" == "1" | ||||||
| __DLLFLAG_p = /DWXUSINGDLL | __DLLFLAG_p = /DWXUSINGDLL | ||||||
| !endif | !endif | ||||||
| !if "$(MONOLITHIC)" == "0" | !if "$(MONOLITHIC)" == "0" | ||||||
| __WXLIB_BASE_p = \ | __WXLIB_BASE_p = \ | ||||||
| 	wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib | 	wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib | ||||||
| !endif | !endif | ||||||
| !if "$(MONOLITHIC)" == "1" | !if "$(MONOLITHIC)" == "1" | ||||||
| __WXLIB_MONO_p = \ | __WXLIB_MONO_p = \ | ||||||
| 	wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib | 	wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib | ||||||
| !endif | !endif | ||||||
| !if "$(MSLU)" == "1" | !if "$(MSLU)" == "1" | ||||||
| __UNICOWS_LIB_p = unicows.lib | __UNICOWS_LIB_p = unicows.lib | ||||||
| !endif | !endif | ||||||
| !if "$(USE_GDIPLUS)" == "1" | !if "$(USE_GDIPLUS)" == "1" | ||||||
| __GDIPLUS_LIB_p = gdiplus.lib | __GDIPLUS_LIB_p = gdiplus.lib | ||||||
| !endif | !endif | ||||||
|  |  | ||||||
|  |  | ||||||
| all: $(OBJS) | all: $(OBJS) | ||||||
| $(OBJS): | $(OBJS): | ||||||
| 	-if not exist $(OBJS) mkdir $(OBJS) | 	-if not exist $(OBJS) mkdir $(OBJS) | ||||||
|  |  | ||||||
| ### Targets: ### | ### Targets: ### | ||||||
|  |  | ||||||
| all: $(__execmon___depname) | all: $(__execmon___depname) | ||||||
|  |  | ||||||
| clean:  | clean:  | ||||||
| 	-if exist $(OBJS)\*.obj del $(OBJS)\*.obj | 	-if exist $(OBJS)\*.obj del $(OBJS)\*.obj | ||||||
| 	-if exist $(OBJS)\*.res del $(OBJS)\*.res | 	-if exist $(OBJS)\*.res del $(OBJS)\*.res | ||||||
| 	-if exist $(OBJS)\*.pch del $(OBJS)\*.pch | 	-if exist $(OBJS)\*.pch del $(OBJS)\*.pch | ||||||
| 	-if exist $(OBJS)\execmon.exe del $(OBJS)\execmon.exe | 	-if exist $(OBJS)\execmon.exe del $(OBJS)\execmon.exe | ||||||
| 	-if exist $(OBJS)\execmon.ilk del $(OBJS)\execmon.ilk | 	-if exist $(OBJS)\execmon.ilk del $(OBJS)\execmon.ilk | ||||||
| 	-if exist $(OBJS)\execmon.pdb del $(OBJS)\execmon.pdb | 	-if exist $(OBJS)\execmon.pdb del $(OBJS)\execmon.pdb | ||||||
|  |  | ||||||
| !if "$(USE_XRC)" == "1" | !if "$(USE_XRC)" == "1" | ||||||
| $(OBJS)\execmon.exe: $(EXECMON_OBJECTS) | $(OBJS)\execmon.exe: $(EXECMON_OBJECTS) | ||||||
| 	link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\execmon.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(LDFLAGS) @<< | 	link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\execmon.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(LDFLAGS) @<< | ||||||
| 	$(EXECMON_OBJECTS)   $(__WXLIB_BASE_p)  $(__WXLIB_MONO_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 wininet.lib | 	$(EXECMON_OBJECTS)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_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 wininet.lib | ||||||
| << | << | ||||||
| !endif | !endif | ||||||
|  |  | ||||||
| $(OBJS)\execmon_execmon.obj: .\execmon.cpp | $(OBJS)\execmon_execmon.obj: .\execmon.cpp | ||||||
| 	$(CXX) /c /nologo /TP /Fo$@ $(EXECMON_CXXFLAGS) .\execmon.cpp | 	$(CXX) /c /nologo /TP /Fo$@ $(EXECMON_CXXFLAGS) .\execmon.cpp | ||||||
|  |  | ||||||
|   | |||||||
| @@ -1,245 +1,245 @@ | |||||||
| # ========================================================================= | # ========================================================================= | ||||||
| #     This makefile was generated by | #     This makefile was generated by | ||||||
| #     Bakefile 0.2.6 (http://www.bakefile.org) | #     Bakefile 0.2.6 (http://www.bakefile.org) | ||||||
| #     Do not modify, all changes will be overwritten! | #     Do not modify, all changes will be overwritten! | ||||||
| # ========================================================================= | # ========================================================================= | ||||||
|  |  | ||||||
| !include ../../build/msw/config.wat | !include ../../build/msw/config.wat | ||||||
|  |  | ||||||
| # ------------------------------------------------------------------------- | # ------------------------------------------------------------------------- | ||||||
| # Do not modify the rest of this file! | # Do not modify the rest of this file! | ||||||
| # ------------------------------------------------------------------------- | # ------------------------------------------------------------------------- | ||||||
|  |  | ||||||
| # Speed up compilation a bit: | # Speed up compilation a bit: | ||||||
| !ifdef __LOADDLL__ | !ifdef __LOADDLL__ | ||||||
| !  loaddll wcc      wccd | !  loaddll wcc      wccd | ||||||
| !  loaddll wccaxp   wccdaxp | !  loaddll wccaxp   wccdaxp | ||||||
| !  loaddll wcc386   wccd386 | !  loaddll wcc386   wccd386 | ||||||
| !  loaddll wpp      wppdi86 | !  loaddll wpp      wppdi86 | ||||||
| !  loaddll wppaxp   wppdaxp | !  loaddll wppaxp   wppdaxp | ||||||
| !  loaddll wpp386   wppd386 | !  loaddll wpp386   wppd386 | ||||||
| ! if $(__VERSION__) >= 1280 | ! if $(__VERSION__) >= 1280 | ||||||
| !  loaddll wlink    wlinkd | !  loaddll wlink    wlinkd | ||||||
| ! else | ! else | ||||||
| !  loaddll wlink    wlink | !  loaddll wlink    wlink | ||||||
| ! endif | ! endif | ||||||
| !  loaddll wlib     wlibd | !  loaddll wlib     wlibd | ||||||
| !endif | !endif | ||||||
|  |  | ||||||
| # We need these variables in some bakefile-made rules: | # We need these variables in some bakefile-made rules: | ||||||
| WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- | WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- | ||||||
|  |  | ||||||
| ### Conditionally set variables: ### | ### Conditionally set variables: ### | ||||||
|  |  | ||||||
| PORTNAME = | PORTNAME = | ||||||
| !ifeq USE_GUI 0 | !ifeq USE_GUI 0 | ||||||
| PORTNAME = base | PORTNAME = base | ||||||
| !endif | !endif | ||||||
| !ifeq USE_GUI 1 | !ifeq USE_GUI 1 | ||||||
| PORTNAME = msw | PORTNAME = msw | ||||||
| !endif | !endif | ||||||
| WXDEBUGFLAG = | WXDEBUGFLAG = | ||||||
| !ifeq BUILD debug | !ifeq BUILD debug | ||||||
| WXDEBUGFLAG = d | WXDEBUGFLAG = d | ||||||
| !endif | !endif | ||||||
| WXUNICODEFLAG = | WXUNICODEFLAG = | ||||||
| !ifeq UNICODE 1 | !ifeq UNICODE 1 | ||||||
| WXUNICODEFLAG = u | WXUNICODEFLAG = u | ||||||
| !endif | !endif | ||||||
| WXUNIVNAME = | WXUNIVNAME = | ||||||
| !ifeq WXUNIV 1 | !ifeq WXUNIV 1 | ||||||
| WXUNIVNAME = univ | WXUNIVNAME = univ | ||||||
| !endif | !endif | ||||||
| WXDLLFLAG = | WXDLLFLAG = | ||||||
| !ifeq SHARED 1 | !ifeq SHARED 1 | ||||||
| WXDLLFLAG = dll | WXDLLFLAG = dll | ||||||
| !endif | !endif | ||||||
| LIBTYPE_SUFFIX = | LIBTYPE_SUFFIX = | ||||||
| !ifeq SHARED 0 | !ifeq SHARED 0 | ||||||
| LIBTYPE_SUFFIX = lib | LIBTYPE_SUFFIX = lib | ||||||
| !endif | !endif | ||||||
| !ifeq SHARED 1 | !ifeq SHARED 1 | ||||||
| LIBTYPE_SUFFIX = dll | LIBTYPE_SUFFIX = dll | ||||||
| !endif | !endif | ||||||
| EXTRALIBS_FOR_BASE = | EXTRALIBS_FOR_BASE = | ||||||
| !ifeq MONOLITHIC 0 | !ifeq MONOLITHIC 0 | ||||||
| EXTRALIBS_FOR_BASE =  | EXTRALIBS_FOR_BASE =  | ||||||
| !endif | !endif | ||||||
| !ifeq MONOLITHIC 1 | !ifeq MONOLITHIC 1 | ||||||
| EXTRALIBS_FOR_BASE =   | EXTRALIBS_FOR_BASE =   | ||||||
| !endif | !endif | ||||||
| __execmon___depname = | __execmon___depname = | ||||||
| !ifeq USE_XRC 1 | !ifeq USE_XRC 1 | ||||||
| __execmon___depname = $(OBJS)\execmon.exe | __execmon___depname = $(OBJS)\execmon.exe | ||||||
| !endif | !endif | ||||||
| __DEBUGINFO_0 = | __DEBUGINFO_0 = | ||||||
| !ifeq BUILD debug | !ifeq BUILD debug | ||||||
| !ifeq DEBUG_INFO default | !ifeq DEBUG_INFO default | ||||||
| __DEBUGINFO_0 = -d2 | __DEBUGINFO_0 = -d2 | ||||||
| !endif | !endif | ||||||
| !endif | !endif | ||||||
| !ifeq BUILD release | !ifeq BUILD release | ||||||
| !ifeq DEBUG_INFO default | !ifeq DEBUG_INFO default | ||||||
| __DEBUGINFO_0 = -d0 | __DEBUGINFO_0 = -d0 | ||||||
| !endif | !endif | ||||||
| !endif | !endif | ||||||
| !ifeq DEBUG_INFO 0 | !ifeq DEBUG_INFO 0 | ||||||
| __DEBUGINFO_0 = -d0 | __DEBUGINFO_0 = -d0 | ||||||
| !endif | !endif | ||||||
| !ifeq DEBUG_INFO 1 | !ifeq DEBUG_INFO 1 | ||||||
| __DEBUGINFO_0 = -d2 | __DEBUGINFO_0 = -d2 | ||||||
| !endif | !endif | ||||||
| __DEBUGINFO_1 = | __DEBUGINFO_1 = | ||||||
| !ifeq BUILD debug | !ifeq BUILD debug | ||||||
| !ifeq DEBUG_INFO default | !ifeq DEBUG_INFO default | ||||||
| __DEBUGINFO_1 = debug all | __DEBUGINFO_1 = debug all | ||||||
| !endif | !endif | ||||||
| !endif | !endif | ||||||
| !ifeq BUILD release | !ifeq BUILD release | ||||||
| !ifeq DEBUG_INFO default | !ifeq DEBUG_INFO default | ||||||
| __DEBUGINFO_1 =  | __DEBUGINFO_1 =  | ||||||
| !endif | !endif | ||||||
| !endif | !endif | ||||||
| !ifeq DEBUG_INFO 0 | !ifeq DEBUG_INFO 0 | ||||||
| __DEBUGINFO_1 =  | __DEBUGINFO_1 =  | ||||||
| !endif | !endif | ||||||
| !ifeq DEBUG_INFO 1 | !ifeq DEBUG_INFO 1 | ||||||
| __DEBUGINFO_1 = debug all | __DEBUGINFO_1 = debug all | ||||||
| !endif | !endif | ||||||
| __OPTIMIZEFLAG_2 = | __OPTIMIZEFLAG_2 = | ||||||
| !ifeq BUILD debug | !ifeq BUILD debug | ||||||
| __OPTIMIZEFLAG_2 = -od | __OPTIMIZEFLAG_2 = -od | ||||||
| !endif | !endif | ||||||
| !ifeq BUILD release | !ifeq BUILD release | ||||||
| __OPTIMIZEFLAG_2 = -ot -ox | __OPTIMIZEFLAG_2 = -ot -ox | ||||||
| !endif | !endif | ||||||
| __THREADSFLAG_5 = | __THREADSFLAG_5 = | ||||||
| !ifeq USE_THREADS 0 | !ifeq USE_THREADS 0 | ||||||
| __THREADSFLAG_5 =  | __THREADSFLAG_5 =  | ||||||
| !endif | !endif | ||||||
| !ifeq USE_THREADS 1 | !ifeq USE_THREADS 1 | ||||||
| __THREADSFLAG_5 = -bm | __THREADSFLAG_5 = -bm | ||||||
| !endif | !endif | ||||||
| __RUNTIME_LIBS_6 = | __RUNTIME_LIBS_6 = | ||||||
| !ifeq RUNTIME_LIBS dynamic | !ifeq RUNTIME_LIBS dynamic | ||||||
| __RUNTIME_LIBS_6 = -br | __RUNTIME_LIBS_6 = -br | ||||||
| !endif | !endif | ||||||
| !ifeq RUNTIME_LIBS static | !ifeq RUNTIME_LIBS static | ||||||
| __RUNTIME_LIBS_6 =  | __RUNTIME_LIBS_6 =  | ||||||
| !endif | !endif | ||||||
| __RTTIFLAG_7 = | __RTTIFLAG_7 = | ||||||
| !ifeq USE_RTTI 0 | !ifeq USE_RTTI 0 | ||||||
| __RTTIFLAG_7 =  | __RTTIFLAG_7 =  | ||||||
| !endif | !endif | ||||||
| !ifeq USE_RTTI 1 | !ifeq USE_RTTI 1 | ||||||
| __RTTIFLAG_7 = -xr | __RTTIFLAG_7 = -xr | ||||||
| !endif | !endif | ||||||
| __EXCEPTIONSFLAG_8 = | __EXCEPTIONSFLAG_8 = | ||||||
| !ifeq USE_EXCEPTIONS 0 | !ifeq USE_EXCEPTIONS 0 | ||||||
| __EXCEPTIONSFLAG_8 =  | __EXCEPTIONSFLAG_8 =  | ||||||
| !endif | !endif | ||||||
| !ifeq USE_EXCEPTIONS 1 | !ifeq USE_EXCEPTIONS 1 | ||||||
| __EXCEPTIONSFLAG_8 = -xs | __EXCEPTIONSFLAG_8 = -xs | ||||||
| !endif | !endif | ||||||
| __WXUNIV_DEFINE_p = | __WXUNIV_DEFINE_p = | ||||||
| !ifeq WXUNIV 1 | !ifeq WXUNIV 1 | ||||||
| __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ | __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ | ||||||
| !endif | !endif | ||||||
| __DEBUG_DEFINE_p = | __DEBUG_DEFINE_p = | ||||||
| !ifeq DEBUG_FLAG 0 | !ifeq DEBUG_FLAG 0 | ||||||
| __DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 | __DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 | ||||||
| !endif | !endif | ||||||
| __EXCEPTIONS_DEFINE_p = | __EXCEPTIONS_DEFINE_p = | ||||||
| !ifeq USE_EXCEPTIONS 0 | !ifeq USE_EXCEPTIONS 0 | ||||||
| __EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS | __EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS | ||||||
| !endif | !endif | ||||||
| __RTTI_DEFINE_p = | __RTTI_DEFINE_p = | ||||||
| !ifeq USE_RTTI 0 | !ifeq USE_RTTI 0 | ||||||
| __RTTI_DEFINE_p = -dwxNO_RTTI | __RTTI_DEFINE_p = -dwxNO_RTTI | ||||||
| !endif | !endif | ||||||
| __THREAD_DEFINE_p = | __THREAD_DEFINE_p = | ||||||
| !ifeq USE_THREADS 0 | !ifeq USE_THREADS 0 | ||||||
| __THREAD_DEFINE_p = -dwxNO_THREADS | __THREAD_DEFINE_p = -dwxNO_THREADS | ||||||
| !endif | !endif | ||||||
| __UNICODE_DEFINE_p = | __UNICODE_DEFINE_p = | ||||||
| !ifeq UNICODE 0 | !ifeq UNICODE 0 | ||||||
| __UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 | __UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 | ||||||
| !endif | !endif | ||||||
| !ifeq UNICODE 1 | !ifeq UNICODE 1 | ||||||
| __UNICODE_DEFINE_p = -d_UNICODE | __UNICODE_DEFINE_p = -d_UNICODE | ||||||
| !endif | !endif | ||||||
| __GFXCTX_DEFINE_p = | __GFXCTX_DEFINE_p = | ||||||
| !ifeq USE_GDIPLUS 1 | !ifeq USE_GDIPLUS 1 | ||||||
| __GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 | __GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 | ||||||
| !endif | !endif | ||||||
| __DLLFLAG_p = | __DLLFLAG_p = | ||||||
| !ifeq SHARED 1 | !ifeq SHARED 1 | ||||||
| __DLLFLAG_p = -dWXUSINGDLL | __DLLFLAG_p = -dWXUSINGDLL | ||||||
| !endif | !endif | ||||||
| __WXLIB_BASE_p = | __WXLIB_BASE_p = | ||||||
| !ifeq MONOLITHIC 0 | !ifeq MONOLITHIC 0 | ||||||
| __WXLIB_BASE_p = & | __WXLIB_BASE_p = & | ||||||
| 	wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib | 	wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib | ||||||
| !endif | !endif | ||||||
| __WXLIB_MONO_p = | __WXLIB_MONO_p = | ||||||
| !ifeq MONOLITHIC 1 | !ifeq MONOLITHIC 1 | ||||||
| __WXLIB_MONO_p = & | __WXLIB_MONO_p = & | ||||||
| 	wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib | 	wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib | ||||||
| !endif | !endif | ||||||
| __GDIPLUS_LIB_p = | __GDIPLUS_LIB_p = | ||||||
| !ifeq USE_GDIPLUS 1 | !ifeq USE_GDIPLUS 1 | ||||||
| __GDIPLUS_LIB_p = gdiplus.lib | __GDIPLUS_LIB_p = gdiplus.lib | ||||||
| !endif | !endif | ||||||
|  |  | ||||||
| ### Variables: ### | ### Variables: ### | ||||||
|  |  | ||||||
| WX_RELEASE_NODOT = 29 | WX_RELEASE_NODOT = 29 | ||||||
| COMPILER_PREFIX = wat | COMPILER_PREFIX = wat | ||||||
| OBJS = & | OBJS = & | ||||||
| 	$(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) | 	$(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) | ||||||
| LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) | LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) | ||||||
| SETUPHDIR = & | SETUPHDIR = & | ||||||
| 	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) | 	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) | ||||||
| EXECMON_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & | EXECMON_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & | ||||||
| 	$(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & | 	$(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & | ||||||
| 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & | 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & | ||||||
| 	$(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & | 	$(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & | ||||||
| 	-i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & | 	-i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & | ||||||
| 	-dwxUSE_GUI=0 $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) | 	-dwxUSE_GUI=0 $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) | ||||||
| EXECMON_OBJECTS =  & | EXECMON_OBJECTS =  & | ||||||
| 	$(OBJS)\execmon_execmon.obj | 	$(OBJS)\execmon_execmon.obj | ||||||
|  |  | ||||||
|  |  | ||||||
| all : $(OBJS) | all : $(OBJS) | ||||||
| $(OBJS) : | $(OBJS) : | ||||||
| 	-if not exist $(OBJS) mkdir $(OBJS) | 	-if not exist $(OBJS) mkdir $(OBJS) | ||||||
|  |  | ||||||
| ### Targets: ### | ### Targets: ### | ||||||
|  |  | ||||||
| all : .SYMBOLIC $(__execmon___depname) | all : .SYMBOLIC $(__execmon___depname) | ||||||
|  |  | ||||||
| clean : .SYMBOLIC  | clean : .SYMBOLIC  | ||||||
| 	-if exist $(OBJS)\*.obj del $(OBJS)\*.obj | 	-if exist $(OBJS)\*.obj del $(OBJS)\*.obj | ||||||
| 	-if exist $(OBJS)\*.res del $(OBJS)\*.res | 	-if exist $(OBJS)\*.res del $(OBJS)\*.res | ||||||
| 	-if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc | 	-if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc | ||||||
| 	-if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk | 	-if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk | ||||||
| 	-if exist $(OBJS)\*.pch del $(OBJS)\*.pch | 	-if exist $(OBJS)\*.pch del $(OBJS)\*.pch | ||||||
| 	-if exist $(OBJS)\execmon.exe del $(OBJS)\execmon.exe | 	-if exist $(OBJS)\execmon.exe del $(OBJS)\execmon.exe | ||||||
|  |  | ||||||
| !ifeq USE_XRC 1 | !ifeq USE_XRC 1 | ||||||
| $(OBJS)\execmon.exe :  $(EXECMON_OBJECTS) | $(OBJS)\execmon.exe :  $(EXECMON_OBJECTS) | ||||||
| 	@%create $(OBJS)\execmon.lbc | 	@%create $(OBJS)\execmon.lbc | ||||||
| 	@%append $(OBJS)\execmon.lbc option quiet | 	@%append $(OBJS)\execmon.lbc option quiet | ||||||
| 	@%append $(OBJS)\execmon.lbc name $^@ | 	@%append $(OBJS)\execmon.lbc name $^@ | ||||||
| 	@%append $(OBJS)\execmon.lbc option caseexact | 	@%append $(OBJS)\execmon.lbc option caseexact | ||||||
| 	@%append $(OBJS)\execmon.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt ref 'main_' $(LDFLAGS) | 	@%append $(OBJS)\execmon.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt ref 'main_' $(LDFLAGS) | ||||||
| 	@for %i in ($(EXECMON_OBJECTS)) do @%append $(OBJS)\execmon.lbc file %i | 	@for %i in ($(EXECMON_OBJECTS)) do @%append $(OBJS)\execmon.lbc file %i | ||||||
| 	@for %i in ( $(__WXLIB_BASE_p)  $(__WXLIB_MONO_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 wininet.lib) do @%append $(OBJS)\execmon.lbc library %i | 	@for %i in ( $(__WXLIB_BASE_p)  $(__WXLIB_MONO_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 wininet.lib) do @%append $(OBJS)\execmon.lbc library %i | ||||||
| 	@%append $(OBJS)\execmon.lbc | 	@%append $(OBJS)\execmon.lbc | ||||||
| 	@for %i in () do @%append $(OBJS)\execmon.lbc option stack=%i | 	@for %i in () do @%append $(OBJS)\execmon.lbc option stack=%i | ||||||
| 	wlink @$(OBJS)\execmon.lbc | 	wlink @$(OBJS)\execmon.lbc | ||||||
| !endif | !endif | ||||||
|  |  | ||||||
| $(OBJS)\execmon_execmon.obj :  .AUTODEPEND .\execmon.cpp | $(OBJS)\execmon_execmon.obj :  .AUTODEPEND .\execmon.cpp | ||||||
| 	$(CXX) -bt=nt -zq -fo=$^@ $(EXECMON_CXXFLAGS) $< | 	$(CXX) -bt=nt -zq -fo=$^@ $(EXECMON_CXXFLAGS) $< | ||||||
|  |  | ||||||
|   | |||||||
| @@ -1,6 +1,6 @@ | |||||||
| # ========================================================================= | # ========================================================================= | ||||||
| #     This makefile was generated by | #     This makefile was generated by | ||||||
| #     Bakefile 0.2.5 (http://www.bakefile.org) | #     Bakefile 0.2.6 (http://www.bakefile.org) | ||||||
| #     Do not modify, all changes will be overwritten! | #     Do not modify, all changes will be overwritten! | ||||||
| # ========================================================================= | # ========================================================================= | ||||||
|  |  | ||||||
|   | |||||||
| @@ -1,6 +1,6 @@ | |||||||
| # ========================================================================= | # ========================================================================= | ||||||
| #     This makefile was generated by | #     This makefile was generated by | ||||||
| #     Bakefile 0.2.5 (http://www.bakefile.org) | #     Bakefile 0.2.6 (http://www.bakefile.org) | ||||||
| #     Do not modify, all changes will be overwritten! | #     Do not modify, all changes will be overwritten! | ||||||
| # ========================================================================= | # ========================================================================= | ||||||
|  |  | ||||||
|   | |||||||
| @@ -1,6 +1,6 @@ | |||||||
| # ========================================================================= | # ========================================================================= | ||||||
| #     This makefile was generated by | #     This makefile was generated by | ||||||
| #     Bakefile 0.2.5 (http://www.bakefile.org) | #     Bakefile 0.2.6 (http://www.bakefile.org) | ||||||
| #     Do not modify, all changes will be overwritten! | #     Do not modify, all changes will be overwritten! | ||||||
| # ========================================================================= | # ========================================================================= | ||||||
|  |  | ||||||
|   | |||||||
| @@ -1,6 +1,6 @@ | |||||||
| # ========================================================================= | # ========================================================================= | ||||||
| #     This makefile was generated by | #     This makefile was generated by | ||||||
| #     Bakefile 0.2.5 (http://www.bakefile.org) | #     Bakefile 0.2.6 (http://www.bakefile.org) | ||||||
| #     Do not modify, all changes will be overwritten! | #     Do not modify, all changes will be overwritten! | ||||||
| # ========================================================================= | # ========================================================================= | ||||||
|  |  | ||||||
| @@ -18,7 +18,11 @@ | |||||||
| !  loaddll wpp      wppdi86 | !  loaddll wpp      wppdi86 | ||||||
| !  loaddll wppaxp   wppdaxp | !  loaddll wppaxp   wppdaxp | ||||||
| !  loaddll wpp386   wppd386 | !  loaddll wpp386   wppd386 | ||||||
|  | ! if $(__VERSION__) >= 1280 | ||||||
|  | !  loaddll wlink    wlinkd | ||||||
|  | ! else | ||||||
| !  loaddll wlink    wlink | !  loaddll wlink    wlink | ||||||
|  | ! endif | ||||||
| !  loaddll wlib     wlibd | !  loaddll wlib     wlibd | ||||||
| !endif | !endif | ||||||
|  |  | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user