$(OBJS)\monodll_xh_datectrl.obj &
$(OBJS)\monodll_xh_dlg.obj &
$(OBJS)\monodll_xh_frame.obj &
+ $(OBJS)\monodll_xh_mdi.obj &
$(OBJS)\monodll_xh_gauge.obj &
$(OBJS)\monodll_xh_gdctl.obj &
$(OBJS)\monodll_xh_html.obj &
$(OBJS)\monolib_xh_datectrl.obj &
$(OBJS)\monolib_xh_dlg.obj &
$(OBJS)\monolib_xh_frame.obj &
+ $(OBJS)\monolib_xh_mdi.obj &
$(OBJS)\monolib_xh_gauge.obj &
$(OBJS)\monolib_xh_gdctl.obj &
$(OBJS)\monolib_xh_html.obj &
CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" &
RUNTIME_LIBS="$(RUNTIME_LIBS)"
WX_RELEASE_NODOT = 25
-WX_VERSION_NODOT = $(WX_RELEASE_NODOT)4
+WX_VERSION_NODOT = $(WX_RELEASE_NODOT)5
OBJS = &
wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
LIBDIRNAME = ..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG)
$(OBJS)\xrcdll_xh_datectrl.obj &
$(OBJS)\xrcdll_xh_dlg.obj &
$(OBJS)\xrcdll_xh_frame.obj &
+ $(OBJS)\xrcdll_xh_mdi.obj &
$(OBJS)\xrcdll_xh_gauge.obj &
$(OBJS)\xrcdll_xh_gdctl.obj &
$(OBJS)\xrcdll_xh_html.obj &
$(OBJS)\xrclib_xh_datectrl.obj &
$(OBJS)\xrclib_xh_dlg.obj &
$(OBJS)\xrclib_xh_frame.obj &
+ $(OBJS)\xrclib_xh_mdi.obj &
$(OBJS)\xrclib_xh_gauge.obj &
$(OBJS)\xrclib_xh_gdctl.obj &
$(OBJS)\xrclib_xh_html.obj &
!ifeq SHARED 1
!ifeq USE_GUI 1
!ifeq USE_QA 1
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_wat$(VENDORTAG).dll : $(QADLL_OBJECTS) $(OBJS)\qadll_version.res $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__basedll___depname) $(__xmldll___depname)
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_wat$(VENDORTAG).dll : $(QADLL_OBJECTS) $(OBJS)\qadll_version.res $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__coredll___depname) $(__basedll___depname) $(__xmldll___depname)
@%create $(OBJS)\qadll.lbc
@%append $(OBJS)\qadll.lbc option quiet
@%append $(OBJS)\qadll.lbc name $^@
@%append $(OBJS)\qadll.lbc option caseexact
@%append $(OBJS)\qadll.lbc $(LDFLAGS) $(__DEBUGINFO_3) libpath $(LIBDIRNAME)
@for %i in ($(QADLL_OBJECTS)) do @%append $(OBJS)\qadll.lbc file %i
- @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib) do @%append $(OBJS)\qadll.lbc library %i
+ @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib) do @%append $(OBJS)\qadll.lbc library %i
@%append $(OBJS)\qadll.lbc option resource=$(OBJS)\qadll_version.res
@%append $(OBJS)\qadll.lbc system nt_dll
wlink @$(OBJS)\qadll.lbc
build_cfg_file : .SYMBOLIC $(SETUPHDIR)
@echo WXVER_MAJOR=2 >$(BUILD_CFG_FILE)
@echo WXVER_MINOR=5 >>$(BUILD_CFG_FILE)
- @echo WXVER_RELEASE=4 >>$(BUILD_CFG_FILE)
+ @echo WXVER_RELEASE=5 >>$(BUILD_CFG_FILE)
@echo BUILD=$(BUILD) >>$(BUILD_CFG_FILE)
@echo MONOLITHIC=$(MONOLITHIC) >>$(BUILD_CFG_FILE)
@echo SHARED=$(SHARED) >>$(BUILD_CFG_FILE)
$(OBJS)\monodll_xh_frame.obj : .AUTODEPEND ..\..\src\xrc\xh_frame.cpp
$(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+$(OBJS)\monodll_xh_mdi.obj : .AUTODEPEND ..\..\src\xrc\xh_mdi.cpp
+ $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+
$(OBJS)\monodll_xh_gauge.obj : .AUTODEPEND ..\..\src\xrc\xh_gauge.cpp
$(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
$(OBJS)\monolib_xh_frame.obj : .AUTODEPEND ..\..\src\xrc\xh_frame.cpp
$(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+$(OBJS)\monolib_xh_mdi.obj : .AUTODEPEND ..\..\src\xrc\xh_mdi.cpp
+ $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+
$(OBJS)\monolib_xh_gauge.obj : .AUTODEPEND ..\..\src\xrc\xh_gauge.cpp
$(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
$(OBJS)\xrcdll_xh_frame.obj : .AUTODEPEND ..\..\src\xrc\xh_frame.cpp
$(CXX) -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
+$(OBJS)\xrcdll_xh_mdi.obj : .AUTODEPEND ..\..\src\xrc\xh_mdi.cpp
+ $(CXX) -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
+
$(OBJS)\xrcdll_xh_gauge.obj : .AUTODEPEND ..\..\src\xrc\xh_gauge.cpp
$(CXX) -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
$(OBJS)\xrclib_xh_frame.obj : .AUTODEPEND ..\..\src\xrc\xh_frame.cpp
$(CXX) -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
+$(OBJS)\xrclib_xh_mdi.obj : .AUTODEPEND ..\..\src\xrc\xh_mdi.cpp
+ $(CXX) -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
+
$(OBJS)\xrclib_xh_gauge.obj : .AUTODEPEND ..\..\src\xrc\xh_gauge.cpp
$(CXX) -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<