diff --git a/Makefile.in b/Makefile.in index 5855a1943d..ca036326e3 100644 --- a/Makefile.in +++ b/Makefile.in @@ -70,7 +70,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 2.8 WX_RELEASE_NODOT = 28 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib WXREGEX_CFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(____SHARED) \ $(CPPFLAGS) $(CFLAGS) @@ -1511,7 +1511,7 @@ LOCALE_MSW_LINGUAS = it @COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX) @COND_USE_PLUGINS_0@PLUGIN_ADV_EXTRALIBS = $(EXTRALIBS_SDL) @COND_PLATFORM_MACOSX_1@WXMACVERSION_CMD = \ -@COND_PLATFORM_MACOSX_1@ -compatibility_version 1.0 -current_version 1.0 +@COND_PLATFORM_MACOSX_1@ -compatibility_version 2.0 -current_version 2.0 @COND_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -11241,9 +11241,9 @@ COND_TOOLKIT_MSW___ADVANCED_PLATFORM_SRC_OBJECTS_9 = \ @COND_USE_SOVERSION_0@dll___targetsuf2 = .$(SO_SUFFIX) @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@dll___targetsuf3 \ @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ = \ -@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ .$(SO_SUFFIX).0.0.0 +@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ .$(SO_SUFFIX).0.1.0 @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@dll___targetsuf3 \ -@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .0.0.0.$(SO_SUFFIX) +@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .0.1.0.$(SO_SUFFIX) @COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@dll___targetsuf3 = -0.$(SO_SUFFIX) @COND_USE_SOVERSION_0@dll___targetsuf3 = .$(SO_SUFFIX) @COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \ diff --git a/build/msw/makefile.bcc b/build/msw/makefile.bcc index 62573010e7..5373567ae6 100644 --- a/build/msw/makefile.bcc +++ b/build/msw/makefile.bcc @@ -4141,7 +4141,7 @@ $(SETUPHDIR)\wx\msw\rcdefs.h: $(SETUPHDIR)\wx\msw ..\..\include\wx\msw\genrcdefs build_cfg_file: $(SETUPHDIR) @echo WXVER_MAJOR=2 >$(BUILD_CFG_FILE) @echo WXVER_MINOR=8 >>$(BUILD_CFG_FILE) - @echo WXVER_RELEASE=0 >>$(BUILD_CFG_FILE) + @echo WXVER_RELEASE=2 >>$(BUILD_CFG_FILE) @echo BUILD=$(BUILD) >>$(BUILD_CFG_FILE) @echo MONOLITHIC=$(MONOLITHIC) >>$(BUILD_CFG_FILE) @echo SHARED=$(SHARED) >>$(BUILD_CFG_FILE) diff --git a/build/msw/makefile.gcc b/build/msw/makefile.gcc index 7f7e27ccdd..b2d36b0b41 100644 --- a/build/msw/makefile.gcc +++ b/build/msw/makefile.gcc @@ -3934,7 +3934,7 @@ $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a: $(WXEXPAT_OBJECTS) ifeq ($(MONOLITHIC),1) ifeq ($(SHARED),1) $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gcc$(VENDORTAG).dll: $(MONODLL_OBJECTS) $(OBJS)\monodll_version_rc.o $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a - $(CXX) -shared -fPIC -o $@ $(MONODLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 + $(CXX) -shared -fPIC -o $@ $(MONODLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 endif endif @@ -3950,7 +3950,7 @@ endif ifeq ($(MONOLITHIC),0) ifeq ($(SHARED),1) $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gcc$(VENDORTAG).dll: $(BASEDLL_OBJECTS) $(OBJS)\basedll_version_rc.o $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a - $(CXX) -shared -fPIC -o $@ $(BASEDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a -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 -lodbc32 + $(CXX) -shared -fPIC -o $@ $(BASEDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a -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 -lodbc32 endif endif @@ -3966,7 +3966,7 @@ endif ifeq ($(MONOLITHIC),0) ifeq ($(SHARED),1) $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_gcc$(VENDORTAG).dll: $(NETDLL_OBJECTS) $(OBJS)\netdll_version_rc.o $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(__basedll___depname) - $(CXX) -shared -fPIC -o $@ $(NETDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.a -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 -lodbc32 $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a + $(CXX) -shared -fPIC -o $@ $(NETDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.a -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 -lodbc32 $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a endif endif @@ -3983,7 +3983,7 @@ ifeq ($(MONOLITHIC),0) ifeq ($(SHARED),1) ifeq ($(USE_GUI),1) $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_gcc$(VENDORTAG).dll: $(COREDLL_OBJECTS) $(OBJS)\coredll_version_rc.o $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(__basedll___depname) - $(CXX) -shared -fPIC -o $@ $(COREDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a + $(CXX) -shared -fPIC -o $@ $(COREDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a endif endif endif @@ -4003,7 +4003,7 @@ ifeq ($(MONOLITHIC),0) ifeq ($(SHARED),1) ifeq ($(USE_GUI),1) $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_gcc$(VENDORTAG).dll: $(ADVDLL_OBJECTS) $(OBJS)\advdll_version_rc.o $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(__coredll___depname) $(__basedll___depname) - $(CXX) -shared -fPIC -o $@ $(ADVDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.a $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a + $(CXX) -shared -fPIC -o $@ $(ADVDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.a $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a endif endif endif @@ -4024,7 +4024,7 @@ ifeq ($(SHARED),1) ifeq ($(USE_GUI),1) ifeq ($(USE_MEDIA),1) $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_gcc$(VENDORTAG).dll: $(MEDIADLL_OBJECTS) $(OBJS)\mediadll_version_rc.o $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(__coredll___depname) $(__basedll___depname) - $(CXX) -shared -fPIC -o $@ $(MEDIADLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.a $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a + $(CXX) -shared -fPIC -o $@ $(MEDIADLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.a $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a endif endif endif @@ -4047,7 +4047,7 @@ ifeq ($(MONOLITHIC),0) ifeq ($(SHARED),1) ifeq ($(USE_ODBC),1) $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_gcc$(VENDORTAG).dll: $(ODBCDLL_OBJECTS) $(OBJS)\odbcdll_version_rc.o $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(__basedll___depname) - $(CXX) -shared -fPIC -o $@ $(ODBCDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.a -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 -lodbc32 $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a + $(CXX) -shared -fPIC -o $@ $(ODBCDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.a -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 -lodbc32 $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a endif endif endif @@ -4068,7 +4068,7 @@ ifeq ($(SHARED),1) ifeq ($(USE_GUI),1) ifeq ($(USE_ODBC),1) $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_gcc$(VENDORTAG).dll: $(DBGRIDDLL_OBJECTS) $(OBJS)\dbgriddll_version_rc.o $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(__advdll___depname) $(__odbcdll___depname) $(__coredll___depname) $(__basedll___depname) - $(CXX) -shared -fPIC -o $@ $(DBGRIDDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.a $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.a $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a + $(CXX) -shared -fPIC -o $@ $(DBGRIDDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.a $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.a $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a endif endif endif @@ -4092,7 +4092,7 @@ ifeq ($(SHARED),1) ifeq ($(USE_GUI),1) ifeq ($(USE_HTML),1) $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_gcc$(VENDORTAG).dll: $(HTMLDLL_OBJECTS) $(OBJS)\htmldll_version_rc.o $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(__coredll___depname) $(__basedll___depname) - $(CXX) -shared -fPIC -o $@ $(HTMLDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.a $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a + $(CXX) -shared -fPIC -o $@ $(HTMLDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.a $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a endif endif endif @@ -4116,7 +4116,7 @@ ifeq ($(SHARED),1) ifeq ($(USE_GUI),1) ifeq ($(USE_QA),1) $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_gcc$(VENDORTAG).dll: $(QADLL_OBJECTS) $(OBJS)\qadll_version_rc.o $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(__coredll___depname) $(__basedll___depname) $(__xmldll___depname) - $(CXX) -shared -fPIC -o $@ $(QADLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.a $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.a + $(CXX) -shared -fPIC -o $@ $(QADLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.a $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.a endif endif endif @@ -4138,7 +4138,7 @@ endif ifeq ($(MONOLITHIC),0) ifeq ($(SHARED),1) $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_gcc$(VENDORTAG).dll: $(XMLDLL_OBJECTS) $(OBJS)\xmldll_version_rc.o $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(__basedll___depname) - $(CXX) -shared -fPIC -o $@ $(XMLDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.a -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 -lodbc32 $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a + $(CXX) -shared -fPIC -o $@ $(XMLDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.a -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 -lodbc32 $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a endif endif @@ -4155,7 +4155,7 @@ ifeq ($(MONOLITHIC),0) ifeq ($(SHARED),1) ifeq ($(USE_XRC),1) $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_gcc$(VENDORTAG).dll: $(XRCDLL_OBJECTS) $(OBJS)\xrcdll_version_rc.o $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(__htmldll___depname) $(__advdll___depname) $(__coredll___depname) $(__xmldll___depname) $(__basedll___depname) - $(CXX) -shared -fPIC -o $@ $(XRCDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.a $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.a $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.a $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a + $(CXX) -shared -fPIC -o $@ $(XRCDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.a $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.a $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.a $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a endif endif endif @@ -4175,7 +4175,7 @@ ifeq ($(MONOLITHIC),0) ifeq ($(SHARED),1) ifeq ($(USE_AUI),1) $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_gcc$(VENDORTAG).dll: $(AUIDLL_OBJECTS) $(OBJS)\auidll_version_rc.o $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(__advdll___depname) $(__coredll___depname) $(__basedll___depname) - $(CXX) -shared -fPIC -o $@ $(AUIDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.a $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.a $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a + $(CXX) -shared -fPIC -o $@ $(AUIDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.a $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.a $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a endif endif endif @@ -4195,7 +4195,7 @@ ifeq ($(MONOLITHIC),0) ifeq ($(SHARED),1) ifeq ($(USE_RICHTEXT),1) $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_gcc$(VENDORTAG).dll: $(RICHTEXTDLL_OBJECTS) $(OBJS)\richtextdll_version_rc.o $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(__advdll___depname) $(__htmldll___depname) $(__xmldll___depname) $(__coredll___depname) $(__basedll___depname) - $(CXX) -shared -fPIC -o $@ $(RICHTEXTDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.a $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.a $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.a $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a + $(CXX) -shared -fPIC -o $@ $(RICHTEXTDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.a $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.a $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.a $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a endif endif endif @@ -4215,7 +4215,7 @@ ifeq ($(SHARED),1) ifeq ($(USE_GUI),1) ifeq ($(USE_OPENGL),1) $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_gcc$(VENDORTAG).dll: $(GLDLL_OBJECTS) $(OBJS)\gldll_version_rc.o $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(__basedll___depname) $(__coredll___depname) - $(CXX) -shared -fPIC -o $@ $(GLDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.a $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p) -lopengl32 -lglu32 + $(CXX) -shared -fPIC -o $@ $(GLDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.a $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p) -lopengl32 -lglu32 endif endif endif @@ -4258,7 +4258,7 @@ $(SETUPHDIR)\wx\msw\rcdefs.h: $(SETUPHDIR)\wx\msw ..\..\include\wx\msw\genrcdefs build_cfg_file: $(SETUPHDIR) @echo WXVER_MAJOR=2 >$(BUILD_CFG_FILE) @echo WXVER_MINOR=8 >>$(BUILD_CFG_FILE) - @echo WXVER_RELEASE=0 >>$(BUILD_CFG_FILE) + @echo WXVER_RELEASE=2 >>$(BUILD_CFG_FILE) @echo BUILD=$(BUILD) >>$(BUILD_CFG_FILE) @echo MONOLITHIC=$(MONOLITHIC) >>$(BUILD_CFG_FILE) @echo SHARED=$(SHARED) >>$(BUILD_CFG_FILE) diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc index 8a9cfe54c2..94e90807e6 100644 --- a/build/msw/makefile.vc +++ b/build/msw/makefile.vc @@ -4474,7 +4474,7 @@ $(SETUPHDIR)\wx\msw\rcdefs.h: $(SETUPHDIR)\wx\msw ..\..\include\wx\msw\genrcdefs build_cfg_file: $(SETUPHDIR) @echo WXVER_MAJOR=2 >$(BUILD_CFG_FILE) @echo WXVER_MINOR=8 >>$(BUILD_CFG_FILE) - @echo WXVER_RELEASE=0 >>$(BUILD_CFG_FILE) + @echo WXVER_RELEASE=2 >>$(BUILD_CFG_FILE) @echo BUILD=$(BUILD) >>$(BUILD_CFG_FILE) @echo MONOLITHIC=$(MONOLITHIC) >>$(BUILD_CFG_FILE) @echo SHARED=$(SHARED) >>$(BUILD_CFG_FILE) diff --git a/build/msw/makefile.wat b/build/msw/makefile.wat index 779b9a25be..cc2479153a 100644 --- a/build/msw/makefile.wat +++ b/build/msw/makefile.wat @@ -4486,7 +4486,7 @@ $(SETUPHDIR)\wx\msw\rcdefs.h : $(SETUPHDIR)\wx\msw ..\..\include\wx\msw\genrcde build_cfg_file : .SYMBOLIC $(SETUPHDIR) @echo WXVER_MAJOR=2 >$(BUILD_CFG_FILE) @echo WXVER_MINOR=8 >>$(BUILD_CFG_FILE) - @echo WXVER_RELEASE=0 >>$(BUILD_CFG_FILE) + @echo WXVER_RELEASE=2 >>$(BUILD_CFG_FILE) @echo BUILD=$(BUILD) >>$(BUILD_CFG_FILE) @echo MONOLITHIC=$(MONOLITHIC) >>$(BUILD_CFG_FILE) @echo SHARED=$(SHARED) >>$(BUILD_CFG_FILE) diff --git a/build/msw/wx_adv.dsp b/build/msw/wx_adv.dsp index 0d8fcd096b..a6d5144e4f 100644 --- a/build/msw/wx_adv.dsp +++ b/build/msw/wx_adv.dsp @@ -701,7 +701,7 @@ SOURCE=..\..\include\wx\univ\setup.h !IF "$(CFG)" == "adv - Win32 DLL Universal Unicode Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h -InputPath=..\include\wx\univ\setup.h +InputPath=..\..\include\wx\univ\setup.h "..\..\lib\vc_dll\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h @@ -711,7 +711,7 @@ InputPath=..\include\wx\univ\setup.h !ELSEIF "$(CFG)" == "adv - Win32 DLL Universal Unicode Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h -InputPath=..\include\wx\univ\setup.h +InputPath=..\..\include\wx\univ\setup.h "..\..\lib\vc_dll\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswunivud\wx\setup.h @@ -721,7 +721,7 @@ InputPath=..\include\wx\univ\setup.h !ELSEIF "$(CFG)" == "adv - Win32 DLL Universal Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\setup.h -InputPath=..\include\wx\univ\setup.h +InputPath=..\..\include\wx\univ\setup.h "..\..\lib\vc_dll\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswuniv\wx\setup.h @@ -731,7 +731,7 @@ InputPath=..\include\wx\univ\setup.h !ELSEIF "$(CFG)" == "adv - Win32 DLL Universal Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\setup.h -InputPath=..\include\wx\univ\setup.h +InputPath=..\..\include\wx\univ\setup.h "..\..\lib\vc_dll\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswunivd\wx\setup.h @@ -765,7 +765,7 @@ InputPath=..\include\wx\univ\setup.h !ELSEIF "$(CFG)" == "adv - Win32 Universal Unicode Release" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h -InputPath=..\include\wx\univ\setup.h +InputPath=..\..\include\wx\univ\setup.h "..\..\lib\vc_lib\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h @@ -775,7 +775,7 @@ InputPath=..\include\wx\univ\setup.h !ELSEIF "$(CFG)" == "adv - Win32 Universal Unicode Debug" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h -InputPath=..\include\wx\univ\setup.h +InputPath=..\..\include\wx\univ\setup.h "..\..\lib\vc_lib\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h @@ -785,7 +785,7 @@ InputPath=..\include\wx\univ\setup.h !ELSEIF "$(CFG)" == "adv - Win32 Universal Release" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\setup.h -InputPath=..\include\wx\univ\setup.h +InputPath=..\..\include\wx\univ\setup.h "..\..\lib\vc_lib\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_lib\mswuniv\wx\setup.h @@ -795,7 +795,7 @@ InputPath=..\include\wx\univ\setup.h !ELSEIF "$(CFG)" == "adv - Win32 Universal Debug" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\setup.h -InputPath=..\include\wx\univ\setup.h +InputPath=..\..\include\wx\univ\setup.h "..\..\lib\vc_lib\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_lib\mswunivd\wx\setup.h @@ -860,7 +860,7 @@ SOURCE=..\..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "adv - Win32 DLL Unicode Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\..\include\wx\msw\setup.h "..\..\lib\vc_dll\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswu\wx\setup.h @@ -870,7 +870,7 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "adv - Win32 DLL Unicode Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\..\include\wx\msw\setup.h "..\..\lib\vc_dll\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswud\wx\setup.h @@ -880,7 +880,7 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "adv - Win32 DLL Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\..\include\wx\msw\setup.h "..\..\lib\vc_dll\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\msw\wx\setup.h @@ -890,7 +890,7 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "adv - Win32 DLL Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\..\include\wx\msw\setup.h "..\..\lib\vc_dll\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswd\wx\setup.h @@ -924,7 +924,7 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "adv - Win32 Unicode Release" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\..\include\wx\msw\setup.h "..\..\lib\vc_lib\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_lib\mswu\wx\setup.h @@ -934,7 +934,7 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "adv - Win32 Unicode Debug" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\..\include\wx\msw\setup.h "..\..\lib\vc_lib\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_lib\mswud\wx\setup.h @@ -944,7 +944,7 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "adv - Win32 Release" # Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\..\include\wx\msw\setup.h "..\..\lib\vc_lib\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_lib\msw\wx\setup.h @@ -954,7 +954,7 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "adv - Win32 Debug" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\..\include\wx\msw\setup.h "..\..\lib\vc_lib\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_lib\mswd\wx\setup.h @@ -979,8 +979,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !IF "$(CFG)" == "adv - Win32 DLL Universal Unicode Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswunivu\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h" # End Custom Build @@ -988,8 +989,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "adv - Win32 DLL Universal Unicode Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswunivud\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" # End Custom Build @@ -997,8 +999,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "adv - Win32 DLL Universal Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswuniv\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h" # End Custom Build @@ -1006,8 +1009,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "adv - Win32 DLL Universal Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswunivd\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h" # End Custom Build @@ -1015,8 +1019,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "adv - Win32 DLL Unicode Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswu\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" # End Custom Build @@ -1024,8 +1029,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "adv - Win32 DLL Unicode Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswud\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" # End Custom Build @@ -1033,8 +1039,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "adv - Win32 DLL Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_dll\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_dll\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\msw\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\msw\wx\msw\rcdefs.h" # End Custom Build @@ -1042,8 +1049,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "adv - Win32 DLL Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswd\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h" # End Custom Build @@ -1051,8 +1059,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "adv - Win32 Universal Unicode Release" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswunivu\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h" # End Custom Build @@ -1060,8 +1069,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "adv - Win32 Universal Unicode Debug" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswunivud\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" # End Custom Build @@ -1069,8 +1079,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "adv - Win32 Universal Release" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswuniv\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h" # End Custom Build @@ -1078,8 +1089,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "adv - Win32 Universal Debug" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswunivd\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h" # End Custom Build @@ -1087,8 +1099,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "adv - Win32 Unicode Release" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswu\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" # End Custom Build @@ -1096,8 +1109,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "adv - Win32 Unicode Debug" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswud\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" # End Custom Build @@ -1105,8 +1119,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "adv - Win32 Release" # Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_lib\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_lib\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\msw\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\msw\wx\msw\rcdefs.h" # End Custom Build @@ -1114,8 +1129,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "adv - Win32 Debug" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswd\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h" # End Custom Build diff --git a/build/msw/wx_aui.dsp b/build/msw/wx_aui.dsp index 5696a34abf..aa820cedc8 100644 --- a/build/msw/wx_aui.dsp +++ b/build/msw/wx_aui.dsp @@ -534,7 +534,7 @@ SOURCE=..\..\include\wx\univ\setup.h !IF "$(CFG)" == "aui - Win32 DLL Universal Unicode Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h -InputPath=..\include\wx\univ\setup.h +InputPath=..\..\include\wx\univ\setup.h "..\..\lib\vc_dll\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h @@ -544,7 +544,7 @@ InputPath=..\include\wx\univ\setup.h !ELSEIF "$(CFG)" == "aui - Win32 DLL Universal Unicode Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h -InputPath=..\include\wx\univ\setup.h +InputPath=..\..\include\wx\univ\setup.h "..\..\lib\vc_dll\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswunivud\wx\setup.h @@ -554,7 +554,7 @@ InputPath=..\include\wx\univ\setup.h !ELSEIF "$(CFG)" == "aui - Win32 DLL Universal Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\setup.h -InputPath=..\include\wx\univ\setup.h +InputPath=..\..\include\wx\univ\setup.h "..\..\lib\vc_dll\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswuniv\wx\setup.h @@ -564,7 +564,7 @@ InputPath=..\include\wx\univ\setup.h !ELSEIF "$(CFG)" == "aui - Win32 DLL Universal Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\setup.h -InputPath=..\include\wx\univ\setup.h +InputPath=..\..\include\wx\univ\setup.h "..\..\lib\vc_dll\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswunivd\wx\setup.h @@ -598,7 +598,7 @@ InputPath=..\include\wx\univ\setup.h !ELSEIF "$(CFG)" == "aui - Win32 Universal Unicode Release" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h -InputPath=..\include\wx\univ\setup.h +InputPath=..\..\include\wx\univ\setup.h "..\..\lib\vc_lib\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h @@ -608,7 +608,7 @@ InputPath=..\include\wx\univ\setup.h !ELSEIF "$(CFG)" == "aui - Win32 Universal Unicode Debug" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h -InputPath=..\include\wx\univ\setup.h +InputPath=..\..\include\wx\univ\setup.h "..\..\lib\vc_lib\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h @@ -618,7 +618,7 @@ InputPath=..\include\wx\univ\setup.h !ELSEIF "$(CFG)" == "aui - Win32 Universal Release" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\setup.h -InputPath=..\include\wx\univ\setup.h +InputPath=..\..\include\wx\univ\setup.h "..\..\lib\vc_lib\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_lib\mswuniv\wx\setup.h @@ -628,7 +628,7 @@ InputPath=..\include\wx\univ\setup.h !ELSEIF "$(CFG)" == "aui - Win32 Universal Debug" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\setup.h -InputPath=..\include\wx\univ\setup.h +InputPath=..\..\include\wx\univ\setup.h "..\..\lib\vc_lib\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_lib\mswunivd\wx\setup.h @@ -693,7 +693,7 @@ SOURCE=..\..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "aui - Win32 DLL Unicode Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\..\include\wx\msw\setup.h "..\..\lib\vc_dll\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswu\wx\setup.h @@ -703,7 +703,7 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "aui - Win32 DLL Unicode Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\..\include\wx\msw\setup.h "..\..\lib\vc_dll\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswud\wx\setup.h @@ -713,7 +713,7 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "aui - Win32 DLL Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\..\include\wx\msw\setup.h "..\..\lib\vc_dll\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\msw\wx\setup.h @@ -723,7 +723,7 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "aui - Win32 DLL Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\..\include\wx\msw\setup.h "..\..\lib\vc_dll\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswd\wx\setup.h @@ -757,7 +757,7 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "aui - Win32 Unicode Release" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\..\include\wx\msw\setup.h "..\..\lib\vc_lib\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_lib\mswu\wx\setup.h @@ -767,7 +767,7 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "aui - Win32 Unicode Debug" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\..\include\wx\msw\setup.h "..\..\lib\vc_lib\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_lib\mswud\wx\setup.h @@ -777,7 +777,7 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "aui - Win32 Release" # Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\..\include\wx\msw\setup.h "..\..\lib\vc_lib\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_lib\msw\wx\setup.h @@ -787,7 +787,7 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "aui - Win32 Debug" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\..\include\wx\msw\setup.h "..\..\lib\vc_lib\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_lib\mswd\wx\setup.h @@ -808,8 +808,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !IF "$(CFG)" == "aui - Win32 DLL Universal Unicode Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswunivu\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h" # End Custom Build @@ -817,8 +818,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "aui - Win32 DLL Universal Unicode Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswunivud\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" # End Custom Build @@ -826,8 +828,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "aui - Win32 DLL Universal Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswuniv\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h" # End Custom Build @@ -835,8 +838,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "aui - Win32 DLL Universal Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswunivd\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h" # End Custom Build @@ -844,8 +848,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "aui - Win32 DLL Unicode Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswu\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" # End Custom Build @@ -853,8 +858,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "aui - Win32 DLL Unicode Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswud\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" # End Custom Build @@ -862,8 +868,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "aui - Win32 DLL Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_dll\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_dll\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\msw\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\msw\wx\msw\rcdefs.h" # End Custom Build @@ -871,8 +878,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "aui - Win32 DLL Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswd\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h" # End Custom Build @@ -880,8 +888,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "aui - Win32 Universal Unicode Release" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswunivu\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h" # End Custom Build @@ -889,8 +898,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "aui - Win32 Universal Unicode Debug" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswunivud\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" # End Custom Build @@ -898,8 +908,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "aui - Win32 Universal Release" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswuniv\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h" # End Custom Build @@ -907,8 +918,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "aui - Win32 Universal Debug" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswunivd\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h" # End Custom Build @@ -916,8 +928,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "aui - Win32 Unicode Release" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswu\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" # End Custom Build @@ -925,8 +938,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "aui - Win32 Unicode Debug" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswud\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" # End Custom Build @@ -934,8 +948,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "aui - Win32 Release" # Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_lib\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_lib\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\msw\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\msw\wx\msw\rcdefs.h" # End Custom Build @@ -943,8 +958,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "aui - Win32 Debug" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswd\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h" # End Custom Build diff --git a/build/msw/wx_base.dsp b/build/msw/wx_base.dsp index e9abfa1a62..bc2e5ff96e 100644 --- a/build/msw/wx_base.dsp +++ b/build/msw/wx_base.dsp @@ -911,7 +911,7 @@ SOURCE=..\..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "base - Win32 DLL Unicode Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\..\include\wx\msw\setup.h "..\..\lib\vc_dll\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswu\wx\setup.h @@ -921,7 +921,7 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "base - Win32 DLL Unicode Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\..\include\wx\msw\setup.h "..\..\lib\vc_dll\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswud\wx\setup.h @@ -931,7 +931,7 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "base - Win32 DLL Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\..\include\wx\msw\setup.h "..\..\lib\vc_dll\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\msw\wx\setup.h @@ -941,7 +941,7 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "base - Win32 DLL Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\..\include\wx\msw\setup.h "..\..\lib\vc_dll\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswd\wx\setup.h @@ -975,7 +975,7 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "base - Win32 Unicode Release" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\..\include\wx\msw\setup.h "..\..\lib\vc_lib\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_lib\mswu\wx\setup.h @@ -985,7 +985,7 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "base - Win32 Unicode Debug" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\..\include\wx\msw\setup.h "..\..\lib\vc_lib\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_lib\mswud\wx\setup.h @@ -995,7 +995,7 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "base - Win32 Release" # Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\..\include\wx\msw\setup.h "..\..\lib\vc_lib\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_lib\msw\wx\setup.h @@ -1005,7 +1005,7 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "base - Win32 Debug" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\..\include\wx\msw\setup.h "..\..\lib\vc_lib\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_lib\mswd\wx\setup.h @@ -1022,7 +1022,7 @@ SOURCE=..\..\include\wx\univ\setup.h !IF "$(CFG)" == "base - Win32 DLL Universal Unicode Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h -InputPath=..\include\wx\univ\setup.h +InputPath=..\..\include\wx\univ\setup.h "..\..\lib\vc_dll\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h @@ -1032,7 +1032,7 @@ InputPath=..\include\wx\univ\setup.h !ELSEIF "$(CFG)" == "base - Win32 DLL Universal Unicode Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h -InputPath=..\include\wx\univ\setup.h +InputPath=..\..\include\wx\univ\setup.h "..\..\lib\vc_dll\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswunivud\wx\setup.h @@ -1042,7 +1042,7 @@ InputPath=..\include\wx\univ\setup.h !ELSEIF "$(CFG)" == "base - Win32 DLL Universal Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\setup.h -InputPath=..\include\wx\univ\setup.h +InputPath=..\..\include\wx\univ\setup.h "..\..\lib\vc_dll\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswuniv\wx\setup.h @@ -1052,7 +1052,7 @@ InputPath=..\include\wx\univ\setup.h !ELSEIF "$(CFG)" == "base - Win32 DLL Universal Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\setup.h -InputPath=..\include\wx\univ\setup.h +InputPath=..\..\include\wx\univ\setup.h "..\..\lib\vc_dll\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswunivd\wx\setup.h @@ -1086,7 +1086,7 @@ InputPath=..\include\wx\univ\setup.h !ELSEIF "$(CFG)" == "base - Win32 Universal Unicode Release" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h -InputPath=..\include\wx\univ\setup.h +InputPath=..\..\include\wx\univ\setup.h "..\..\lib\vc_lib\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h @@ -1096,7 +1096,7 @@ InputPath=..\include\wx\univ\setup.h !ELSEIF "$(CFG)" == "base - Win32 Universal Unicode Debug" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h -InputPath=..\include\wx\univ\setup.h +InputPath=..\..\include\wx\univ\setup.h "..\..\lib\vc_lib\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h @@ -1106,7 +1106,7 @@ InputPath=..\include\wx\univ\setup.h !ELSEIF "$(CFG)" == "base - Win32 Universal Release" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\setup.h -InputPath=..\include\wx\univ\setup.h +InputPath=..\..\include\wx\univ\setup.h "..\..\lib\vc_lib\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_lib\mswuniv\wx\setup.h @@ -1116,7 +1116,7 @@ InputPath=..\include\wx\univ\setup.h !ELSEIF "$(CFG)" == "base - Win32 Universal Debug" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\setup.h -InputPath=..\include\wx\univ\setup.h +InputPath=..\..\include\wx\univ\setup.h "..\..\lib\vc_lib\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_lib\mswunivd\wx\setup.h @@ -1189,8 +1189,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !IF "$(CFG)" == "base - Win32 DLL Universal Unicode Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswunivu\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h" # End Custom Build @@ -1198,8 +1199,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "base - Win32 DLL Universal Unicode Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswunivud\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" # End Custom Build @@ -1207,8 +1209,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "base - Win32 DLL Universal Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswuniv\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h" # End Custom Build @@ -1216,8 +1219,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "base - Win32 DLL Universal Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswunivd\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h" # End Custom Build @@ -1225,8 +1229,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "base - Win32 DLL Unicode Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswu\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" # End Custom Build @@ -1234,8 +1239,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "base - Win32 DLL Unicode Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswud\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" # End Custom Build @@ -1243,8 +1249,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "base - Win32 DLL Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_dll\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_dll\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\msw\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\msw\wx\msw\rcdefs.h" # End Custom Build @@ -1252,8 +1259,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "base - Win32 DLL Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswd\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h" # End Custom Build @@ -1261,8 +1269,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "base - Win32 Universal Unicode Release" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswunivu\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h" # End Custom Build @@ -1270,8 +1279,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "base - Win32 Universal Unicode Debug" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswunivud\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" # End Custom Build @@ -1279,8 +1289,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "base - Win32 Universal Release" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswuniv\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h" # End Custom Build @@ -1288,8 +1299,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "base - Win32 Universal Debug" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswunivd\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h" # End Custom Build @@ -1297,8 +1309,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "base - Win32 Unicode Release" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswu\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" # End Custom Build @@ -1306,8 +1319,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "base - Win32 Unicode Debug" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswud\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" # End Custom Build @@ -1315,8 +1329,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "base - Win32 Release" # Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_lib\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_lib\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\msw\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\msw\wx\msw\rcdefs.h" # End Custom Build @@ -1324,8 +1339,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "base - Win32 Debug" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswd\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h" # End Custom Build diff --git a/build/msw/wx_core.dsp b/build/msw/wx_core.dsp index 1971af9707..cc49298d6b 100644 --- a/build/msw/wx_core.dsp +++ b/build/msw/wx_core.dsp @@ -7393,7 +7393,7 @@ SOURCE=..\..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\..\include\wx\msw\setup.h "..\..\lib\vc_dll\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswu\wx\setup.h @@ -7403,7 +7403,7 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\..\include\wx\msw\setup.h "..\..\lib\vc_dll\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswud\wx\setup.h @@ -7413,7 +7413,7 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "core - Win32 DLL Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\..\include\wx\msw\setup.h "..\..\lib\vc_dll\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\msw\wx\setup.h @@ -7423,7 +7423,7 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "core - Win32 DLL Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\..\include\wx\msw\setup.h "..\..\lib\vc_dll\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswd\wx\setup.h @@ -7457,7 +7457,7 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "core - Win32 Unicode Release" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\..\include\wx\msw\setup.h "..\..\lib\vc_lib\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_lib\mswu\wx\setup.h @@ -7467,7 +7467,7 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "core - Win32 Unicode Debug" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\..\include\wx\msw\setup.h "..\..\lib\vc_lib\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_lib\mswud\wx\setup.h @@ -7477,7 +7477,7 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "core - Win32 Release" # Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\..\include\wx\msw\setup.h "..\..\lib\vc_lib\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_lib\msw\wx\setup.h @@ -7487,7 +7487,7 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "core - Win32 Debug" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\..\include\wx\msw\setup.h "..\..\lib\vc_lib\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_lib\mswd\wx\setup.h @@ -7504,7 +7504,7 @@ SOURCE=..\..\include\wx\univ\setup.h !IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h -InputPath=..\include\wx\univ\setup.h +InputPath=..\..\include\wx\univ\setup.h "..\..\lib\vc_dll\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h @@ -7514,7 +7514,7 @@ InputPath=..\include\wx\univ\setup.h !ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h -InputPath=..\include\wx\univ\setup.h +InputPath=..\..\include\wx\univ\setup.h "..\..\lib\vc_dll\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswunivud\wx\setup.h @@ -7524,7 +7524,7 @@ InputPath=..\include\wx\univ\setup.h !ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\setup.h -InputPath=..\include\wx\univ\setup.h +InputPath=..\..\include\wx\univ\setup.h "..\..\lib\vc_dll\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswuniv\wx\setup.h @@ -7534,7 +7534,7 @@ InputPath=..\include\wx\univ\setup.h !ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\setup.h -InputPath=..\include\wx\univ\setup.h +InputPath=..\..\include\wx\univ\setup.h "..\..\lib\vc_dll\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswunivd\wx\setup.h @@ -7568,7 +7568,7 @@ InputPath=..\include\wx\univ\setup.h !ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h -InputPath=..\include\wx\univ\setup.h +InputPath=..\..\include\wx\univ\setup.h "..\..\lib\vc_lib\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h @@ -7578,7 +7578,7 @@ InputPath=..\include\wx\univ\setup.h !ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h -InputPath=..\include\wx\univ\setup.h +InputPath=..\..\include\wx\univ\setup.h "..\..\lib\vc_lib\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h @@ -7588,7 +7588,7 @@ InputPath=..\include\wx\univ\setup.h !ELSEIF "$(CFG)" == "core - Win32 Universal Release" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\setup.h -InputPath=..\include\wx\univ\setup.h +InputPath=..\..\include\wx\univ\setup.h "..\..\lib\vc_lib\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_lib\mswuniv\wx\setup.h @@ -7598,7 +7598,7 @@ InputPath=..\include\wx\univ\setup.h !ELSEIF "$(CFG)" == "core - Win32 Universal Debug" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\setup.h -InputPath=..\include\wx\univ\setup.h +InputPath=..\..\include\wx\univ\setup.h "..\..\lib\vc_lib\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_lib\mswunivd\wx\setup.h @@ -7819,8 +7819,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswunivu\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h" # End Custom Build @@ -7828,8 +7829,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswunivud\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" # End Custom Build @@ -7837,8 +7839,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswuniv\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h" # End Custom Build @@ -7846,8 +7849,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswunivd\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h" # End Custom Build @@ -7855,8 +7859,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswu\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" # End Custom Build @@ -7864,8 +7869,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswud\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" # End Custom Build @@ -7873,8 +7879,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "core - Win32 DLL Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_dll\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_dll\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\msw\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\msw\wx\msw\rcdefs.h" # End Custom Build @@ -7882,8 +7889,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "core - Win32 DLL Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswd\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h" # End Custom Build @@ -7891,8 +7899,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswunivu\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h" # End Custom Build @@ -7900,8 +7909,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswunivud\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" # End Custom Build @@ -7909,8 +7919,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "core - Win32 Universal Release" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswuniv\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h" # End Custom Build @@ -7918,8 +7929,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "core - Win32 Universal Debug" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswunivd\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h" # End Custom Build @@ -7927,8 +7939,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "core - Win32 Unicode Release" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswu\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" # End Custom Build @@ -7936,8 +7949,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "core - Win32 Unicode Debug" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswud\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" # End Custom Build @@ -7945,8 +7959,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "core - Win32 Release" # Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_lib\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_lib\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\msw\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\msw\wx\msw\rcdefs.h" # End Custom Build @@ -7954,8 +7969,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "core - Win32 Debug" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswd\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h" # End Custom Build diff --git a/build/msw/wx_dbgrid.dsp b/build/msw/wx_dbgrid.dsp index afb36ee145..9f43a14988 100644 --- a/build/msw/wx_dbgrid.dsp +++ b/build/msw/wx_dbgrid.dsp @@ -538,7 +538,7 @@ SOURCE=..\..\include\wx\univ\setup.h !IF "$(CFG)" == "dbgrid - Win32 DLL Universal Unicode Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h -InputPath=..\include\wx\univ\setup.h +InputPath=..\..\include\wx\univ\setup.h "..\..\lib\vc_dll\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h @@ -548,7 +548,7 @@ InputPath=..\include\wx\univ\setup.h !ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Universal Unicode Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h -InputPath=..\include\wx\univ\setup.h +InputPath=..\..\include\wx\univ\setup.h "..\..\lib\vc_dll\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswunivud\wx\setup.h @@ -558,7 +558,7 @@ InputPath=..\include\wx\univ\setup.h !ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Universal Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\setup.h -InputPath=..\include\wx\univ\setup.h +InputPath=..\..\include\wx\univ\setup.h "..\..\lib\vc_dll\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswuniv\wx\setup.h @@ -568,7 +568,7 @@ InputPath=..\include\wx\univ\setup.h !ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Universal Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\setup.h -InputPath=..\include\wx\univ\setup.h +InputPath=..\..\include\wx\univ\setup.h "..\..\lib\vc_dll\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswunivd\wx\setup.h @@ -602,7 +602,7 @@ InputPath=..\include\wx\univ\setup.h !ELSEIF "$(CFG)" == "dbgrid - Win32 Universal Unicode Release" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h -InputPath=..\include\wx\univ\setup.h +InputPath=..\..\include\wx\univ\setup.h "..\..\lib\vc_lib\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h @@ -612,7 +612,7 @@ InputPath=..\include\wx\univ\setup.h !ELSEIF "$(CFG)" == "dbgrid - Win32 Universal Unicode Debug" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h -InputPath=..\include\wx\univ\setup.h +InputPath=..\..\include\wx\univ\setup.h "..\..\lib\vc_lib\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h @@ -622,7 +622,7 @@ InputPath=..\include\wx\univ\setup.h !ELSEIF "$(CFG)" == "dbgrid - Win32 Universal Release" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\setup.h -InputPath=..\include\wx\univ\setup.h +InputPath=..\..\include\wx\univ\setup.h "..\..\lib\vc_lib\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_lib\mswuniv\wx\setup.h @@ -632,7 +632,7 @@ InputPath=..\include\wx\univ\setup.h !ELSEIF "$(CFG)" == "dbgrid - Win32 Universal Debug" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\setup.h -InputPath=..\include\wx\univ\setup.h +InputPath=..\..\include\wx\univ\setup.h "..\..\lib\vc_lib\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_lib\mswunivd\wx\setup.h @@ -697,7 +697,7 @@ SOURCE=..\..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Unicode Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\..\include\wx\msw\setup.h "..\..\lib\vc_dll\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswu\wx\setup.h @@ -707,7 +707,7 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Unicode Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\..\include\wx\msw\setup.h "..\..\lib\vc_dll\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswud\wx\setup.h @@ -717,7 +717,7 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\..\include\wx\msw\setup.h "..\..\lib\vc_dll\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\msw\wx\setup.h @@ -727,7 +727,7 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\..\include\wx\msw\setup.h "..\..\lib\vc_dll\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswd\wx\setup.h @@ -761,7 +761,7 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "dbgrid - Win32 Unicode Release" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\..\include\wx\msw\setup.h "..\..\lib\vc_lib\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_lib\mswu\wx\setup.h @@ -771,7 +771,7 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "dbgrid - Win32 Unicode Debug" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\..\include\wx\msw\setup.h "..\..\lib\vc_lib\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_lib\mswud\wx\setup.h @@ -781,7 +781,7 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "dbgrid - Win32 Release" # Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\..\include\wx\msw\setup.h "..\..\lib\vc_lib\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_lib\msw\wx\setup.h @@ -791,7 +791,7 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "dbgrid - Win32 Debug" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\..\include\wx\msw\setup.h "..\..\lib\vc_lib\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_lib\mswd\wx\setup.h @@ -812,8 +812,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !IF "$(CFG)" == "dbgrid - Win32 DLL Universal Unicode Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswunivu\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h" # End Custom Build @@ -821,8 +822,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Universal Unicode Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswunivud\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" # End Custom Build @@ -830,8 +832,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Universal Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswuniv\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h" # End Custom Build @@ -839,8 +842,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Universal Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswunivd\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h" # End Custom Build @@ -848,8 +852,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Unicode Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswu\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" # End Custom Build @@ -857,8 +862,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Unicode Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswud\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" # End Custom Build @@ -866,8 +872,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_dll\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_dll\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\msw\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\msw\wx\msw\rcdefs.h" # End Custom Build @@ -875,8 +882,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswd\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h" # End Custom Build @@ -884,8 +892,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "dbgrid - Win32 Universal Unicode Release" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswunivu\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h" # End Custom Build @@ -893,8 +902,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "dbgrid - Win32 Universal Unicode Debug" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswunivud\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" # End Custom Build @@ -902,8 +912,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "dbgrid - Win32 Universal Release" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswuniv\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h" # End Custom Build @@ -911,8 +922,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "dbgrid - Win32 Universal Debug" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswunivd\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h" # End Custom Build @@ -920,8 +932,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "dbgrid - Win32 Unicode Release" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswu\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" # End Custom Build @@ -929,8 +942,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "dbgrid - Win32 Unicode Debug" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswud\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" # End Custom Build @@ -938,8 +952,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "dbgrid - Win32 Release" # Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_lib\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_lib\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\msw\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\msw\wx\msw\rcdefs.h" # End Custom Build @@ -947,8 +962,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "dbgrid - Win32 Debug" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswd\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h" # End Custom Build diff --git a/build/msw/wx_gl.dsp b/build/msw/wx_gl.dsp index 479a1cf858..6155b4dadc 100644 --- a/build/msw/wx_gl.dsp +++ b/build/msw/wx_gl.dsp @@ -538,7 +538,7 @@ SOURCE=..\..\include\wx\univ\setup.h !IF "$(CFG)" == "gl - Win32 DLL Universal Unicode Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h -InputPath=..\include\wx\univ\setup.h +InputPath=..\..\include\wx\univ\setup.h "..\..\lib\vc_dll\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h @@ -548,7 +548,7 @@ InputPath=..\include\wx\univ\setup.h !ELSEIF "$(CFG)" == "gl - Win32 DLL Universal Unicode Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h -InputPath=..\include\wx\univ\setup.h +InputPath=..\..\include\wx\univ\setup.h "..\..\lib\vc_dll\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswunivud\wx\setup.h @@ -558,7 +558,7 @@ InputPath=..\include\wx\univ\setup.h !ELSEIF "$(CFG)" == "gl - Win32 DLL Universal Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\setup.h -InputPath=..\include\wx\univ\setup.h +InputPath=..\..\include\wx\univ\setup.h "..\..\lib\vc_dll\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswuniv\wx\setup.h @@ -568,7 +568,7 @@ InputPath=..\include\wx\univ\setup.h !ELSEIF "$(CFG)" == "gl - Win32 DLL Universal Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\setup.h -InputPath=..\include\wx\univ\setup.h +InputPath=..\..\include\wx\univ\setup.h "..\..\lib\vc_dll\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswunivd\wx\setup.h @@ -602,7 +602,7 @@ InputPath=..\include\wx\univ\setup.h !ELSEIF "$(CFG)" == "gl - Win32 Universal Unicode Release" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h -InputPath=..\include\wx\univ\setup.h +InputPath=..\..\include\wx\univ\setup.h "..\..\lib\vc_lib\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h @@ -612,7 +612,7 @@ InputPath=..\include\wx\univ\setup.h !ELSEIF "$(CFG)" == "gl - Win32 Universal Unicode Debug" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h -InputPath=..\include\wx\univ\setup.h +InputPath=..\..\include\wx\univ\setup.h "..\..\lib\vc_lib\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h @@ -622,7 +622,7 @@ InputPath=..\include\wx\univ\setup.h !ELSEIF "$(CFG)" == "gl - Win32 Universal Release" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\setup.h -InputPath=..\include\wx\univ\setup.h +InputPath=..\..\include\wx\univ\setup.h "..\..\lib\vc_lib\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_lib\mswuniv\wx\setup.h @@ -632,7 +632,7 @@ InputPath=..\include\wx\univ\setup.h !ELSEIF "$(CFG)" == "gl - Win32 Universal Debug" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\setup.h -InputPath=..\include\wx\univ\setup.h +InputPath=..\..\include\wx\univ\setup.h "..\..\lib\vc_lib\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_lib\mswunivd\wx\setup.h @@ -697,7 +697,7 @@ SOURCE=..\..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "gl - Win32 DLL Unicode Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\..\include\wx\msw\setup.h "..\..\lib\vc_dll\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswu\wx\setup.h @@ -707,7 +707,7 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "gl - Win32 DLL Unicode Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\..\include\wx\msw\setup.h "..\..\lib\vc_dll\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswud\wx\setup.h @@ -717,7 +717,7 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "gl - Win32 DLL Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\..\include\wx\msw\setup.h "..\..\lib\vc_dll\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\msw\wx\setup.h @@ -727,7 +727,7 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "gl - Win32 DLL Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\..\include\wx\msw\setup.h "..\..\lib\vc_dll\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswd\wx\setup.h @@ -761,7 +761,7 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "gl - Win32 Unicode Release" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\..\include\wx\msw\setup.h "..\..\lib\vc_lib\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_lib\mswu\wx\setup.h @@ -771,7 +771,7 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "gl - Win32 Unicode Debug" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\..\include\wx\msw\setup.h "..\..\lib\vc_lib\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_lib\mswud\wx\setup.h @@ -781,7 +781,7 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "gl - Win32 Release" # Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\..\include\wx\msw\setup.h "..\..\lib\vc_lib\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_lib\msw\wx\setup.h @@ -791,7 +791,7 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "gl - Win32 Debug" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\..\include\wx\msw\setup.h "..\..\lib\vc_lib\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_lib\mswd\wx\setup.h @@ -812,8 +812,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !IF "$(CFG)" == "gl - Win32 DLL Universal Unicode Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswunivu\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h" # End Custom Build @@ -821,8 +822,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "gl - Win32 DLL Universal Unicode Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswunivud\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" # End Custom Build @@ -830,8 +832,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "gl - Win32 DLL Universal Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswuniv\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h" # End Custom Build @@ -839,8 +842,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "gl - Win32 DLL Universal Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswunivd\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h" # End Custom Build @@ -848,8 +852,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "gl - Win32 DLL Unicode Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswu\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" # End Custom Build @@ -857,8 +862,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "gl - Win32 DLL Unicode Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswud\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" # End Custom Build @@ -866,8 +872,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "gl - Win32 DLL Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_dll\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_dll\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\msw\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\msw\wx\msw\rcdefs.h" # End Custom Build @@ -875,8 +882,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "gl - Win32 DLL Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswd\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h" # End Custom Build @@ -884,8 +892,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "gl - Win32 Universal Unicode Release" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswunivu\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h" # End Custom Build @@ -893,8 +902,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "gl - Win32 Universal Unicode Debug" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswunivud\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" # End Custom Build @@ -902,8 +912,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "gl - Win32 Universal Release" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswuniv\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h" # End Custom Build @@ -911,8 +922,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "gl - Win32 Universal Debug" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswunivd\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h" # End Custom Build @@ -920,8 +932,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "gl - Win32 Unicode Release" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswu\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" # End Custom Build @@ -929,8 +942,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "gl - Win32 Unicode Debug" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswud\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" # End Custom Build @@ -938,8 +952,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "gl - Win32 Release" # Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_lib\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_lib\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\msw\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\msw\wx\msw\rcdefs.h" # End Custom Build @@ -947,8 +962,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "gl - Win32 Debug" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswd\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h" # End Custom Build diff --git a/build/msw/wx_html.dsp b/build/msw/wx_html.dsp index 7bcbf57468..98bbb9b381 100644 --- a/build/msw/wx_html.dsp +++ b/build/msw/wx_html.dsp @@ -662,7 +662,7 @@ SOURCE=..\..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "html - Win32 DLL Unicode Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\..\include\wx\msw\setup.h "..\..\lib\vc_dll\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswu\wx\setup.h @@ -672,7 +672,7 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "html - Win32 DLL Unicode Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\..\include\wx\msw\setup.h "..\..\lib\vc_dll\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswud\wx\setup.h @@ -682,7 +682,7 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "html - Win32 DLL Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\..\include\wx\msw\setup.h "..\..\lib\vc_dll\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\msw\wx\setup.h @@ -692,7 +692,7 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "html - Win32 DLL Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\..\include\wx\msw\setup.h "..\..\lib\vc_dll\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswd\wx\setup.h @@ -726,7 +726,7 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "html - Win32 Unicode Release" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\..\include\wx\msw\setup.h "..\..\lib\vc_lib\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_lib\mswu\wx\setup.h @@ -736,7 +736,7 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "html - Win32 Unicode Debug" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\..\include\wx\msw\setup.h "..\..\lib\vc_lib\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_lib\mswud\wx\setup.h @@ -746,7 +746,7 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "html - Win32 Release" # Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\..\include\wx\msw\setup.h "..\..\lib\vc_lib\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_lib\msw\wx\setup.h @@ -756,7 +756,7 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "html - Win32 Debug" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\..\include\wx\msw\setup.h "..\..\lib\vc_lib\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_lib\mswd\wx\setup.h @@ -773,7 +773,7 @@ SOURCE=..\..\include\wx\univ\setup.h !IF "$(CFG)" == "html - Win32 DLL Universal Unicode Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h -InputPath=..\include\wx\univ\setup.h +InputPath=..\..\include\wx\univ\setup.h "..\..\lib\vc_dll\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h @@ -783,7 +783,7 @@ InputPath=..\include\wx\univ\setup.h !ELSEIF "$(CFG)" == "html - Win32 DLL Universal Unicode Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h -InputPath=..\include\wx\univ\setup.h +InputPath=..\..\include\wx\univ\setup.h "..\..\lib\vc_dll\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswunivud\wx\setup.h @@ -793,7 +793,7 @@ InputPath=..\include\wx\univ\setup.h !ELSEIF "$(CFG)" == "html - Win32 DLL Universal Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\setup.h -InputPath=..\include\wx\univ\setup.h +InputPath=..\..\include\wx\univ\setup.h "..\..\lib\vc_dll\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswuniv\wx\setup.h @@ -803,7 +803,7 @@ InputPath=..\include\wx\univ\setup.h !ELSEIF "$(CFG)" == "html - Win32 DLL Universal Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\setup.h -InputPath=..\include\wx\univ\setup.h +InputPath=..\..\include\wx\univ\setup.h "..\..\lib\vc_dll\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswunivd\wx\setup.h @@ -837,7 +837,7 @@ InputPath=..\include\wx\univ\setup.h !ELSEIF "$(CFG)" == "html - Win32 Universal Unicode Release" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h -InputPath=..\include\wx\univ\setup.h +InputPath=..\..\include\wx\univ\setup.h "..\..\lib\vc_lib\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h @@ -847,7 +847,7 @@ InputPath=..\include\wx\univ\setup.h !ELSEIF "$(CFG)" == "html - Win32 Universal Unicode Debug" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h -InputPath=..\include\wx\univ\setup.h +InputPath=..\..\include\wx\univ\setup.h "..\..\lib\vc_lib\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h @@ -857,7 +857,7 @@ InputPath=..\include\wx\univ\setup.h !ELSEIF "$(CFG)" == "html - Win32 Universal Release" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\setup.h -InputPath=..\include\wx\univ\setup.h +InputPath=..\..\include\wx\univ\setup.h "..\..\lib\vc_lib\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_lib\mswuniv\wx\setup.h @@ -867,7 +867,7 @@ InputPath=..\include\wx\univ\setup.h !ELSEIF "$(CFG)" == "html - Win32 Universal Debug" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\setup.h -InputPath=..\include\wx\univ\setup.h +InputPath=..\..\include\wx\univ\setup.h "..\..\lib\vc_lib\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_lib\mswunivd\wx\setup.h @@ -912,8 +912,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !IF "$(CFG)" == "html - Win32 DLL Universal Unicode Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswunivu\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h" # End Custom Build @@ -921,8 +922,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "html - Win32 DLL Universal Unicode Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswunivud\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" # End Custom Build @@ -930,8 +932,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "html - Win32 DLL Universal Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswuniv\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h" # End Custom Build @@ -939,8 +942,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "html - Win32 DLL Universal Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswunivd\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h" # End Custom Build @@ -948,8 +952,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "html - Win32 DLL Unicode Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswu\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" # End Custom Build @@ -957,8 +962,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "html - Win32 DLL Unicode Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswud\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" # End Custom Build @@ -966,8 +972,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "html - Win32 DLL Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_dll\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_dll\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\msw\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\msw\wx\msw\rcdefs.h" # End Custom Build @@ -975,8 +982,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "html - Win32 DLL Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswd\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h" # End Custom Build @@ -984,8 +992,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "html - Win32 Universal Unicode Release" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswunivu\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h" # End Custom Build @@ -993,8 +1002,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "html - Win32 Universal Unicode Debug" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswunivud\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" # End Custom Build @@ -1002,8 +1012,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "html - Win32 Universal Release" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswuniv\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h" # End Custom Build @@ -1011,8 +1022,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "html - Win32 Universal Debug" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswunivd\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h" # End Custom Build @@ -1020,8 +1032,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "html - Win32 Unicode Release" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswu\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" # End Custom Build @@ -1029,8 +1042,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "html - Win32 Unicode Debug" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswud\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" # End Custom Build @@ -1038,8 +1052,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "html - Win32 Release" # Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_lib\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_lib\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\msw\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\msw\wx\msw\rcdefs.h" # End Custom Build @@ -1047,8 +1062,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "html - Win32 Debug" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswd\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h" # End Custom Build diff --git a/build/msw/wx_media.dsp b/build/msw/wx_media.dsp index 6a18d68d6c..9dbb4045fa 100644 --- a/build/msw/wx_media.dsp +++ b/build/msw/wx_media.dsp @@ -554,7 +554,7 @@ SOURCE=..\..\include\wx\univ\setup.h !IF "$(CFG)" == "media - Win32 DLL Universal Unicode Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h -InputPath=..\include\wx\univ\setup.h +InputPath=..\..\include\wx\univ\setup.h "..\..\lib\vc_dll\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h @@ -564,7 +564,7 @@ InputPath=..\include\wx\univ\setup.h !ELSEIF "$(CFG)" == "media - Win32 DLL Universal Unicode Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h -InputPath=..\include\wx\univ\setup.h +InputPath=..\..\include\wx\univ\setup.h "..\..\lib\vc_dll\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswunivud\wx\setup.h @@ -574,7 +574,7 @@ InputPath=..\include\wx\univ\setup.h !ELSEIF "$(CFG)" == "media - Win32 DLL Universal Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\setup.h -InputPath=..\include\wx\univ\setup.h +InputPath=..\..\include\wx\univ\setup.h "..\..\lib\vc_dll\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswuniv\wx\setup.h @@ -584,7 +584,7 @@ InputPath=..\include\wx\univ\setup.h !ELSEIF "$(CFG)" == "media - Win32 DLL Universal Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\setup.h -InputPath=..\include\wx\univ\setup.h +InputPath=..\..\include\wx\univ\setup.h "..\..\lib\vc_dll\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswunivd\wx\setup.h @@ -618,7 +618,7 @@ InputPath=..\include\wx\univ\setup.h !ELSEIF "$(CFG)" == "media - Win32 Universal Unicode Release" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h -InputPath=..\include\wx\univ\setup.h +InputPath=..\..\include\wx\univ\setup.h "..\..\lib\vc_lib\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h @@ -628,7 +628,7 @@ InputPath=..\include\wx\univ\setup.h !ELSEIF "$(CFG)" == "media - Win32 Universal Unicode Debug" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h -InputPath=..\include\wx\univ\setup.h +InputPath=..\..\include\wx\univ\setup.h "..\..\lib\vc_lib\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h @@ -638,7 +638,7 @@ InputPath=..\include\wx\univ\setup.h !ELSEIF "$(CFG)" == "media - Win32 Universal Release" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\setup.h -InputPath=..\include\wx\univ\setup.h +InputPath=..\..\include\wx\univ\setup.h "..\..\lib\vc_lib\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_lib\mswuniv\wx\setup.h @@ -648,7 +648,7 @@ InputPath=..\include\wx\univ\setup.h !ELSEIF "$(CFG)" == "media - Win32 Universal Debug" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\setup.h -InputPath=..\include\wx\univ\setup.h +InputPath=..\..\include\wx\univ\setup.h "..\..\lib\vc_lib\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_lib\mswunivd\wx\setup.h @@ -713,7 +713,7 @@ SOURCE=..\..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "media - Win32 DLL Unicode Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\..\include\wx\msw\setup.h "..\..\lib\vc_dll\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswu\wx\setup.h @@ -723,7 +723,7 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "media - Win32 DLL Unicode Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\..\include\wx\msw\setup.h "..\..\lib\vc_dll\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswud\wx\setup.h @@ -733,7 +733,7 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "media - Win32 DLL Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\..\include\wx\msw\setup.h "..\..\lib\vc_dll\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\msw\wx\setup.h @@ -743,7 +743,7 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "media - Win32 DLL Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\..\include\wx\msw\setup.h "..\..\lib\vc_dll\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswd\wx\setup.h @@ -777,7 +777,7 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "media - Win32 Unicode Release" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\..\include\wx\msw\setup.h "..\..\lib\vc_lib\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_lib\mswu\wx\setup.h @@ -787,7 +787,7 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "media - Win32 Unicode Debug" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\..\include\wx\msw\setup.h "..\..\lib\vc_lib\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_lib\mswud\wx\setup.h @@ -797,7 +797,7 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "media - Win32 Release" # Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\..\include\wx\msw\setup.h "..\..\lib\vc_lib\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_lib\msw\wx\setup.h @@ -807,7 +807,7 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "media - Win32 Debug" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\..\include\wx\msw\setup.h "..\..\lib\vc_lib\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_lib\mswd\wx\setup.h @@ -832,8 +832,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !IF "$(CFG)" == "media - Win32 DLL Universal Unicode Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswunivu\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h" # End Custom Build @@ -841,8 +842,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "media - Win32 DLL Universal Unicode Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswunivud\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" # End Custom Build @@ -850,8 +852,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "media - Win32 DLL Universal Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswuniv\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h" # End Custom Build @@ -859,8 +862,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "media - Win32 DLL Universal Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswunivd\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h" # End Custom Build @@ -868,8 +872,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "media - Win32 DLL Unicode Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswu\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" # End Custom Build @@ -877,8 +882,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "media - Win32 DLL Unicode Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswud\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" # End Custom Build @@ -886,8 +892,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "media - Win32 DLL Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_dll\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_dll\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\msw\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\msw\wx\msw\rcdefs.h" # End Custom Build @@ -895,8 +902,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "media - Win32 DLL Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswd\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h" # End Custom Build @@ -904,8 +912,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "media - Win32 Universal Unicode Release" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswunivu\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h" # End Custom Build @@ -913,8 +922,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "media - Win32 Universal Unicode Debug" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswunivud\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" # End Custom Build @@ -922,8 +932,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "media - Win32 Universal Release" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswuniv\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h" # End Custom Build @@ -931,8 +942,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "media - Win32 Universal Debug" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswunivd\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h" # End Custom Build @@ -940,8 +952,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "media - Win32 Unicode Release" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswu\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" # End Custom Build @@ -949,8 +962,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "media - Win32 Unicode Debug" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswud\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" # End Custom Build @@ -958,8 +972,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "media - Win32 Release" # Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_lib\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_lib\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\msw\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\msw\wx\msw\rcdefs.h" # End Custom Build @@ -967,8 +982,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "media - Win32 Debug" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswd\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h" # End Custom Build diff --git a/build/msw/wx_net.dsp b/build/msw/wx_net.dsp index 43872ba34d..ef78023942 100644 --- a/build/msw/wx_net.dsp +++ b/build/msw/wx_net.dsp @@ -582,7 +582,7 @@ SOURCE=..\..\include\wx\univ\setup.h !IF "$(CFG)" == "net - Win32 DLL Universal Unicode Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h -InputPath=..\include\wx\univ\setup.h +InputPath=..\..\include\wx\univ\setup.h "..\..\lib\vc_dll\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h @@ -592,7 +592,7 @@ InputPath=..\include\wx\univ\setup.h !ELSEIF "$(CFG)" == "net - Win32 DLL Universal Unicode Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h -InputPath=..\include\wx\univ\setup.h +InputPath=..\..\include\wx\univ\setup.h "..\..\lib\vc_dll\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswunivud\wx\setup.h @@ -602,7 +602,7 @@ InputPath=..\include\wx\univ\setup.h !ELSEIF "$(CFG)" == "net - Win32 DLL Universal Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\setup.h -InputPath=..\include\wx\univ\setup.h +InputPath=..\..\include\wx\univ\setup.h "..\..\lib\vc_dll\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswuniv\wx\setup.h @@ -612,7 +612,7 @@ InputPath=..\include\wx\univ\setup.h !ELSEIF "$(CFG)" == "net - Win32 DLL Universal Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\setup.h -InputPath=..\include\wx\univ\setup.h +InputPath=..\..\include\wx\univ\setup.h "..\..\lib\vc_dll\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswunivd\wx\setup.h @@ -646,7 +646,7 @@ InputPath=..\include\wx\univ\setup.h !ELSEIF "$(CFG)" == "net - Win32 Universal Unicode Release" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h -InputPath=..\include\wx\univ\setup.h +InputPath=..\..\include\wx\univ\setup.h "..\..\lib\vc_lib\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h @@ -656,7 +656,7 @@ InputPath=..\include\wx\univ\setup.h !ELSEIF "$(CFG)" == "net - Win32 Universal Unicode Debug" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h -InputPath=..\include\wx\univ\setup.h +InputPath=..\..\include\wx\univ\setup.h "..\..\lib\vc_lib\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h @@ -666,7 +666,7 @@ InputPath=..\include\wx\univ\setup.h !ELSEIF "$(CFG)" == "net - Win32 Universal Release" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\setup.h -InputPath=..\include\wx\univ\setup.h +InputPath=..\..\include\wx\univ\setup.h "..\..\lib\vc_lib\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_lib\mswuniv\wx\setup.h @@ -676,7 +676,7 @@ InputPath=..\include\wx\univ\setup.h !ELSEIF "$(CFG)" == "net - Win32 Universal Debug" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\setup.h -InputPath=..\include\wx\univ\setup.h +InputPath=..\..\include\wx\univ\setup.h "..\..\lib\vc_lib\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_lib\mswunivd\wx\setup.h @@ -741,7 +741,7 @@ SOURCE=..\..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "net - Win32 DLL Unicode Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\..\include\wx\msw\setup.h "..\..\lib\vc_dll\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswu\wx\setup.h @@ -751,7 +751,7 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "net - Win32 DLL Unicode Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\..\include\wx\msw\setup.h "..\..\lib\vc_dll\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswud\wx\setup.h @@ -761,7 +761,7 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "net - Win32 DLL Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\..\include\wx\msw\setup.h "..\..\lib\vc_dll\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\msw\wx\setup.h @@ -771,7 +771,7 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "net - Win32 DLL Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\..\include\wx\msw\setup.h "..\..\lib\vc_dll\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswd\wx\setup.h @@ -805,7 +805,7 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "net - Win32 Unicode Release" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\..\include\wx\msw\setup.h "..\..\lib\vc_lib\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_lib\mswu\wx\setup.h @@ -815,7 +815,7 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "net - Win32 Unicode Debug" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\..\include\wx\msw\setup.h "..\..\lib\vc_lib\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_lib\mswud\wx\setup.h @@ -825,7 +825,7 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "net - Win32 Release" # Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\..\include\wx\msw\setup.h "..\..\lib\vc_lib\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_lib\msw\wx\setup.h @@ -835,7 +835,7 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "net - Win32 Debug" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\..\include\wx\msw\setup.h "..\..\lib\vc_lib\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_lib\mswd\wx\setup.h @@ -856,8 +856,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !IF "$(CFG)" == "net - Win32 DLL Universal Unicode Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswunivu\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h" # End Custom Build @@ -865,8 +866,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "net - Win32 DLL Universal Unicode Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswunivud\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" # End Custom Build @@ -874,8 +876,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "net - Win32 DLL Universal Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswuniv\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h" # End Custom Build @@ -883,8 +886,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "net - Win32 DLL Universal Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswunivd\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h" # End Custom Build @@ -892,8 +896,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "net - Win32 DLL Unicode Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswu\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" # End Custom Build @@ -901,8 +906,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "net - Win32 DLL Unicode Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswud\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" # End Custom Build @@ -910,8 +916,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "net - Win32 DLL Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_dll\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_dll\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\msw\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\msw\wx\msw\rcdefs.h" # End Custom Build @@ -919,8 +926,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "net - Win32 DLL Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswd\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h" # End Custom Build @@ -928,8 +936,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "net - Win32 Universal Unicode Release" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswunivu\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h" # End Custom Build @@ -937,8 +946,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "net - Win32 Universal Unicode Debug" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswunivud\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" # End Custom Build @@ -946,8 +956,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "net - Win32 Universal Release" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswuniv\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h" # End Custom Build @@ -955,8 +966,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "net - Win32 Universal Debug" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswunivd\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h" # End Custom Build @@ -964,8 +976,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "net - Win32 Unicode Release" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswu\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" # End Custom Build @@ -973,8 +986,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "net - Win32 Unicode Debug" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswud\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" # End Custom Build @@ -982,8 +996,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "net - Win32 Release" # Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_lib\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_lib\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\msw\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\msw\wx\msw\rcdefs.h" # End Custom Build @@ -991,8 +1006,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "net - Win32 Debug" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswd\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h" # End Custom Build diff --git a/build/msw/wx_odbc.dsp b/build/msw/wx_odbc.dsp index 879a358957..feac36f98f 100644 --- a/build/msw/wx_odbc.dsp +++ b/build/msw/wx_odbc.dsp @@ -542,7 +542,7 @@ SOURCE=..\..\include\wx\univ\setup.h !IF "$(CFG)" == "odbc - Win32 DLL Universal Unicode Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h -InputPath=..\include\wx\univ\setup.h +InputPath=..\..\include\wx\univ\setup.h "..\..\lib\vc_dll\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h @@ -552,7 +552,7 @@ InputPath=..\include\wx\univ\setup.h !ELSEIF "$(CFG)" == "odbc - Win32 DLL Universal Unicode Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h -InputPath=..\include\wx\univ\setup.h +InputPath=..\..\include\wx\univ\setup.h "..\..\lib\vc_dll\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswunivud\wx\setup.h @@ -562,7 +562,7 @@ InputPath=..\include\wx\univ\setup.h !ELSEIF "$(CFG)" == "odbc - Win32 DLL Universal Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\setup.h -InputPath=..\include\wx\univ\setup.h +InputPath=..\..\include\wx\univ\setup.h "..\..\lib\vc_dll\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswuniv\wx\setup.h @@ -572,7 +572,7 @@ InputPath=..\include\wx\univ\setup.h !ELSEIF "$(CFG)" == "odbc - Win32 DLL Universal Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\setup.h -InputPath=..\include\wx\univ\setup.h +InputPath=..\..\include\wx\univ\setup.h "..\..\lib\vc_dll\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswunivd\wx\setup.h @@ -606,7 +606,7 @@ InputPath=..\include\wx\univ\setup.h !ELSEIF "$(CFG)" == "odbc - Win32 Universal Unicode Release" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h -InputPath=..\include\wx\univ\setup.h +InputPath=..\..\include\wx\univ\setup.h "..\..\lib\vc_lib\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h @@ -616,7 +616,7 @@ InputPath=..\include\wx\univ\setup.h !ELSEIF "$(CFG)" == "odbc - Win32 Universal Unicode Debug" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h -InputPath=..\include\wx\univ\setup.h +InputPath=..\..\include\wx\univ\setup.h "..\..\lib\vc_lib\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h @@ -626,7 +626,7 @@ InputPath=..\include\wx\univ\setup.h !ELSEIF "$(CFG)" == "odbc - Win32 Universal Release" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\setup.h -InputPath=..\include\wx\univ\setup.h +InputPath=..\..\include\wx\univ\setup.h "..\..\lib\vc_lib\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_lib\mswuniv\wx\setup.h @@ -636,7 +636,7 @@ InputPath=..\include\wx\univ\setup.h !ELSEIF "$(CFG)" == "odbc - Win32 Universal Debug" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\setup.h -InputPath=..\include\wx\univ\setup.h +InputPath=..\..\include\wx\univ\setup.h "..\..\lib\vc_lib\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_lib\mswunivd\wx\setup.h @@ -701,7 +701,7 @@ SOURCE=..\..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "odbc - Win32 DLL Unicode Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\..\include\wx\msw\setup.h "..\..\lib\vc_dll\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswu\wx\setup.h @@ -711,7 +711,7 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "odbc - Win32 DLL Unicode Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\..\include\wx\msw\setup.h "..\..\lib\vc_dll\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswud\wx\setup.h @@ -721,7 +721,7 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "odbc - Win32 DLL Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\..\include\wx\msw\setup.h "..\..\lib\vc_dll\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\msw\wx\setup.h @@ -731,7 +731,7 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "odbc - Win32 DLL Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\..\include\wx\msw\setup.h "..\..\lib\vc_dll\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswd\wx\setup.h @@ -765,7 +765,7 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "odbc - Win32 Unicode Release" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\..\include\wx\msw\setup.h "..\..\lib\vc_lib\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_lib\mswu\wx\setup.h @@ -775,7 +775,7 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "odbc - Win32 Unicode Debug" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\..\include\wx\msw\setup.h "..\..\lib\vc_lib\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_lib\mswud\wx\setup.h @@ -785,7 +785,7 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "odbc - Win32 Release" # Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\..\include\wx\msw\setup.h "..\..\lib\vc_lib\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_lib\msw\wx\setup.h @@ -795,7 +795,7 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "odbc - Win32 Debug" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\..\include\wx\msw\setup.h "..\..\lib\vc_lib\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_lib\mswd\wx\setup.h @@ -816,8 +816,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !IF "$(CFG)" == "odbc - Win32 DLL Universal Unicode Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswunivu\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h" # End Custom Build @@ -825,8 +826,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "odbc - Win32 DLL Universal Unicode Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswunivud\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" # End Custom Build @@ -834,8 +836,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "odbc - Win32 DLL Universal Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswuniv\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h" # End Custom Build @@ -843,8 +846,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "odbc - Win32 DLL Universal Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswunivd\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h" # End Custom Build @@ -852,8 +856,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "odbc - Win32 DLL Unicode Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswu\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" # End Custom Build @@ -861,8 +866,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "odbc - Win32 DLL Unicode Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswud\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" # End Custom Build @@ -870,8 +876,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "odbc - Win32 DLL Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_dll\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_dll\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\msw\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\msw\wx\msw\rcdefs.h" # End Custom Build @@ -879,8 +886,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "odbc - Win32 DLL Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswd\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h" # End Custom Build @@ -888,8 +896,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "odbc - Win32 Universal Unicode Release" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswunivu\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h" # End Custom Build @@ -897,8 +906,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "odbc - Win32 Universal Unicode Debug" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswunivud\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" # End Custom Build @@ -906,8 +916,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "odbc - Win32 Universal Release" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswuniv\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h" # End Custom Build @@ -915,8 +926,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "odbc - Win32 Universal Debug" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswunivd\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h" # End Custom Build @@ -924,8 +936,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "odbc - Win32 Unicode Release" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswu\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" # End Custom Build @@ -933,8 +946,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "odbc - Win32 Unicode Debug" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswud\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" # End Custom Build @@ -942,8 +956,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "odbc - Win32 Release" # Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_lib\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_lib\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\msw\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\msw\wx\msw\rcdefs.h" # End Custom Build @@ -951,8 +966,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "odbc - Win32 Debug" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswd\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h" # End Custom Build diff --git a/build/msw/wx_qa.dsp b/build/msw/wx_qa.dsp index 917f63264e..a3cc9a2beb 100644 --- a/build/msw/wx_qa.dsp +++ b/build/msw/wx_qa.dsp @@ -546,7 +546,7 @@ SOURCE=..\..\include\wx\univ\setup.h !IF "$(CFG)" == "qa - Win32 DLL Universal Unicode Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h -InputPath=..\include\wx\univ\setup.h +InputPath=..\..\include\wx\univ\setup.h "..\..\lib\vc_dll\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h @@ -556,7 +556,7 @@ InputPath=..\include\wx\univ\setup.h !ELSEIF "$(CFG)" == "qa - Win32 DLL Universal Unicode Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h -InputPath=..\include\wx\univ\setup.h +InputPath=..\..\include\wx\univ\setup.h "..\..\lib\vc_dll\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswunivud\wx\setup.h @@ -566,7 +566,7 @@ InputPath=..\include\wx\univ\setup.h !ELSEIF "$(CFG)" == "qa - Win32 DLL Universal Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\setup.h -InputPath=..\include\wx\univ\setup.h +InputPath=..\..\include\wx\univ\setup.h "..\..\lib\vc_dll\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswuniv\wx\setup.h @@ -576,7 +576,7 @@ InputPath=..\include\wx\univ\setup.h !ELSEIF "$(CFG)" == "qa - Win32 DLL Universal Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\setup.h -InputPath=..\include\wx\univ\setup.h +InputPath=..\..\include\wx\univ\setup.h "..\..\lib\vc_dll\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswunivd\wx\setup.h @@ -610,7 +610,7 @@ InputPath=..\include\wx\univ\setup.h !ELSEIF "$(CFG)" == "qa - Win32 Universal Unicode Release" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h -InputPath=..\include\wx\univ\setup.h +InputPath=..\..\include\wx\univ\setup.h "..\..\lib\vc_lib\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h @@ -620,7 +620,7 @@ InputPath=..\include\wx\univ\setup.h !ELSEIF "$(CFG)" == "qa - Win32 Universal Unicode Debug" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h -InputPath=..\include\wx\univ\setup.h +InputPath=..\..\include\wx\univ\setup.h "..\..\lib\vc_lib\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h @@ -630,7 +630,7 @@ InputPath=..\include\wx\univ\setup.h !ELSEIF "$(CFG)" == "qa - Win32 Universal Release" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\setup.h -InputPath=..\include\wx\univ\setup.h +InputPath=..\..\include\wx\univ\setup.h "..\..\lib\vc_lib\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_lib\mswuniv\wx\setup.h @@ -640,7 +640,7 @@ InputPath=..\include\wx\univ\setup.h !ELSEIF "$(CFG)" == "qa - Win32 Universal Debug" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\setup.h -InputPath=..\include\wx\univ\setup.h +InputPath=..\..\include\wx\univ\setup.h "..\..\lib\vc_lib\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_lib\mswunivd\wx\setup.h @@ -705,7 +705,7 @@ SOURCE=..\..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "qa - Win32 DLL Unicode Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\..\include\wx\msw\setup.h "..\..\lib\vc_dll\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswu\wx\setup.h @@ -715,7 +715,7 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "qa - Win32 DLL Unicode Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\..\include\wx\msw\setup.h "..\..\lib\vc_dll\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswud\wx\setup.h @@ -725,7 +725,7 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "qa - Win32 DLL Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\..\include\wx\msw\setup.h "..\..\lib\vc_dll\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\msw\wx\setup.h @@ -735,7 +735,7 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "qa - Win32 DLL Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\..\include\wx\msw\setup.h "..\..\lib\vc_dll\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswd\wx\setup.h @@ -769,7 +769,7 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "qa - Win32 Unicode Release" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\..\include\wx\msw\setup.h "..\..\lib\vc_lib\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_lib\mswu\wx\setup.h @@ -779,7 +779,7 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "qa - Win32 Unicode Debug" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\..\include\wx\msw\setup.h "..\..\lib\vc_lib\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_lib\mswud\wx\setup.h @@ -789,7 +789,7 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "qa - Win32 Release" # Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\..\include\wx\msw\setup.h "..\..\lib\vc_lib\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_lib\msw\wx\setup.h @@ -799,7 +799,7 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "qa - Win32 Debug" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\..\include\wx\msw\setup.h "..\..\lib\vc_lib\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_lib\mswd\wx\setup.h @@ -820,8 +820,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !IF "$(CFG)" == "qa - Win32 DLL Universal Unicode Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswunivu\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h" # End Custom Build @@ -829,8 +830,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "qa - Win32 DLL Universal Unicode Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswunivud\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" # End Custom Build @@ -838,8 +840,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "qa - Win32 DLL Universal Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswuniv\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h" # End Custom Build @@ -847,8 +850,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "qa - Win32 DLL Universal Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswunivd\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h" # End Custom Build @@ -856,8 +860,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "qa - Win32 DLL Unicode Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswu\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" # End Custom Build @@ -865,8 +870,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "qa - Win32 DLL Unicode Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswud\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" # End Custom Build @@ -874,8 +880,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "qa - Win32 DLL Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_dll\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_dll\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\msw\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\msw\wx\msw\rcdefs.h" # End Custom Build @@ -883,8 +890,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "qa - Win32 DLL Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswd\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h" # End Custom Build @@ -892,8 +900,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "qa - Win32 Universal Unicode Release" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswunivu\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h" # End Custom Build @@ -901,8 +910,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "qa - Win32 Universal Unicode Debug" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswunivud\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" # End Custom Build @@ -910,8 +920,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "qa - Win32 Universal Release" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswuniv\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h" # End Custom Build @@ -919,8 +930,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "qa - Win32 Universal Debug" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswunivd\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h" # End Custom Build @@ -928,8 +940,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "qa - Win32 Unicode Release" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswu\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" # End Custom Build @@ -937,8 +950,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "qa - Win32 Unicode Debug" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswud\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" # End Custom Build @@ -946,8 +960,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "qa - Win32 Release" # Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_lib\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_lib\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\msw\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\msw\wx\msw\rcdefs.h" # End Custom Build @@ -955,8 +970,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "qa - Win32 Debug" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswd\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h" # End Custom Build diff --git a/build/msw/wx_richtext.dsp b/build/msw/wx_richtext.dsp index 0a23cc51db..fd29165ea9 100644 --- a/build/msw/wx_richtext.dsp +++ b/build/msw/wx_richtext.dsp @@ -534,7 +534,7 @@ SOURCE=..\..\include\wx\univ\setup.h !IF "$(CFG)" == "richtext - Win32 DLL Universal Unicode Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h -InputPath=..\include\wx\univ\setup.h +InputPath=..\..\include\wx\univ\setup.h "..\..\lib\vc_dll\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h @@ -544,7 +544,7 @@ InputPath=..\include\wx\univ\setup.h !ELSEIF "$(CFG)" == "richtext - Win32 DLL Universal Unicode Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h -InputPath=..\include\wx\univ\setup.h +InputPath=..\..\include\wx\univ\setup.h "..\..\lib\vc_dll\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswunivud\wx\setup.h @@ -554,7 +554,7 @@ InputPath=..\include\wx\univ\setup.h !ELSEIF "$(CFG)" == "richtext - Win32 DLL Universal Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\setup.h -InputPath=..\include\wx\univ\setup.h +InputPath=..\..\include\wx\univ\setup.h "..\..\lib\vc_dll\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswuniv\wx\setup.h @@ -564,7 +564,7 @@ InputPath=..\include\wx\univ\setup.h !ELSEIF "$(CFG)" == "richtext - Win32 DLL Universal Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\setup.h -InputPath=..\include\wx\univ\setup.h +InputPath=..\..\include\wx\univ\setup.h "..\..\lib\vc_dll\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswunivd\wx\setup.h @@ -598,7 +598,7 @@ InputPath=..\include\wx\univ\setup.h !ELSEIF "$(CFG)" == "richtext - Win32 Universal Unicode Release" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h -InputPath=..\include\wx\univ\setup.h +InputPath=..\..\include\wx\univ\setup.h "..\..\lib\vc_lib\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h @@ -608,7 +608,7 @@ InputPath=..\include\wx\univ\setup.h !ELSEIF "$(CFG)" == "richtext - Win32 Universal Unicode Debug" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h -InputPath=..\include\wx\univ\setup.h +InputPath=..\..\include\wx\univ\setup.h "..\..\lib\vc_lib\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h @@ -618,7 +618,7 @@ InputPath=..\include\wx\univ\setup.h !ELSEIF "$(CFG)" == "richtext - Win32 Universal Release" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\setup.h -InputPath=..\include\wx\univ\setup.h +InputPath=..\..\include\wx\univ\setup.h "..\..\lib\vc_lib\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_lib\mswuniv\wx\setup.h @@ -628,7 +628,7 @@ InputPath=..\include\wx\univ\setup.h !ELSEIF "$(CFG)" == "richtext - Win32 Universal Debug" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\setup.h -InputPath=..\include\wx\univ\setup.h +InputPath=..\..\include\wx\univ\setup.h "..\..\lib\vc_lib\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_lib\mswunivd\wx\setup.h @@ -693,7 +693,7 @@ SOURCE=..\..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "richtext - Win32 DLL Unicode Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\..\include\wx\msw\setup.h "..\..\lib\vc_dll\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswu\wx\setup.h @@ -703,7 +703,7 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "richtext - Win32 DLL Unicode Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\..\include\wx\msw\setup.h "..\..\lib\vc_dll\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswud\wx\setup.h @@ -713,7 +713,7 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "richtext - Win32 DLL Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\..\include\wx\msw\setup.h "..\..\lib\vc_dll\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\msw\wx\setup.h @@ -723,7 +723,7 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "richtext - Win32 DLL Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\..\include\wx\msw\setup.h "..\..\lib\vc_dll\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswd\wx\setup.h @@ -757,7 +757,7 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "richtext - Win32 Unicode Release" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\..\include\wx\msw\setup.h "..\..\lib\vc_lib\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_lib\mswu\wx\setup.h @@ -767,7 +767,7 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "richtext - Win32 Unicode Debug" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\..\include\wx\msw\setup.h "..\..\lib\vc_lib\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_lib\mswud\wx\setup.h @@ -777,7 +777,7 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "richtext - Win32 Release" # Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\..\include\wx\msw\setup.h "..\..\lib\vc_lib\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_lib\msw\wx\setup.h @@ -787,7 +787,7 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "richtext - Win32 Debug" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\..\include\wx\msw\setup.h "..\..\lib\vc_lib\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_lib\mswd\wx\setup.h @@ -808,8 +808,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !IF "$(CFG)" == "richtext - Win32 DLL Universal Unicode Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswunivu\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h" # End Custom Build @@ -817,8 +818,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "richtext - Win32 DLL Universal Unicode Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswunivud\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" # End Custom Build @@ -826,8 +828,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "richtext - Win32 DLL Universal Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswuniv\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h" # End Custom Build @@ -835,8 +838,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "richtext - Win32 DLL Universal Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswunivd\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h" # End Custom Build @@ -844,8 +848,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "richtext - Win32 DLL Unicode Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswu\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" # End Custom Build @@ -853,8 +858,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "richtext - Win32 DLL Unicode Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswud\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" # End Custom Build @@ -862,8 +868,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "richtext - Win32 DLL Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_dll\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_dll\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\msw\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\msw\wx\msw\rcdefs.h" # End Custom Build @@ -871,8 +878,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "richtext - Win32 DLL Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswd\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h" # End Custom Build @@ -880,8 +888,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "richtext - Win32 Universal Unicode Release" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswunivu\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h" # End Custom Build @@ -889,8 +898,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "richtext - Win32 Universal Unicode Debug" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswunivud\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" # End Custom Build @@ -898,8 +908,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "richtext - Win32 Universal Release" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswuniv\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h" # End Custom Build @@ -907,8 +918,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "richtext - Win32 Universal Debug" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswunivd\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h" # End Custom Build @@ -916,8 +928,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "richtext - Win32 Unicode Release" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswu\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" # End Custom Build @@ -925,8 +938,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "richtext - Win32 Unicode Debug" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswud\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" # End Custom Build @@ -934,8 +948,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "richtext - Win32 Release" # Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_lib\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_lib\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\msw\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\msw\wx\msw\rcdefs.h" # End Custom Build @@ -943,8 +958,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "richtext - Win32 Debug" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswd\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h" # End Custom Build diff --git a/build/msw/wx_wxregex.dsp b/build/msw/wx_wxregex.dsp index e9a58b19be..142e32e003 100644 --- a/build/msw/wx_wxregex.dsp +++ b/build/msw/wx_wxregex.dsp @@ -460,8 +460,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !IF "$(CFG)" == "wxregex - Win32 DLL Universal Unicode Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswunivu\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h" # End Custom Build @@ -469,8 +470,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "wxregex - Win32 DLL Universal Unicode Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswunivud\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" # End Custom Build @@ -478,8 +480,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "wxregex - Win32 DLL Universal Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswuniv\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h" # End Custom Build @@ -487,8 +490,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "wxregex - Win32 DLL Universal Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswunivd\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h" # End Custom Build @@ -496,8 +500,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "wxregex - Win32 DLL Unicode Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswu\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" # End Custom Build @@ -505,8 +510,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "wxregex - Win32 DLL Unicode Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswud\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" # End Custom Build @@ -514,8 +520,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "wxregex - Win32 DLL Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_dll\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_dll\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\msw\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\msw\wx\msw\rcdefs.h" # End Custom Build @@ -523,8 +530,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "wxregex - Win32 DLL Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswd\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h" # End Custom Build @@ -532,8 +540,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "wxregex - Win32 Universal Unicode Release" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswunivu\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h" # End Custom Build @@ -541,8 +550,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "wxregex - Win32 Universal Unicode Debug" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswunivud\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" # End Custom Build @@ -550,8 +560,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "wxregex - Win32 Universal Release" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswuniv\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h" # End Custom Build @@ -559,8 +570,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "wxregex - Win32 Universal Debug" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswunivd\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h" # End Custom Build @@ -568,8 +580,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "wxregex - Win32 Unicode Release" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswu\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" # End Custom Build @@ -577,8 +590,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "wxregex - Win32 Unicode Debug" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswud\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" # End Custom Build @@ -586,8 +600,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "wxregex - Win32 Release" # Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_lib\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_lib\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\msw\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\msw\wx\msw\rcdefs.h" # End Custom Build @@ -595,8 +610,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "wxregex - Win32 Debug" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswd\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h" # End Custom Build @@ -611,7 +627,7 @@ SOURCE=..\..\include\wx\univ\setup.h !IF "$(CFG)" == "wxregex - Win32 DLL Universal Unicode Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h -InputPath=..\include\wx\univ\setup.h +InputPath=..\..\include\wx\univ\setup.h "..\..\lib\vc_dll\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h @@ -621,7 +637,7 @@ InputPath=..\include\wx\univ\setup.h !ELSEIF "$(CFG)" == "wxregex - Win32 DLL Universal Unicode Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h -InputPath=..\include\wx\univ\setup.h +InputPath=..\..\include\wx\univ\setup.h "..\..\lib\vc_dll\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswunivud\wx\setup.h @@ -631,7 +647,7 @@ InputPath=..\include\wx\univ\setup.h !ELSEIF "$(CFG)" == "wxregex - Win32 DLL Universal Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\setup.h -InputPath=..\include\wx\univ\setup.h +InputPath=..\..\include\wx\univ\setup.h "..\..\lib\vc_dll\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswuniv\wx\setup.h @@ -641,7 +657,7 @@ InputPath=..\include\wx\univ\setup.h !ELSEIF "$(CFG)" == "wxregex - Win32 DLL Universal Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\setup.h -InputPath=..\include\wx\univ\setup.h +InputPath=..\..\include\wx\univ\setup.h "..\..\lib\vc_dll\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswunivd\wx\setup.h @@ -675,7 +691,7 @@ InputPath=..\include\wx\univ\setup.h !ELSEIF "$(CFG)" == "wxregex - Win32 Universal Unicode Release" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h -InputPath=..\include\wx\univ\setup.h +InputPath=..\..\include\wx\univ\setup.h "..\..\lib\vc_lib\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h @@ -685,7 +701,7 @@ InputPath=..\include\wx\univ\setup.h !ELSEIF "$(CFG)" == "wxregex - Win32 Universal Unicode Debug" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h -InputPath=..\include\wx\univ\setup.h +InputPath=..\..\include\wx\univ\setup.h "..\..\lib\vc_lib\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h @@ -695,7 +711,7 @@ InputPath=..\include\wx\univ\setup.h !ELSEIF "$(CFG)" == "wxregex - Win32 Universal Release" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\setup.h -InputPath=..\include\wx\univ\setup.h +InputPath=..\..\include\wx\univ\setup.h "..\..\lib\vc_lib\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_lib\mswuniv\wx\setup.h @@ -705,7 +721,7 @@ InputPath=..\include\wx\univ\setup.h !ELSEIF "$(CFG)" == "wxregex - Win32 Universal Debug" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\setup.h -InputPath=..\include\wx\univ\setup.h +InputPath=..\..\include\wx\univ\setup.h "..\..\lib\vc_lib\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_lib\mswunivd\wx\setup.h @@ -770,7 +786,7 @@ SOURCE=..\..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "wxregex - Win32 DLL Unicode Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\..\include\wx\msw\setup.h "..\..\lib\vc_dll\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswu\wx\setup.h @@ -780,7 +796,7 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "wxregex - Win32 DLL Unicode Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\..\include\wx\msw\setup.h "..\..\lib\vc_dll\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswud\wx\setup.h @@ -790,7 +806,7 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "wxregex - Win32 DLL Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\..\include\wx\msw\setup.h "..\..\lib\vc_dll\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\msw\wx\setup.h @@ -800,7 +816,7 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "wxregex - Win32 DLL Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\..\include\wx\msw\setup.h "..\..\lib\vc_dll\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswd\wx\setup.h @@ -834,7 +850,7 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "wxregex - Win32 Unicode Release" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\..\include\wx\msw\setup.h "..\..\lib\vc_lib\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_lib\mswu\wx\setup.h @@ -844,7 +860,7 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "wxregex - Win32 Unicode Debug" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\..\include\wx\msw\setup.h "..\..\lib\vc_lib\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_lib\mswud\wx\setup.h @@ -854,7 +870,7 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "wxregex - Win32 Release" # Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\..\include\wx\msw\setup.h "..\..\lib\vc_lib\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_lib\msw\wx\setup.h @@ -864,7 +880,7 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "wxregex - Win32 Debug" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\..\include\wx\msw\setup.h "..\..\lib\vc_lib\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_lib\mswd\wx\setup.h diff --git a/build/msw/wx_xml.dsp b/build/msw/wx_xml.dsp index be922af690..d50a11a72d 100644 --- a/build/msw/wx_xml.dsp +++ b/build/msw/wx_xml.dsp @@ -538,7 +538,7 @@ SOURCE=..\..\include\wx\univ\setup.h !IF "$(CFG)" == "xml - Win32 DLL Universal Unicode Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h -InputPath=..\include\wx\univ\setup.h +InputPath=..\..\include\wx\univ\setup.h "..\..\lib\vc_dll\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h @@ -548,7 +548,7 @@ InputPath=..\include\wx\univ\setup.h !ELSEIF "$(CFG)" == "xml - Win32 DLL Universal Unicode Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h -InputPath=..\include\wx\univ\setup.h +InputPath=..\..\include\wx\univ\setup.h "..\..\lib\vc_dll\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswunivud\wx\setup.h @@ -558,7 +558,7 @@ InputPath=..\include\wx\univ\setup.h !ELSEIF "$(CFG)" == "xml - Win32 DLL Universal Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\setup.h -InputPath=..\include\wx\univ\setup.h +InputPath=..\..\include\wx\univ\setup.h "..\..\lib\vc_dll\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswuniv\wx\setup.h @@ -568,7 +568,7 @@ InputPath=..\include\wx\univ\setup.h !ELSEIF "$(CFG)" == "xml - Win32 DLL Universal Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\setup.h -InputPath=..\include\wx\univ\setup.h +InputPath=..\..\include\wx\univ\setup.h "..\..\lib\vc_dll\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswunivd\wx\setup.h @@ -602,7 +602,7 @@ InputPath=..\include\wx\univ\setup.h !ELSEIF "$(CFG)" == "xml - Win32 Universal Unicode Release" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h -InputPath=..\include\wx\univ\setup.h +InputPath=..\..\include\wx\univ\setup.h "..\..\lib\vc_lib\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h @@ -612,7 +612,7 @@ InputPath=..\include\wx\univ\setup.h !ELSEIF "$(CFG)" == "xml - Win32 Universal Unicode Debug" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h -InputPath=..\include\wx\univ\setup.h +InputPath=..\..\include\wx\univ\setup.h "..\..\lib\vc_lib\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h @@ -622,7 +622,7 @@ InputPath=..\include\wx\univ\setup.h !ELSEIF "$(CFG)" == "xml - Win32 Universal Release" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\setup.h -InputPath=..\include\wx\univ\setup.h +InputPath=..\..\include\wx\univ\setup.h "..\..\lib\vc_lib\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_lib\mswuniv\wx\setup.h @@ -632,7 +632,7 @@ InputPath=..\include\wx\univ\setup.h !ELSEIF "$(CFG)" == "xml - Win32 Universal Debug" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\setup.h -InputPath=..\include\wx\univ\setup.h +InputPath=..\..\include\wx\univ\setup.h "..\..\lib\vc_lib\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_lib\mswunivd\wx\setup.h @@ -697,7 +697,7 @@ SOURCE=..\..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "xml - Win32 DLL Unicode Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\..\include\wx\msw\setup.h "..\..\lib\vc_dll\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswu\wx\setup.h @@ -707,7 +707,7 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "xml - Win32 DLL Unicode Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\..\include\wx\msw\setup.h "..\..\lib\vc_dll\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswud\wx\setup.h @@ -717,7 +717,7 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "xml - Win32 DLL Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\..\include\wx\msw\setup.h "..\..\lib\vc_dll\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\msw\wx\setup.h @@ -727,7 +727,7 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "xml - Win32 DLL Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\..\include\wx\msw\setup.h "..\..\lib\vc_dll\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswd\wx\setup.h @@ -761,7 +761,7 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "xml - Win32 Unicode Release" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\..\include\wx\msw\setup.h "..\..\lib\vc_lib\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_lib\mswu\wx\setup.h @@ -771,7 +771,7 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "xml - Win32 Unicode Debug" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\..\include\wx\msw\setup.h "..\..\lib\vc_lib\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_lib\mswud\wx\setup.h @@ -781,7 +781,7 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "xml - Win32 Release" # Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\..\include\wx\msw\setup.h "..\..\lib\vc_lib\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_lib\msw\wx\setup.h @@ -791,7 +791,7 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "xml - Win32 Debug" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\..\include\wx\msw\setup.h "..\..\lib\vc_lib\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_lib\mswd\wx\setup.h @@ -812,8 +812,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !IF "$(CFG)" == "xml - Win32 DLL Universal Unicode Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswunivu\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h" # End Custom Build @@ -821,8 +822,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "xml - Win32 DLL Universal Unicode Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswunivud\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" # End Custom Build @@ -830,8 +832,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "xml - Win32 DLL Universal Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswuniv\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h" # End Custom Build @@ -839,8 +842,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "xml - Win32 DLL Universal Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswunivd\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h" # End Custom Build @@ -848,8 +852,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "xml - Win32 DLL Unicode Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswu\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" # End Custom Build @@ -857,8 +862,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "xml - Win32 DLL Unicode Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswud\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" # End Custom Build @@ -866,8 +872,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "xml - Win32 DLL Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_dll\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_dll\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\msw\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\msw\wx\msw\rcdefs.h" # End Custom Build @@ -875,8 +882,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "xml - Win32 DLL Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswd\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h" # End Custom Build @@ -884,8 +892,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "xml - Win32 Universal Unicode Release" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswunivu\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h" # End Custom Build @@ -893,8 +902,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "xml - Win32 Universal Unicode Debug" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswunivud\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" # End Custom Build @@ -902,8 +912,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "xml - Win32 Universal Release" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswuniv\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h" # End Custom Build @@ -911,8 +922,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "xml - Win32 Universal Debug" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswunivd\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h" # End Custom Build @@ -920,8 +932,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "xml - Win32 Unicode Release" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswu\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" # End Custom Build @@ -929,8 +942,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "xml - Win32 Unicode Debug" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswud\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" # End Custom Build @@ -938,8 +952,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "xml - Win32 Release" # Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_lib\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_lib\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\msw\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\msw\wx\msw\rcdefs.h" # End Custom Build @@ -947,8 +962,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "xml - Win32 Debug" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswd\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h" # End Custom Build diff --git a/build/msw/wx_xrc.dsp b/build/msw/wx_xrc.dsp index 7c7364500f..6a1329819b 100644 --- a/build/msw/wx_xrc.dsp +++ b/build/msw/wx_xrc.dsp @@ -558,7 +558,7 @@ SOURCE=..\..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "xrc - Win32 DLL Unicode Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\..\include\wx\msw\setup.h "..\..\lib\vc_dll\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswu\wx\setup.h @@ -568,7 +568,7 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "xrc - Win32 DLL Unicode Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\..\include\wx\msw\setup.h "..\..\lib\vc_dll\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswud\wx\setup.h @@ -578,7 +578,7 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "xrc - Win32 DLL Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\..\include\wx\msw\setup.h "..\..\lib\vc_dll\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\msw\wx\setup.h @@ -588,7 +588,7 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "xrc - Win32 DLL Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\..\include\wx\msw\setup.h "..\..\lib\vc_dll\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswd\wx\setup.h @@ -622,7 +622,7 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "xrc - Win32 Unicode Release" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\..\include\wx\msw\setup.h "..\..\lib\vc_lib\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_lib\mswu\wx\setup.h @@ -632,7 +632,7 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "xrc - Win32 Unicode Debug" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\..\include\wx\msw\setup.h "..\..\lib\vc_lib\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_lib\mswud\wx\setup.h @@ -642,7 +642,7 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "xrc - Win32 Release" # Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\..\include\wx\msw\setup.h "..\..\lib\vc_lib\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_lib\msw\wx\setup.h @@ -652,7 +652,7 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "xrc - Win32 Debug" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\..\include\wx\msw\setup.h "..\..\lib\vc_lib\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_lib\mswd\wx\setup.h @@ -669,7 +669,7 @@ SOURCE=..\..\include\wx\univ\setup.h !IF "$(CFG)" == "xrc - Win32 DLL Universal Unicode Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h -InputPath=..\include\wx\univ\setup.h +InputPath=..\..\include\wx\univ\setup.h "..\..\lib\vc_dll\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h @@ -679,7 +679,7 @@ InputPath=..\include\wx\univ\setup.h !ELSEIF "$(CFG)" == "xrc - Win32 DLL Universal Unicode Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h -InputPath=..\include\wx\univ\setup.h +InputPath=..\..\include\wx\univ\setup.h "..\..\lib\vc_dll\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswunivud\wx\setup.h @@ -689,7 +689,7 @@ InputPath=..\include\wx\univ\setup.h !ELSEIF "$(CFG)" == "xrc - Win32 DLL Universal Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\setup.h -InputPath=..\include\wx\univ\setup.h +InputPath=..\..\include\wx\univ\setup.h "..\..\lib\vc_dll\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswuniv\wx\setup.h @@ -699,7 +699,7 @@ InputPath=..\include\wx\univ\setup.h !ELSEIF "$(CFG)" == "xrc - Win32 DLL Universal Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\setup.h -InputPath=..\include\wx\univ\setup.h +InputPath=..\..\include\wx\univ\setup.h "..\..\lib\vc_dll\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswunivd\wx\setup.h @@ -733,7 +733,7 @@ InputPath=..\include\wx\univ\setup.h !ELSEIF "$(CFG)" == "xrc - Win32 Universal Unicode Release" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h -InputPath=..\include\wx\univ\setup.h +InputPath=..\..\include\wx\univ\setup.h "..\..\lib\vc_lib\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h @@ -743,7 +743,7 @@ InputPath=..\include\wx\univ\setup.h !ELSEIF "$(CFG)" == "xrc - Win32 Universal Unicode Debug" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h -InputPath=..\include\wx\univ\setup.h +InputPath=..\..\include\wx\univ\setup.h "..\..\lib\vc_lib\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h @@ -753,7 +753,7 @@ InputPath=..\include\wx\univ\setup.h !ELSEIF "$(CFG)" == "xrc - Win32 Universal Release" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\setup.h -InputPath=..\include\wx\univ\setup.h +InputPath=..\..\include\wx\univ\setup.h "..\..\lib\vc_lib\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_lib\mswuniv\wx\setup.h @@ -763,7 +763,7 @@ InputPath=..\include\wx\univ\setup.h !ELSEIF "$(CFG)" == "xrc - Win32 Universal Debug" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\setup.h -InputPath=..\include\wx\univ\setup.h +InputPath=..\..\include\wx\univ\setup.h "..\..\lib\vc_lib\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_lib\mswunivd\wx\setup.h @@ -808,8 +808,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !IF "$(CFG)" == "xrc - Win32 DLL Universal Unicode Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswunivu\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h" # End Custom Build @@ -817,8 +818,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "xrc - Win32 DLL Universal Unicode Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswunivud\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" # End Custom Build @@ -826,8 +828,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "xrc - Win32 DLL Universal Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswuniv\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h" # End Custom Build @@ -835,8 +838,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "xrc - Win32 DLL Universal Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswunivd\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h" # End Custom Build @@ -844,8 +848,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "xrc - Win32 DLL Unicode Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswu\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" # End Custom Build @@ -853,8 +858,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "xrc - Win32 DLL Unicode Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswud\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" # End Custom Build @@ -862,8 +868,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "xrc - Win32 DLL Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_dll\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_dll\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\msw\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\msw\wx\msw\rcdefs.h" # End Custom Build @@ -871,8 +878,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "xrc - Win32 DLL Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswd\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h" # End Custom Build @@ -880,8 +888,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "xrc - Win32 Universal Unicode Release" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswunivu\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h" # End Custom Build @@ -889,8 +898,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "xrc - Win32 Universal Unicode Debug" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswunivud\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" # End Custom Build @@ -898,8 +908,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "xrc - Win32 Universal Release" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswuniv\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h" # End Custom Build @@ -907,8 +918,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "xrc - Win32 Universal Debug" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswunivd\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h" # End Custom Build @@ -916,8 +928,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "xrc - Win32 Unicode Release" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswu\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" # End Custom Build @@ -925,8 +938,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "xrc - Win32 Unicode Debug" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswud\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" # End Custom Build @@ -934,8 +948,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "xrc - Win32 Release" # Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_lib\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_lib\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\msw\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\msw\wx\msw\rcdefs.h" # End Custom Build @@ -943,8 +958,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h !ELSEIF "$(CFG)" == "xrc - Win32 Debug" # Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h -"..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" +"..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswd\wx\msw" cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h" # End Custom Build diff --git a/contrib/build/deprecated/makefile.gcc b/contrib/build/deprecated/makefile.gcc index c2ce73724a..466f34ae08 100644 --- a/contrib/build/deprecated/makefile.gcc +++ b/contrib/build/deprecated/makefile.gcc @@ -272,7 +272,7 @@ clean: ifeq ($(SHARED),1) $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated_gcc$(VENDORTAG).dll: $(DEPRECATEDDLL_OBJECTS) $(OBJS)\deprecateddll_version_rc.o - $(CXX) -shared -fPIC -o $@ $(DEPRECATEDDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated.a $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) + $(CXX) -shared -fPIC -o $@ $(DEPRECATEDDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated.a $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) endif ifeq ($(SHARED),0) diff --git a/contrib/build/fl/makefile.gcc b/contrib/build/fl/makefile.gcc index d882063421..a32834237f 100644 --- a/contrib/build/fl/makefile.gcc +++ b/contrib/build/fl/makefile.gcc @@ -271,7 +271,7 @@ clean: ifeq ($(SHARED),1) $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl_gcc$(VENDORTAG).dll: $(FLDLL_OBJECTS) $(OBJS)\fldll_version_rc.o - $(CXX) -shared -fPIC -o $@ $(FLDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl.a $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) + $(CXX) -shared -fPIC -o $@ $(FLDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl.a $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) endif ifeq ($(SHARED),0) diff --git a/contrib/build/foldbar/makefile.gcc b/contrib/build/foldbar/makefile.gcc index 1948917f73..b1df507f9b 100644 --- a/contrib/build/foldbar/makefile.gcc +++ b/contrib/build/foldbar/makefile.gcc @@ -244,7 +244,7 @@ clean: ifeq ($(SHARED),1) $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar_gcc$(VENDORTAG).dll: $(FOLDBARDLL_OBJECTS) $(OBJS)\foldbardll_version_rc.o - $(CXX) -shared -fPIC -o $@ $(FOLDBARDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar.a $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) + $(CXX) -shared -fPIC -o $@ $(FOLDBARDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar.a $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) endif ifeq ($(SHARED),0) diff --git a/contrib/build/gizmos/makefile.gcc b/contrib/build/gizmos/makefile.gcc index 888fb97bcb..fccc368256 100644 --- a/contrib/build/gizmos/makefile.gcc +++ b/contrib/build/gizmos/makefile.gcc @@ -295,13 +295,13 @@ clean: ifeq ($(SHARED),1) $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_gcc$(VENDORTAG).dll: $(GIZMOSDLL_OBJECTS) $(OBJS)\gizmosdll_version_rc.o - $(CXX) -shared -fPIC -o $@ $(GIZMOSDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.a $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) + $(CXX) -shared -fPIC -o $@ $(GIZMOSDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.a $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) endif ifeq ($(SHARED),1) ifeq ($(USE_XRC),1) $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc_gcc$(VENDORTAG).dll: $(GIZMOS_XRCDLL_OBJECTS) $(OBJS)\gizmos_xrcdll_version_rc.o $(__gizmosdll___depname) - $(CXX) -shared -fPIC -o $@ $(GIZMOS_XRCDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc.a $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.a $(__WXLIB_XRC_p) $(__WXLIB_XML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) + $(CXX) -shared -fPIC -o $@ $(GIZMOS_XRCDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc.a $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.a $(__WXLIB_XRC_p) $(__WXLIB_XML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) endif endif diff --git a/contrib/build/mmedia/makefile.gcc b/contrib/build/mmedia/makefile.gcc index fe1d5992f7..de5f2a591d 100644 --- a/contrib/build/mmedia/makefile.gcc +++ b/contrib/build/mmedia/makefile.gcc @@ -278,7 +278,7 @@ clean: ifeq ($(SHARED),1) $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia_gcc$(VENDORTAG).dll: $(MMEDIADLL_OBJECTS) $(OBJS)\mmediadll_version_rc.o - $(CXX) -shared -fPIC -o $@ $(MMEDIADLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia.a $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) + $(CXX) -shared -fPIC -o $@ $(MMEDIADLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia.a $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) endif ifeq ($(SHARED),0) diff --git a/contrib/build/net/makefile.gcc b/contrib/build/net/makefile.gcc index a084de6363..eddc2d0864 100644 --- a/contrib/build/net/makefile.gcc +++ b/contrib/build/net/makefile.gcc @@ -244,7 +244,7 @@ clean: ifeq ($(SHARED),1) $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils_gcc$(VENDORTAG).dll: $(NETUTILSDLL_OBJECTS) $(OBJS)\netutilsdll_version_rc.o - $(CXX) -shared -fPIC -o $@ $(NETUTILSDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils.a $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) + $(CXX) -shared -fPIC -o $@ $(NETUTILSDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils.a $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) endif ifeq ($(SHARED),0) diff --git a/contrib/build/ogl/makefile.gcc b/contrib/build/ogl/makefile.gcc index 8e683167d7..7273443562 100644 --- a/contrib/build/ogl/makefile.gcc +++ b/contrib/build/ogl/makefile.gcc @@ -261,7 +261,7 @@ clean: ifeq ($(SHARED),1) $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl_gcc$(VENDORTAG).dll: $(OGLDLL_OBJECTS) $(OBJS)\ogldll_version_rc.o - $(CXX) -shared -fPIC -o $@ $(OGLDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl.a $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) + $(CXX) -shared -fPIC -o $@ $(OGLDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl.a $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) endif ifeq ($(SHARED),0) diff --git a/contrib/build/plot/makefile.gcc b/contrib/build/plot/makefile.gcc index 22b23321a5..3f830bb112 100644 --- a/contrib/build/plot/makefile.gcc +++ b/contrib/build/plot/makefile.gcc @@ -240,7 +240,7 @@ clean: ifeq ($(SHARED),1) $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot_gcc$(VENDORTAG).dll: $(PLOTDLL_OBJECTS) $(OBJS)\plotdll_version_rc.o - $(CXX) -shared -fPIC -o $@ $(PLOTDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot.a $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) + $(CXX) -shared -fPIC -o $@ $(PLOTDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot.a $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) endif ifeq ($(SHARED),0) diff --git a/contrib/build/stc/makefile.gcc b/contrib/build/stc/makefile.gcc index fd8482697b..6336f7638d 100644 --- a/contrib/build/stc/makefile.gcc +++ b/contrib/build/stc/makefile.gcc @@ -407,7 +407,7 @@ clean: ifeq ($(SHARED),1) $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc_gcc$(VENDORTAG).dll: $(STCDLL_OBJECTS) $(OBJS)\stcdll_version_rc.o - $(CXX) -shared -fPIC -o $@ $(STCDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.a $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) + $(CXX) -shared -fPIC -o $@ $(STCDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.a $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) endif ifeq ($(SHARED),0) diff --git a/contrib/build/svg/makefile.gcc b/contrib/build/svg/makefile.gcc index 157449126f..6c2ea72563 100644 --- a/contrib/build/svg/makefile.gcc +++ b/contrib/build/svg/makefile.gcc @@ -239,7 +239,7 @@ clean: ifeq ($(SHARED),1) $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_svg_gcc$(VENDORTAG).dll: $(SVGDLL_OBJECTS) $(OBJS)\svgdll_version_rc.o - $(CXX) -shared -fPIC -o $@ $(SVGDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_svg.a $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) + $(CXX) -shared -fPIC -o $@ $(SVGDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_svg.a $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) endif ifeq ($(SHARED),0) diff --git a/contrib/samples/deprecated/proplist/Makefile.in b/contrib/samples/deprecated/proplist/Makefile.in index 730450cfe8..5da90d1c11 100644 --- a/contrib/samples/deprecated/proplist/Makefile.in +++ b/contrib/samples/deprecated/proplist/Makefile.in @@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 2.8 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib PROPLIST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/contrib/samples/deprecated/resource/Makefile.in b/contrib/samples/deprecated/resource/Makefile.in index ec6ac463ee..06403b4857 100644 --- a/contrib/samples/deprecated/resource/Makefile.in +++ b/contrib/samples/deprecated/resource/Makefile.in @@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 2.8 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib RESOURCE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/contrib/samples/deprecated/treelay/Makefile.in b/contrib/samples/deprecated/treelay/Makefile.in index 7c270a1110..930b5161a0 100644 --- a/contrib/samples/deprecated/treelay/Makefile.in +++ b/contrib/samples/deprecated/treelay/Makefile.in @@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 2.8 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib TREELAY_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/contrib/samples/fl/Makefile.in b/contrib/samples/fl/Makefile.in index ffe2c21a26..a8cf22b57e 100644 --- a/contrib/samples/fl/Makefile.in +++ b/contrib/samples/fl/Makefile.in @@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 2.8 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib FL_DEMO1_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/contrib/samples/foldbar/extended/Makefile.in b/contrib/samples/foldbar/extended/Makefile.in index c7608618cc..5dfbad1d11 100644 --- a/contrib/samples/foldbar/extended/Makefile.in +++ b/contrib/samples/foldbar/extended/Makefile.in @@ -43,7 +43,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 2.8 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib EXTENDED_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/contrib/samples/foldbar/foldpanelbar/Makefile.in b/contrib/samples/foldbar/foldpanelbar/Makefile.in index b265d8ac5d..a041190056 100644 --- a/contrib/samples/foldbar/foldpanelbar/Makefile.in +++ b/contrib/samples/foldbar/foldpanelbar/Makefile.in @@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 2.8 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib FOLDTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/contrib/samples/gizmos/dynsash/Makefile.in b/contrib/samples/gizmos/dynsash/Makefile.in index 0e02ee5dc6..9071582aee 100644 --- a/contrib/samples/gizmos/dynsash/Makefile.in +++ b/contrib/samples/gizmos/dynsash/Makefile.in @@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 2.8 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib DYNSASH_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/contrib/samples/gizmos/dynsash_switch/Makefile.in b/contrib/samples/gizmos/dynsash_switch/Makefile.in index eb9911f444..87368ef95a 100644 --- a/contrib/samples/gizmos/dynsash_switch/Makefile.in +++ b/contrib/samples/gizmos/dynsash_switch/Makefile.in @@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 2.8 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib DYNSASH_SWITCH_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/contrib/samples/gizmos/editlbox/Makefile.in b/contrib/samples/gizmos/editlbox/Makefile.in index 0d3605e336..c4bcf6e356 100644 --- a/contrib/samples/gizmos/editlbox/Makefile.in +++ b/contrib/samples/gizmos/editlbox/Makefile.in @@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 2.8 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib TEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/contrib/samples/gizmos/led/Makefile.in b/contrib/samples/gizmos/led/Makefile.in index d5a9dc060b..299f59892f 100644 --- a/contrib/samples/gizmos/led/Makefile.in +++ b/contrib/samples/gizmos/led/Makefile.in @@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 2.8 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib LED_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/contrib/samples/gizmos/multicell/Makefile.in b/contrib/samples/gizmos/multicell/Makefile.in index 7cbd2e952d..28e9f07460 100644 --- a/contrib/samples/gizmos/multicell/Makefile.in +++ b/contrib/samples/gizmos/multicell/Makefile.in @@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 2.8 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib MTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/contrib/samples/gizmos/splittree/Makefile.in b/contrib/samples/gizmos/splittree/Makefile.in index ea2e53fffa..908b0e3fa0 100644 --- a/contrib/samples/gizmos/splittree/Makefile.in +++ b/contrib/samples/gizmos/splittree/Makefile.in @@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 2.8 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib SPLITTREE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/contrib/samples/mmedia/Makefile.in b/contrib/samples/mmedia/Makefile.in index 2c9fe39711..6b5aa72d22 100644 --- a/contrib/samples/mmedia/Makefile.in +++ b/contrib/samples/mmedia/Makefile.in @@ -41,7 +41,7 @@ EXTRALIBS_ESD = @EXTRALIBS_ESD@ DESTDIR = WX_RELEASE = 2.8 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib MMBOARD_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/contrib/samples/ogl/ogledit/Makefile.in b/contrib/samples/ogl/ogledit/Makefile.in index c1f305628a..f0e8bf8dd4 100644 --- a/contrib/samples/ogl/ogledit/Makefile.in +++ b/contrib/samples/ogl/ogledit/Makefile.in @@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 2.8 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib OGLEDIT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/contrib/samples/ogl/studio/Makefile.in b/contrib/samples/ogl/studio/Makefile.in index 55ac43dd83..9e814df8a3 100644 --- a/contrib/samples/ogl/studio/Makefile.in +++ b/contrib/samples/ogl/studio/Makefile.in @@ -43,7 +43,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 2.8 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib STUDIO_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/contrib/samples/plot/Makefile.in b/contrib/samples/plot/Makefile.in index 0194709c36..ded973593c 100644 --- a/contrib/samples/plot/Makefile.in +++ b/contrib/samples/plot/Makefile.in @@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 2.8 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib PLOT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/contrib/samples/stc/Makefile.in b/contrib/samples/stc/Makefile.in index 8ef158fc6e..f2f18745e1 100644 --- a/contrib/samples/stc/Makefile.in +++ b/contrib/samples/stc/Makefile.in @@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 2.8 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib STCTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/contrib/samples/svg/Makefile.in b/contrib/samples/svg/Makefile.in index 7be3a64654..616018dad3 100644 --- a/contrib/samples/svg/Makefile.in +++ b/contrib/samples/svg/Makefile.in @@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 2.8 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib SVGTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/contrib/src/deprecated/Makefile.in b/contrib/src/deprecated/Makefile.in index 4ff86b7ad4..841386ef64 100644 --- a/contrib/src/deprecated/Makefile.in +++ b/contrib/src/deprecated/Makefile.in @@ -105,7 +105,7 @@ DEPRECATEDLIB_ODEP = \ @COND_DEPS_TRACKING_0@CXXC = $(CXX) @COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX) @COND_PLATFORM_MACOSX_1@WXMACVERSION_CMD = \ -@COND_PLATFORM_MACOSX_1@ -compatibility_version 1.0 -current_version 1.0 +@COND_PLATFORM_MACOSX_1@ -compatibility_version 2.0 -current_version 2.0 @COND_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -156,9 +156,9 @@ COND_WINDOWS_IMPLIB_1___deprecateddll___importlib = \ @COND_USE_SOVERSION_0@__deprecateddll___targetsuf2 = .$(SO_SUFFIX) @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@__deprecateddll___targetsuf3 \ @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ = \ -@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ .$(SO_SUFFIX).0.0.0 +@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ .$(SO_SUFFIX).0.1.0 @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__deprecateddll___targetsuf3 \ -@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .0.0.0.$(SO_SUFFIX) +@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .0.1.0.$(SO_SUFFIX) @COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@__deprecateddll___targetsuf3 \ @COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@ = -0.$(SO_SUFFIX) @COND_USE_SOVERSION_0@__deprecateddll___targetsuf3 = .$(SO_SUFFIX) diff --git a/contrib/src/fl/Makefile.in b/contrib/src/fl/Makefile.in index d0b3ea043b..8bb0048d88 100644 --- a/contrib/src/fl/Makefile.in +++ b/contrib/src/fl/Makefile.in @@ -108,7 +108,7 @@ FLLIB_ODEP = $(___pch_wxprec_fllib_wx_wxprec_h_gch___depname) @COND_DEPS_TRACKING_0@CXXC = $(CXX) @COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX) @COND_PLATFORM_MACOSX_1@WXMACVERSION_CMD = \ -@COND_PLATFORM_MACOSX_1@ -compatibility_version 1.0 -current_version 1.0 +@COND_PLATFORM_MACOSX_1@ -compatibility_version 2.0 -current_version 2.0 @COND_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -158,9 +158,9 @@ COND_WINDOWS_IMPLIB_1___fldll___importlib = \ @COND_USE_SOVERSION_0@__fldll___targetsuf2 = .$(SO_SUFFIX) @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@__fldll___targetsuf3 \ @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ = \ -@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ .$(SO_SUFFIX).0.0.0 +@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ .$(SO_SUFFIX).0.1.0 @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__fldll___targetsuf3 \ -@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .0.0.0.$(SO_SUFFIX) +@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .0.1.0.$(SO_SUFFIX) @COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@__fldll___targetsuf3 \ @COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@ = -0.$(SO_SUFFIX) @COND_USE_SOVERSION_0@__fldll___targetsuf3 = .$(SO_SUFFIX) diff --git a/contrib/src/foldbar/Makefile.in b/contrib/src/foldbar/Makefile.in index dad082374c..8425bfaef2 100644 --- a/contrib/src/foldbar/Makefile.in +++ b/contrib/src/foldbar/Makefile.in @@ -80,7 +80,7 @@ FOLDBARLIB_ODEP = $(___pch_wxprec_foldbarlib_wx_wxprec_h_gch___depname) @COND_DEPS_TRACKING_0@CXXC = $(CXX) @COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX) @COND_PLATFORM_MACOSX_1@WXMACVERSION_CMD = \ -@COND_PLATFORM_MACOSX_1@ -compatibility_version 1.0 -current_version 1.0 +@COND_PLATFORM_MACOSX_1@ -compatibility_version 2.0 -current_version 2.0 @COND_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -130,9 +130,9 @@ COND_WINDOWS_IMPLIB_1___foldbardll___importlib = \ @COND_USE_SOVERSION_0@__foldbardll___targetsuf2 = .$(SO_SUFFIX) @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@__foldbardll___targetsuf3 \ @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ = \ -@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ .$(SO_SUFFIX).0.0.0 +@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ .$(SO_SUFFIX).0.1.0 @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__foldbardll___targetsuf3 \ -@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .0.0.0.$(SO_SUFFIX) +@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .0.1.0.$(SO_SUFFIX) @COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@__foldbardll___targetsuf3 \ @COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@ = -0.$(SO_SUFFIX) @COND_USE_SOVERSION_0@__foldbardll___targetsuf3 = .$(SO_SUFFIX) diff --git a/contrib/src/gizmos/Makefile.in b/contrib/src/gizmos/Makefile.in index b3c6ca16ab..48bb058b9e 100644 --- a/contrib/src/gizmos/Makefile.in +++ b/contrib/src/gizmos/Makefile.in @@ -103,7 +103,7 @@ GIZMOS_XRCLIB_ODEP = \ @COND_DEPS_TRACKING_0@CXXC = $(CXX) @COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX) @COND_PLATFORM_MACOSX_1@WXMACVERSION_CMD = \ -@COND_PLATFORM_MACOSX_1@ -compatibility_version 1.0 -current_version 1.0 +@COND_PLATFORM_MACOSX_1@ -compatibility_version 2.0 -current_version 2.0 @COND_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -264,8 +264,8 @@ COND_SHARED_0_USE_XRC_1___gizmos_xrclib___depname = \ @COND_USE_SOVERSION_0@__gizmos = .$(SO_SUFFIX) @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@__gizmos_0 \ @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ = \ -@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ .$(SO_SUFFIX).0.0.0 -@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__gizmos_0 = .0.0.0.$(SO_SUFFIX) +@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ .$(SO_SUFFIX).0.1.0 +@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__gizmos_0 = .0.1.0.$(SO_SUFFIX) @COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@__gizmos_0 = -0.$(SO_SUFFIX) @COND_USE_SOVERSION_0@__gizmos_0 = .$(SO_SUFFIX) @COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \ diff --git a/contrib/src/mmedia/Makefile.in b/contrib/src/mmedia/Makefile.in index 107274e982..546c71e322 100644 --- a/contrib/src/mmedia/Makefile.in +++ b/contrib/src/mmedia/Makefile.in @@ -111,7 +111,7 @@ MMEDIALIB_ODEP = $(___pch_wxprec_mmedialib_wx_wxprec_h_gch___depname) @COND_DEPS_TRACKING_0@CXXC = $(CXX) @COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX) @COND_PLATFORM_MACOSX_1@WXMACVERSION_CMD = \ -@COND_PLATFORM_MACOSX_1@ -compatibility_version 1.0 -current_version 1.0 +@COND_PLATFORM_MACOSX_1@ -compatibility_version 2.0 -current_version 2.0 @COND_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -161,9 +161,9 @@ COND_WINDOWS_IMPLIB_1___mmediadll___importlib = \ @COND_USE_SOVERSION_0@__mmediadll___targetsuf2 = .$(SO_SUFFIX) @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@__mmediadll___targetsuf3 \ @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ = \ -@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ .$(SO_SUFFIX).0.0.0 +@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ .$(SO_SUFFIX).0.1.0 @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__mmediadll___targetsuf3 \ -@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .0.0.0.$(SO_SUFFIX) +@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .0.1.0.$(SO_SUFFIX) @COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@__mmediadll___targetsuf3 \ @COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@ = -0.$(SO_SUFFIX) @COND_USE_SOVERSION_0@__mmediadll___targetsuf3 = .$(SO_SUFFIX) diff --git a/contrib/src/net/Makefile.in b/contrib/src/net/Makefile.in index 6c6a98b1f1..e4819f9f74 100644 --- a/contrib/src/net/Makefile.in +++ b/contrib/src/net/Makefile.in @@ -80,7 +80,7 @@ NETUTILSLIB_ODEP = $(___pch_wxprec_netutilslib_wx_wxprec_h_gch___depname) @COND_DEPS_TRACKING_0@CXXC = $(CXX) @COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX) @COND_PLATFORM_MACOSX_1@WXMACVERSION_CMD = \ -@COND_PLATFORM_MACOSX_1@ -compatibility_version 1.0 -current_version 1.0 +@COND_PLATFORM_MACOSX_1@ -compatibility_version 2.0 -current_version 2.0 @COND_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -130,9 +130,9 @@ COND_WINDOWS_IMPLIB_1___netutilsdll___importlib = \ @COND_USE_SOVERSION_0@__netutilsdll___targetsuf2 = .$(SO_SUFFIX) @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@__netutilsdll___targetsuf3 \ @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ = \ -@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ .$(SO_SUFFIX).0.0.0 +@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ .$(SO_SUFFIX).0.1.0 @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__netutilsdll___targetsuf3 \ -@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .0.0.0.$(SO_SUFFIX) +@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .0.1.0.$(SO_SUFFIX) @COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@__netutilsdll___targetsuf3 \ @COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@ = -0.$(SO_SUFFIX) @COND_USE_SOVERSION_0@__netutilsdll___targetsuf3 = .$(SO_SUFFIX) diff --git a/contrib/src/ogl/Makefile.in b/contrib/src/ogl/Makefile.in index f4963c4f0b..7c7471ab77 100644 --- a/contrib/src/ogl/Makefile.in +++ b/contrib/src/ogl/Makefile.in @@ -98,7 +98,7 @@ OGLLIB_ODEP = $(___pch_wxprec_ogllib_wx_wxprec_h_gch___depname) @COND_DEPS_TRACKING_0@CXXC = $(CXX) @COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX) @COND_PLATFORM_MACOSX_1@WXMACVERSION_CMD = \ -@COND_PLATFORM_MACOSX_1@ -compatibility_version 1.0 -current_version 1.0 +@COND_PLATFORM_MACOSX_1@ -compatibility_version 2.0 -current_version 2.0 @COND_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -148,9 +148,9 @@ COND_WINDOWS_IMPLIB_1___ogldll___importlib = \ @COND_USE_SOVERSION_0@__ogldll___targetsuf2 = .$(SO_SUFFIX) @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@__ogldll___targetsuf3 \ @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ = \ -@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ .$(SO_SUFFIX).0.0.0 +@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ .$(SO_SUFFIX).0.1.0 @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__ogldll___targetsuf3 \ -@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .0.0.0.$(SO_SUFFIX) +@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .0.1.0.$(SO_SUFFIX) @COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@__ogldll___targetsuf3 \ @COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@ = -0.$(SO_SUFFIX) @COND_USE_SOVERSION_0@__ogldll___targetsuf3 = .$(SO_SUFFIX) diff --git a/contrib/src/plot/Makefile.in b/contrib/src/plot/Makefile.in index 1ab0d3383d..ba55f914ef 100644 --- a/contrib/src/plot/Makefile.in +++ b/contrib/src/plot/Makefile.in @@ -76,7 +76,7 @@ PLOTLIB_ODEP = $(___pch_wxprec_plotlib_wx_wxprec_h_gch___depname) @COND_DEPS_TRACKING_0@CXXC = $(CXX) @COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX) @COND_PLATFORM_MACOSX_1@WXMACVERSION_CMD = \ -@COND_PLATFORM_MACOSX_1@ -compatibility_version 1.0 -current_version 1.0 +@COND_PLATFORM_MACOSX_1@ -compatibility_version 2.0 -current_version 2.0 @COND_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -126,9 +126,9 @@ COND_WINDOWS_IMPLIB_1___plotdll___importlib = \ @COND_USE_SOVERSION_0@__plotdll___targetsuf2 = .$(SO_SUFFIX) @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@__plotdll___targetsuf3 \ @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ = \ -@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ .$(SO_SUFFIX).0.0.0 +@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ .$(SO_SUFFIX).0.1.0 @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__plotdll___targetsuf3 \ -@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .0.0.0.$(SO_SUFFIX) +@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .0.1.0.$(SO_SUFFIX) @COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@__plotdll___targetsuf3 \ @COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@ = -0.$(SO_SUFFIX) @COND_USE_SOVERSION_0@__plotdll___targetsuf3 = .$(SO_SUFFIX) diff --git a/contrib/src/stc/Makefile.in b/contrib/src/stc/Makefile.in index 2daee2cd00..02437e2f96 100644 --- a/contrib/src/stc/Makefile.in +++ b/contrib/src/stc/Makefile.in @@ -242,7 +242,7 @@ STCLIB_OBJECTS = \ @COND_DEPS_TRACKING_0@CXXC = $(CXX) @COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX) @COND_PLATFORM_MACOSX_1@WXMACVERSION_CMD = \ -@COND_PLATFORM_MACOSX_1@ -compatibility_version 1.0 -current_version 1.0 +@COND_PLATFORM_MACOSX_1@ -compatibility_version 2.0 -current_version 2.0 @COND_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -287,9 +287,9 @@ COND_WINDOWS_IMPLIB_1___stcdll___importlib = \ @COND_USE_SOVERSION_0@__stcdll___targetsuf2 = .$(SO_SUFFIX) @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@__stcdll___targetsuf3 \ @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ = \ -@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ .$(SO_SUFFIX).0.0.0 +@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ .$(SO_SUFFIX).0.1.0 @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__stcdll___targetsuf3 \ -@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .0.0.0.$(SO_SUFFIX) +@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .0.1.0.$(SO_SUFFIX) @COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@__stcdll___targetsuf3 \ @COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@ = -0.$(SO_SUFFIX) @COND_USE_SOVERSION_0@__stcdll___targetsuf3 = .$(SO_SUFFIX) diff --git a/contrib/src/svg/Makefile.in b/contrib/src/svg/Makefile.in index 4687a3bd8f..51e90d444a 100644 --- a/contrib/src/svg/Makefile.in +++ b/contrib/src/svg/Makefile.in @@ -76,7 +76,7 @@ SVGLIB_ODEP = $(___pch_wxprec_svglib_wx_wxprec_h_gch___depname) @COND_DEPS_TRACKING_0@CXXC = $(CXX) @COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX) @COND_PLATFORM_MACOSX_1@WXMACVERSION_CMD = \ -@COND_PLATFORM_MACOSX_1@ -compatibility_version 1.0 -current_version 1.0 +@COND_PLATFORM_MACOSX_1@ -compatibility_version 2.0 -current_version 2.0 @COND_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -126,9 +126,9 @@ COND_WINDOWS_IMPLIB_1___svgdll___importlib = \ @COND_USE_SOVERSION_0@__svgdll___targetsuf2 = .$(SO_SUFFIX) @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@__svgdll___targetsuf3 \ @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ = \ -@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ .$(SO_SUFFIX).0.0.0 +@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ .$(SO_SUFFIX).0.1.0 @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__svgdll___targetsuf3 \ -@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .0.0.0.$(SO_SUFFIX) +@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .0.1.0.$(SO_SUFFIX) @COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@__svgdll___targetsuf3 \ @COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@ = -0.$(SO_SUFFIX) @COND_USE_SOVERSION_0@__svgdll___targetsuf3 = .$(SO_SUFFIX) diff --git a/demos/bombs/Makefile.in b/demos/bombs/Makefile.in index 41f92b325c..d223142f01 100644 --- a/demos/bombs/Makefile.in +++ b/demos/bombs/Makefile.in @@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 2.8 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib BOMBS_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/demos/dbbrowse/Makefile.in b/demos/dbbrowse/Makefile.in index 2668ab5da6..7e8dbb1f8a 100644 --- a/demos/dbbrowse/Makefile.in +++ b/demos/dbbrowse/Makefile.in @@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 2.8 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib DBBROWSE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/demos/forty/Makefile.in b/demos/forty/Makefile.in index 7d769f8e97..718f82bd93 100644 --- a/demos/forty/Makefile.in +++ b/demos/forty/Makefile.in @@ -43,7 +43,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 2.8 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib FORTY_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/demos/fractal/Makefile.in b/demos/fractal/Makefile.in index 9a65149872..83764c3900 100644 --- a/demos/fractal/Makefile.in +++ b/demos/fractal/Makefile.in @@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 2.8 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib FRACTAL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/demos/life/Makefile.in b/demos/life/Makefile.in index 2217658402..3fc7639189 100644 --- a/demos/life/Makefile.in +++ b/demos/life/Makefile.in @@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 2.8 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib LIFE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/demos/poem/Makefile.in b/demos/poem/Makefile.in index ae165fb77d..adac75c87e 100644 --- a/demos/poem/Makefile.in +++ b/demos/poem/Makefile.in @@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 2.8 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib WXPOEM_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/docs/latex/wx/tex2rtf_css.ini b/docs/latex/wx/tex2rtf_css.ini index 1c6facde8a..30e8ea7a7a 100644 --- a/docs/latex/wx/tex2rtf_css.ini +++ b/docs/latex/wx/tex2rtf_css.ini @@ -28,7 +28,7 @@ htmlWorkshopFiles = true htmlIndex = true ; Finally, a way to specify face names -;htmlFaceName = "Arial, Lucida, Helvetica" +htmlFaceName = "Arial, Lucida, Helvetica" \textasciitilde [0]{{\tt\~}} \textasciicircum [0]{{\tt\^}} @@ -47,9 +47,9 @@ htmlStylesheet = "wx.css" \windowstyle [1] {{\bf #1}\index{#1}} \bftt [1] {\bf{\tt{#1}}} \pythonnote [1] {{\bf \fcol{blue}{wxPython note:}} #1} -%\pythonnote [1] {} -\perlnote [1] {{\bf \fcol{blue}{wxPerl note:}} #1} -%\perlnote [1] {} +;;\pythonnote [1] {} +;;\perlnote [1] {{\bf \fcol{blue}{wxPerl note:}} #1} +\perlnote [1] {} \arg [1] {{\it #1}} \true [0] {{\tt true}} \false [0] {{\tt false}} diff --git a/samples/access/Makefile.in b/samples/access/Makefile.in index 3caf488612..f3256c758f 100644 --- a/samples/access/Makefile.in +++ b/samples/access/Makefile.in @@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 2.8 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib ACCESSTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/animate/Makefile.in b/samples/animate/Makefile.in index 167b1d51bd..c361fded3b 100644 --- a/samples/animate/Makefile.in +++ b/samples/animate/Makefile.in @@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 2.8 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib ANITEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/artprov/Makefile.in b/samples/artprov/Makefile.in index 24ac4d44ae..a10f13b0b8 100644 --- a/samples/artprov/Makefile.in +++ b/samples/artprov/Makefile.in @@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 2.8 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib ARTTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/aui/Makefile.in b/samples/aui/Makefile.in index 31dbb9e7f8..c232700422 100644 --- a/samples/aui/Makefile.in +++ b/samples/aui/Makefile.in @@ -43,7 +43,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 2.8 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib AUIDEMO_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/calendar/Makefile.in b/samples/calendar/Makefile.in index a0394261c4..679b0ece75 100644 --- a/samples/calendar/Makefile.in +++ b/samples/calendar/Makefile.in @@ -43,7 +43,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 2.8 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib CALENDAR_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/caret/Makefile.in b/samples/caret/Makefile.in index 429adb5e58..91abe17b45 100644 --- a/samples/caret/Makefile.in +++ b/samples/caret/Makefile.in @@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 2.8 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib CARET_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/checklst/Makefile.in b/samples/checklst/Makefile.in index a7f27619fc..07fa93a736 100644 --- a/samples/checklst/Makefile.in +++ b/samples/checklst/Makefile.in @@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 2.8 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib CHECKLST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/collpane/Makefile.in b/samples/collpane/Makefile.in index c555262339..3eab73ba47 100644 --- a/samples/collpane/Makefile.in +++ b/samples/collpane/Makefile.in @@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 2.8 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib COLLPANE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/combo/Makefile.in b/samples/combo/Makefile.in index 93dff4cedd..1895514125 100644 --- a/samples/combo/Makefile.in +++ b/samples/combo/Makefile.in @@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 2.8 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib COMBO_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/config/Makefile.in b/samples/config/Makefile.in index 1e350afb9f..ae033549e6 100644 --- a/samples/config/Makefile.in +++ b/samples/config/Makefile.in @@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 2.8 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib CONFTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/controls/Makefile.in b/samples/controls/Makefile.in index f2d86673b6..59ff0931ba 100644 --- a/samples/controls/Makefile.in +++ b/samples/controls/Makefile.in @@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 2.8 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib CONTROLS_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/dataview/Makefile.in b/samples/dataview/Makefile.in index d1d6027399..568db4d290 100644 --- a/samples/dataview/Makefile.in +++ b/samples/dataview/Makefile.in @@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 2.8 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib DATAVIEW_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/db/Makefile.in b/samples/db/Makefile.in index f0f193cec7..4af815a7bd 100644 --- a/samples/db/Makefile.in +++ b/samples/db/Makefile.in @@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 2.8 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib DBTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/debugrpt/Makefile.in b/samples/debugrpt/Makefile.in index 310a6640ed..9115327afb 100644 --- a/samples/debugrpt/Makefile.in +++ b/samples/debugrpt/Makefile.in @@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 2.8 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib DEBUGRPT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/dialogs/Makefile.in b/samples/dialogs/Makefile.in index 77257a6104..4ac847f618 100644 --- a/samples/dialogs/Makefile.in +++ b/samples/dialogs/Makefile.in @@ -43,7 +43,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 2.8 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib DIALOGS_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/dialup/Makefile.in b/samples/dialup/Makefile.in index 1c34151b17..0aa39c812a 100644 --- a/samples/dialup/Makefile.in +++ b/samples/dialup/Makefile.in @@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 2.8 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib NETTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/display/Makefile.in b/samples/display/Makefile.in index 7556ee8da6..a932f585ee 100644 --- a/samples/display/Makefile.in +++ b/samples/display/Makefile.in @@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 2.8 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib DISPLAY_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/dnd/Makefile.in b/samples/dnd/Makefile.in index f50f6b52c1..4b21b7c0f5 100644 --- a/samples/dnd/Makefile.in +++ b/samples/dnd/Makefile.in @@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 2.8 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib DND_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/docview/Makefile.in b/samples/docview/Makefile.in index 618c028192..9003f65f77 100644 --- a/samples/docview/Makefile.in +++ b/samples/docview/Makefile.in @@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 2.8 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib DOCVIEW_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/docvwmdi/Makefile.in b/samples/docvwmdi/Makefile.in index 205f152806..86a761bd76 100644 --- a/samples/docvwmdi/Makefile.in +++ b/samples/docvwmdi/Makefile.in @@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 2.8 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib DOCVWMDI_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/dragimag/Makefile.in b/samples/dragimag/Makefile.in index b6325bb8e5..706cfaedd7 100644 --- a/samples/dragimag/Makefile.in +++ b/samples/dragimag/Makefile.in @@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 2.8 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib DRAGIMAG_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/drawing/Makefile.in b/samples/drawing/Makefile.in index ab9ff4c49c..2407100dd5 100644 --- a/samples/drawing/Makefile.in +++ b/samples/drawing/Makefile.in @@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 2.8 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib DRAWING_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/dynamic/Makefile.in b/samples/dynamic/Makefile.in index 7e641418fe..eb0f18ffe7 100644 --- a/samples/dynamic/Makefile.in +++ b/samples/dynamic/Makefile.in @@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 2.8 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib DYNAMIC_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/erase/Makefile.in b/samples/erase/Makefile.in index 35470b70e5..e03036ab19 100644 --- a/samples/erase/Makefile.in +++ b/samples/erase/Makefile.in @@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 2.8 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib ERASE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/event/Makefile.in b/samples/event/Makefile.in index 797aed2e3f..2aeb93d74e 100644 --- a/samples/event/Makefile.in +++ b/samples/event/Makefile.in @@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 2.8 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib EVENT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/except/Makefile.in b/samples/except/Makefile.in index 22406be019..3fefcf8bd4 100644 --- a/samples/except/Makefile.in +++ b/samples/except/Makefile.in @@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 2.8 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib EXCEPT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/exec/Makefile.in b/samples/exec/Makefile.in index cb74d1262f..d8ef3e3422 100644 --- a/samples/exec/Makefile.in +++ b/samples/exec/Makefile.in @@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 2.8 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib EXEC_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/font/Makefile.in b/samples/font/Makefile.in index b8c568afd3..b179b010f1 100644 --- a/samples/font/Makefile.in +++ b/samples/font/Makefile.in @@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 2.8 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib FONT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/grid/Makefile.in b/samples/grid/Makefile.in index 33b8b01435..2d664d3d99 100644 --- a/samples/grid/Makefile.in +++ b/samples/grid/Makefile.in @@ -43,7 +43,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 2.8 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib GRID_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/help/Makefile.in b/samples/help/Makefile.in index 7b82add45d..ed622a37d1 100644 --- a/samples/help/Makefile.in +++ b/samples/help/Makefile.in @@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 2.8 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib HELP_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/htlbox/Makefile.in b/samples/htlbox/Makefile.in index 8057f33865..abbb32bc92 100644 --- a/samples/htlbox/Makefile.in +++ b/samples/htlbox/Makefile.in @@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 2.8 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib HTLBOX_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/html/about/Makefile.in b/samples/html/about/Makefile.in index fa0a298cdc..f5df160066 100644 --- a/samples/html/about/Makefile.in +++ b/samples/html/about/Makefile.in @@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 2.8 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib ABOUT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/html/help/Makefile.in b/samples/html/help/Makefile.in index b406dc9adf..f0bd8ecda9 100644 --- a/samples/html/help/Makefile.in +++ b/samples/html/help/Makefile.in @@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 2.8 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib HTMLHELP_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/html/helpview/Makefile.in b/samples/html/helpview/Makefile.in index f9e9500a68..45751df4ea 100644 --- a/samples/html/helpview/Makefile.in +++ b/samples/html/helpview/Makefile.in @@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 2.8 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib HELPVIEW_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/html/htmlctrl/Makefile.in b/samples/html/htmlctrl/Makefile.in index 2d85878aef..3ea1a743a4 100644 --- a/samples/html/htmlctrl/Makefile.in +++ b/samples/html/htmlctrl/Makefile.in @@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 2.8 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib HTMLCTRL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/html/printing/Makefile.in b/samples/html/printing/Makefile.in index 098f1b4b7f..2c9340e217 100644 --- a/samples/html/printing/Makefile.in +++ b/samples/html/printing/Makefile.in @@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 2.8 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib HTMLPRINTING_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/html/test/Makefile.in b/samples/html/test/Makefile.in index b238546407..6df132abd6 100644 --- a/samples/html/test/Makefile.in +++ b/samples/html/test/Makefile.in @@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 2.8 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib TEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/html/virtual/Makefile.in b/samples/html/virtual/Makefile.in index 243968cff0..efeb977d17 100644 --- a/samples/html/virtual/Makefile.in +++ b/samples/html/virtual/Makefile.in @@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 2.8 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib VIRTUAL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/html/widget/Makefile.in b/samples/html/widget/Makefile.in index 4a37bbd2a8..40838edcd9 100644 --- a/samples/html/widget/Makefile.in +++ b/samples/html/widget/Makefile.in @@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 2.8 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib WIDGET_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/html/zip/Makefile.in b/samples/html/zip/Makefile.in index 650dd82a2e..3761210036 100644 --- a/samples/html/zip/Makefile.in +++ b/samples/html/zip/Makefile.in @@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 2.8 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib ZIP_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/image/Makefile.in b/samples/image/Makefile.in index 9ecc38cd5e..6e8299d9c6 100644 --- a/samples/image/Makefile.in +++ b/samples/image/Makefile.in @@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 2.8 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib IMAGE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/internat/Makefile.in b/samples/internat/Makefile.in index feedee88fc..d1779e5541 100644 --- a/samples/internat/Makefile.in +++ b/samples/internat/Makefile.in @@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 2.8 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib INTERNAT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/ipc/Makefile.in b/samples/ipc/Makefile.in index 9b870af676..51b2fe5fc6 100644 --- a/samples/ipc/Makefile.in +++ b/samples/ipc/Makefile.in @@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 2.8 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib IPCCLIENT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/joytest/Makefile.in b/samples/joytest/Makefile.in index 669c3d665b..d4ca4c75ea 100644 --- a/samples/joytest/Makefile.in +++ b/samples/joytest/Makefile.in @@ -43,7 +43,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 2.8 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib JOYTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/keyboard/Makefile.in b/samples/keyboard/Makefile.in index e5cffc7547..e01f1082a4 100644 --- a/samples/keyboard/Makefile.in +++ b/samples/keyboard/Makefile.in @@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 2.8 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib KEYBOARD_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/layout/Makefile.in b/samples/layout/Makefile.in index b00400bd82..0e181e4096 100644 --- a/samples/layout/Makefile.in +++ b/samples/layout/Makefile.in @@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 2.8 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib LAYOUT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/listbox/Makefile.in b/samples/listbox/Makefile.in index ee4a50cddd..5e6752311a 100644 --- a/samples/listbox/Makefile.in +++ b/samples/listbox/Makefile.in @@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 2.8 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib LISTBOX_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/listctrl/Makefile.in b/samples/listctrl/Makefile.in index 522d8d96e5..fb58cc2e76 100644 --- a/samples/listctrl/Makefile.in +++ b/samples/listctrl/Makefile.in @@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 2.8 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib LISTCTRL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/mdi/Makefile.in b/samples/mdi/Makefile.in index b1cbec6bc3..a54653d24f 100644 --- a/samples/mdi/Makefile.in +++ b/samples/mdi/Makefile.in @@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 2.8 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib MDI_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/mediaplayer/Makefile.in b/samples/mediaplayer/Makefile.in index 7aa7144434..08df1c8dba 100644 --- a/samples/mediaplayer/Makefile.in +++ b/samples/mediaplayer/Makefile.in @@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 2.8 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib MEDIAPLAYER_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/memcheck/Makefile.in b/samples/memcheck/Makefile.in index 0fe8800849..d393ac0adb 100644 --- a/samples/memcheck/Makefile.in +++ b/samples/memcheck/Makefile.in @@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 2.8 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib MEMCHECK_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/menu/Makefile.in b/samples/menu/Makefile.in index 1c9166f8c0..6c5a491792 100644 --- a/samples/menu/Makefile.in +++ b/samples/menu/Makefile.in @@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 2.8 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib MENU_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/mfc/Makefile.in b/samples/mfc/Makefile.in index 06a9a5f52b..924316e0ae 100644 --- a/samples/mfc/Makefile.in +++ b/samples/mfc/Makefile.in @@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 2.8 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib MFCTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/minifram/Makefile.in b/samples/minifram/Makefile.in index 0337125fdc..e4f8f342d5 100644 --- a/samples/minifram/Makefile.in +++ b/samples/minifram/Makefile.in @@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 2.8 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib MINIFRAM_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/minimal/Makefile.in b/samples/minimal/Makefile.in index 21a83a2e44..59c5ed5978 100644 --- a/samples/minimal/Makefile.in +++ b/samples/minimal/Makefile.in @@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 2.8 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib MINIMAL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/mobile/styles/Makefile.in b/samples/mobile/styles/Makefile.in index 779b80646a..ac2821456b 100644 --- a/samples/mobile/styles/Makefile.in +++ b/samples/mobile/styles/Makefile.in @@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 2.8 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib STYLES_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/mobile/wxedit/Makefile.in b/samples/mobile/wxedit/Makefile.in index b128bdc5f5..2029511528 100644 --- a/samples/mobile/wxedit/Makefile.in +++ b/samples/mobile/wxedit/Makefile.in @@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 2.8 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib WXEDIT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/multimon/Makefile.in b/samples/multimon/Makefile.in index 22c9e51da5..095f36cf1e 100644 --- a/samples/multimon/Makefile.in +++ b/samples/multimon/Makefile.in @@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 2.8 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib MULTIMON_TEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/nativdlg/Makefile.in b/samples/nativdlg/Makefile.in index c8bcf12661..c9a4883dd8 100644 --- a/samples/nativdlg/Makefile.in +++ b/samples/nativdlg/Makefile.in @@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 2.8 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib NATIVDLG_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/notebook/Makefile.in b/samples/notebook/Makefile.in index 172dfce7f7..bb46bd0057 100644 --- a/samples/notebook/Makefile.in +++ b/samples/notebook/Makefile.in @@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 2.8 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib NOTEBOOK_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/oleauto/Makefile.in b/samples/oleauto/Makefile.in index bee7130f93..f34821a1e3 100644 --- a/samples/oleauto/Makefile.in +++ b/samples/oleauto/Makefile.in @@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 2.8 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib OLEAUTO_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/opengl/cube/Makefile.in b/samples/opengl/cube/Makefile.in index c97c566f12..2c81a6f098 100644 --- a/samples/opengl/cube/Makefile.in +++ b/samples/opengl/cube/Makefile.in @@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 2.8 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib CUBE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/opengl/isosurf/Makefile.in b/samples/opengl/isosurf/Makefile.in index 5ca01f8f13..2b6e29c536 100644 --- a/samples/opengl/isosurf/Makefile.in +++ b/samples/opengl/isosurf/Makefile.in @@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 2.8 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib ISOSURF_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/opengl/penguin/Makefile.in b/samples/opengl/penguin/Makefile.in index 944ded51d5..c1937a6249 100644 --- a/samples/opengl/penguin/Makefile.in +++ b/samples/opengl/penguin/Makefile.in @@ -43,7 +43,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 2.8 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib PENGUIN_CFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/ownerdrw/Makefile.in b/samples/ownerdrw/Makefile.in index dbb4c818c9..c23571b789 100644 --- a/samples/ownerdrw/Makefile.in +++ b/samples/ownerdrw/Makefile.in @@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 2.8 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib OWNERDRW_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/png/Makefile.in b/samples/png/Makefile.in index fe62b1bd83..4d398654be 100644 --- a/samples/png/Makefile.in +++ b/samples/png/Makefile.in @@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 2.8 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib PNG_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/popup/Makefile.in b/samples/popup/Makefile.in index 28e871ddf3..a5a247fb34 100644 --- a/samples/popup/Makefile.in +++ b/samples/popup/Makefile.in @@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 2.8 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib POPUP_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/power/Makefile.in b/samples/power/Makefile.in index 9f3cdc06dc..cbbe48a692 100644 --- a/samples/power/Makefile.in +++ b/samples/power/Makefile.in @@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 2.8 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib POWER_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/printing/Makefile.in b/samples/printing/Makefile.in index a9dc7ff757..0b792826dc 100644 --- a/samples/printing/Makefile.in +++ b/samples/printing/Makefile.in @@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 2.8 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib PRINTING_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/propsize/Makefile.in b/samples/propsize/Makefile.in index c14d1eb562..83e2a37d4f 100644 --- a/samples/propsize/Makefile.in +++ b/samples/propsize/Makefile.in @@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 2.8 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib PROPSIZE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/regtest/Makefile.in b/samples/regtest/Makefile.in index 05e4059b94..a56e0c9595 100644 --- a/samples/regtest/Makefile.in +++ b/samples/regtest/Makefile.in @@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 2.8 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib REGTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/render/Makefile.in b/samples/render/Makefile.in index 1ef167d2d5..fe11303037 100644 --- a/samples/render/Makefile.in +++ b/samples/render/Makefile.in @@ -49,7 +49,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 2.8 WX_RELEASE_NODOT = 28 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib PLUGINS_INST_DIR = $(libdir)/wx/$(PLUGIN_VERSION0) RENDER_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ diff --git a/samples/richtext/Makefile.in b/samples/richtext/Makefile.in index e1fe17d6b7..7335b126e4 100644 --- a/samples/richtext/Makefile.in +++ b/samples/richtext/Makefile.in @@ -43,7 +43,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 2.8 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib RICHTEXT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/rotate/Makefile.in b/samples/rotate/Makefile.in index a73e730002..1426d89618 100644 --- a/samples/rotate/Makefile.in +++ b/samples/rotate/Makefile.in @@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 2.8 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib ROTATE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/sashtest/Makefile.in b/samples/sashtest/Makefile.in index 1a04fd57aa..b2052289a5 100644 --- a/samples/sashtest/Makefile.in +++ b/samples/sashtest/Makefile.in @@ -43,7 +43,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 2.8 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib SASHTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/scroll/Makefile.in b/samples/scroll/Makefile.in index ff27a50275..6b95454f55 100644 --- a/samples/scroll/Makefile.in +++ b/samples/scroll/Makefile.in @@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 2.8 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib SCROLL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/scrollsub/Makefile.in b/samples/scrollsub/Makefile.in index 1ce3f669a7..6da40198e0 100644 --- a/samples/scrollsub/Makefile.in +++ b/samples/scrollsub/Makefile.in @@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 2.8 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib SCROLLSUB_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/shaped/Makefile.in b/samples/shaped/Makefile.in index 4df0a242f5..5c798795db 100644 --- a/samples/shaped/Makefile.in +++ b/samples/shaped/Makefile.in @@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 2.8 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib SHAPED_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/sockets/Makefile.in b/samples/sockets/Makefile.in index d7cabb4e82..4d89b55ac6 100644 --- a/samples/sockets/Makefile.in +++ b/samples/sockets/Makefile.in @@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 2.8 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib CLIENT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/sound/Makefile.in b/samples/sound/Makefile.in index ea561df1cd..a898a0be86 100644 --- a/samples/sound/Makefile.in +++ b/samples/sound/Makefile.in @@ -43,7 +43,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 2.8 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib SOUND_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/splash/Makefile.in b/samples/splash/Makefile.in index 734e522f46..c3c877e2ed 100644 --- a/samples/splash/Makefile.in +++ b/samples/splash/Makefile.in @@ -43,7 +43,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 2.8 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib SPLASH_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/splitter/Makefile.in b/samples/splitter/Makefile.in index b94c0cb746..c19be8d752 100644 --- a/samples/splitter/Makefile.in +++ b/samples/splitter/Makefile.in @@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 2.8 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib SPLITTER_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/statbar/Makefile.in b/samples/statbar/Makefile.in index c2941bc487..c3364c7634 100644 --- a/samples/statbar/Makefile.in +++ b/samples/statbar/Makefile.in @@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 2.8 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib STATBAR_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/taskbar/Makefile.in b/samples/taskbar/Makefile.in index 6abd4704b9..e34508ba63 100644 --- a/samples/taskbar/Makefile.in +++ b/samples/taskbar/Makefile.in @@ -43,7 +43,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 2.8 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib TASKBAR_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/text/Makefile.in b/samples/text/Makefile.in index 51b2f18172..74248f6f41 100644 --- a/samples/text/Makefile.in +++ b/samples/text/Makefile.in @@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 2.8 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib TEXT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/thread/Makefile.in b/samples/thread/Makefile.in index 9ac17186e8..03fcd025a2 100644 --- a/samples/thread/Makefile.in +++ b/samples/thread/Makefile.in @@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 2.8 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib THREAD_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/toolbar/Makefile.in b/samples/toolbar/Makefile.in index 09a6933e16..821d5f8314 100644 --- a/samples/toolbar/Makefile.in +++ b/samples/toolbar/Makefile.in @@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 2.8 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib TOOLBAR_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/treectrl/Makefile.in b/samples/treectrl/Makefile.in index 9538d7f262..653db04e9e 100644 --- a/samples/treectrl/Makefile.in +++ b/samples/treectrl/Makefile.in @@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 2.8 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib TREECTRL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/typetest/Makefile.in b/samples/typetest/Makefile.in index acc073fcaf..b76b856833 100644 --- a/samples/typetest/Makefile.in +++ b/samples/typetest/Makefile.in @@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 2.8 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib TYPETEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/validate/Makefile.in b/samples/validate/Makefile.in index 57782a1dea..fdd660f3c2 100644 --- a/samples/validate/Makefile.in +++ b/samples/validate/Makefile.in @@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 2.8 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib VALIDATE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/vscroll/Makefile.in b/samples/vscroll/Makefile.in index 8bcb573381..2f7e4acb90 100644 --- a/samples/vscroll/Makefile.in +++ b/samples/vscroll/Makefile.in @@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 2.8 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib VSTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/widgets/Makefile.in b/samples/widgets/Makefile.in index f028147a17..c564b8f2f5 100644 --- a/samples/widgets/Makefile.in +++ b/samples/widgets/Makefile.in @@ -43,7 +43,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 2.8 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib WIDGETS_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/wizard/Makefile.in b/samples/wizard/Makefile.in index 4207c47cb9..1d4c90b9f1 100644 --- a/samples/wizard/Makefile.in +++ b/samples/wizard/Makefile.in @@ -43,7 +43,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 2.8 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib WIZARD_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/xrc/Makefile.in b/samples/xrc/Makefile.in index 2299ec5977..bbb36d96f9 100644 --- a/samples/xrc/Makefile.in +++ b/samples/xrc/Makefile.in @@ -43,7 +43,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 2.8 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib XRCDEMO_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/tests/Makefile.in b/tests/Makefile.in index 2b896d2dd9..cda415e689 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 2.8 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib TEST_CXXFLAGS = $(__test_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/utils/helpview/src/Makefile.in b/utils/helpview/src/Makefile.in index 4f66c6cb62..17e2f3cfdf 100644 --- a/utils/helpview/src/Makefile.in +++ b/utils/helpview/src/Makefile.in @@ -45,7 +45,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 2.8 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(wx_top_builddir)/lib HELPVIEW_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \