X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/250700e4ac15d849686ba5c2e7d6cb8289d789cb..35e293be59afa82d90ed9a00eb7796327dc5ee92:/contrib/build/xrc/makefile.wat

diff --git a/contrib/build/xrc/makefile.wat b/contrib/build/xrc/makefile.wat
index 0a980420e7..1ead6deb4c 100644
--- a/contrib/build/xrc/makefile.wat
+++ b/contrib/build/xrc/makefile.wat
@@ -1,10 +1,10 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net)
+#     Bakefile 0.1.4 (http://bakefile.sourceforge.net)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
-!include ../../../build/config.wat
+!include ../../../build/msw/config.wat
 
 # -------------------------------------------------------------------------
 # Do not modify the rest of this file!
@@ -43,11 +43,12 @@ VENDORTAG =
 !endif
 WXDEBUGFLAG =
 !ifeq BUILD debug
+!ifeq DEBUG_FLAG default
 WXDEBUGFLAG = d
 !endif
-WXDLLFLAG =
-!ifeq SHARED 1
-WXDLLFLAG = dll
+!endif
+!ifeq DEBUG_FLAG 1
+WXDEBUGFLAG = d
 !endif
 WXUNICODEFLAG =
 !ifeq UNICODE 1
@@ -57,23 +58,93 @@ WXUNIVNAME =
 !ifeq WXUNIV 1
 WXUNIVNAME = univ
 !endif
-__DEBUGFLAG =
+WXDLLFLAG =
+!ifeq SHARED 1
+WXDLLFLAG = dll
+!endif
+__xrcdll___depname =
+!ifeq SHARED 1
+__xrcdll___depname = &
+	$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc_wat$(VENDORTAG).dll
+!endif
+__DEBUGINFO_2 =
 !ifeq BUILD debug
-__DEBUGFLAG = -d2
+!ifeq DEBUG_INFO default
+__DEBUGINFO_2 = debug all
+!endif
 !endif
 !ifeq BUILD release
-__DEBUGFLAG = -d0
+!ifeq DEBUG_INFO default
+__DEBUGINFO_2 = 
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_2 = 
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_2 = debug all
+!endif
+__WXLIB_MONO_p =
+!ifeq MONOLITHIC 1
+__WXLIB_MONO_p = &
+	wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
+!endif
+__LIB_TIFF_p =
+!ifeq USE_GUI 1
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+__LIB_JPEG_p =
+!ifeq USE_GUI 1
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+__LIB_PNG_p =
+!ifeq USE_GUI 1
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+__WXLIB_HTML_p =
+!ifeq MONOLITHIC 0
+__WXLIB_HTML_p = &
+	wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib
+!endif
+__WXLIB_ADV_p =
+!ifeq MONOLITHIC 0
+__WXLIB_ADV_p = &
+	wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib
 !endif
-__DEBUGFLAG_1 =
+__WXLIB_CORE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_CORE_p = &
+	wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib
+!endif
+__WXLIB_XML_p =
+!ifeq MONOLITHIC 0
+__WXLIB_XML_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml.lib
+!endif
+__WXLIB_BASE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
+!endif
+__xrclib___depname =
+!ifeq SHARED 0
+__xrclib___depname = &
+	$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.lib
+!endif
+__DEBUGINFO_1 =
 !ifeq BUILD debug
-__DEBUGFLAG_1 = debug all
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = -d2
+!endif
 !endif
 !ifeq BUILD release
-__DEBUGFLAG_1 = 
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = -d0
 !endif
-__DEBUG_DEFINE_p =
-!ifeq BUILD debug
-__DEBUG_DEFINE_p = -d__WXDEBUG__
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_1 = -d0
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_1 = -d2
 !endif
 __OPTIMIZEFLAG =
 !ifeq BUILD debug
@@ -89,47 +160,135 @@ __RUNTIME_LIBS = -br
 !ifeq RUNTIME_LIBS static
 __RUNTIME_LIBS = 
 !endif
-__UNICODE_DEFINE_p =
-!ifeq UNICODE 1
-__UNICODE_DEFINE_p = -dwxUSE_UNICODE=1
+__EXCEPTIONSFLAG =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONSFLAG = 
 !endif
-__WXLIB_BASE_p =
-!ifeq MONOLITHIC 0
-__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
-!endif
-__WXLIB_CORE_p =
-!ifeq MONOLITHIC 0
-__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib
-!endif
-__WXLIB_HTML_p =
-!ifeq MONOLITHIC 0
-__WXLIB_HTML_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib
-!endif
-__WXLIB_MONO_p =
-!ifeq MONOLITHIC 1
-__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
+!ifeq USE_EXCEPTIONS 1
+__EXCEPTIONSFLAG = -xs
 !endif
 __WXUNIV_DEFINE_p =
 !ifeq WXUNIV 1
 __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
 !endif
-__xrcdll___depname =
-!ifeq SHARED 1
-__xrcdll___depname = ..\..\src\xrc\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc_wat$(VENDORTAG).dll
+__DEBUG_DEFINE_p =
+!ifeq BUILD debug
+!ifeq DEBUG_FLAG default
+__DEBUG_DEFINE_p = -d__WXDEBUG__
 !endif
-__xrclib___depname =
+!endif
+!ifeq DEBUG_FLAG 1
+__DEBUG_DEFINE_p = -d__WXDEBUG__
+!endif
+__UNICODE_DEFINE_p =
+!ifeq UNICODE 1
+__UNICODE_DEFINE_p = -d_UNICODE
+!endif
+LIBDIRNAME =
 !ifeq SHARED 0
-__xrclib___depname = ..\..\src\xrc\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.lib
+LIBDIRNAME = ..\..\src\xrc\..\..\..\lib\wat_lib$(CFG)
+!endif
+!ifeq SHARED 1
+LIBDIRNAME = ..\..\src\xrc\..\..\..\lib\wat_dll$(CFG)
 !endif
 
 ### Variables: ###
 
-OBJS = wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-XRCDLL_CFLAGS = $(CPPFLAGS) /fh=$(OBJS)\wxprec_xrcdll.pch -bd $(__DEBUGFLAG) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS)  -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=..\..\src\xrc\..\..\..\include -i=..\..\src\xrc\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=..\..\src\xrc\..\..\..\src\tiff -i=..\..\src\xrc\..\..\..\src\jpeg -i=..\..\src\xrc\..\..\..\src\png -i=..\..\src\xrc\..\..\..\src\zlib  -i=..\..\src\xrc\..\..\..\src\regex -i=..\..\src\xrc\..\..\include -dWXUSINGDLL -dWXMAKINGDLL_XRC -i=..\..\src\xrc\expat\xmlparse -i=..\..\src\xrc\expat\xmltok $(CFLAGS) 
-XRCDLL_CXXFLAGS = $(CPPFLAGS) /fh=$(OBJS)\wxprec_xrcdll.pch -bd $(__DEBUGFLAG) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS)  -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=..\..\src\xrc\..\..\..\include -i=..\..\src\xrc\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=..\..\src\xrc\..\..\..\src\tiff -i=..\..\src\xrc\..\..\..\src\jpeg -i=..\..\src\xrc\..\..\..\src\png -i=..\..\src\xrc\..\..\..\src\zlib  -i=..\..\src\xrc\..\..\..\src\regex -i=..\..\src\xrc\..\..\include -dWXUSINGDLL -dWXMAKINGDLL_XRC -i=..\..\src\xrc\expat\xmlparse -i=..\..\src\xrc\expat\xmltok $(CXXFLAGS) 
-XRCLIB_CFLAGS = $(CPPFLAGS) /fh=$(OBJS)\wxprec_xrclib.pch $(__DEBUGFLAG) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS)  -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=..\..\src\xrc\..\..\..\include -i=..\..\src\xrc\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=..\..\src\xrc\..\..\..\src\tiff -i=..\..\src\xrc\..\..\..\src\jpeg -i=..\..\src\xrc\..\..\..\src\png -i=..\..\src\xrc\..\..\..\src\zlib  -i=..\..\src\xrc\..\..\..\src\regex -i=..\..\src\xrc\..\..\include -i=..\..\src\xrc\expat\xmlparse -i=..\..\src\xrc\expat\xmltok $(CFLAGS)
-XRCLIB_CXXFLAGS = $(CPPFLAGS) /fh=$(OBJS)\wxprec_xrclib.pch $(__DEBUGFLAG) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS)  -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=..\..\src\xrc\..\..\..\include -i=..\..\src\xrc\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=..\..\src\xrc\..\..\..\src\tiff -i=..\..\src\xrc\..\..\..\src\jpeg -i=..\..\src\xrc\..\..\..\src\png -i=..\..\src\xrc\..\..\..\src\zlib  -i=..\..\src\xrc\..\..\..\src\regex -i=..\..\src\xrc\..\..\include -i=..\..\src\xrc\expat\xmlparse -i=..\..\src\xrc\expat\xmltok $(CXXFLAGS)
-
+OBJS = &
+	wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+SETUPHDIR = &
+	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+XRCDLL_CXXFLAGS = -bd $(__DEBUGINFO_1) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) &
+	-d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) &
+	-i=..\..\src\xrc\..\..\..\include -i=$(SETUPHDIR) &
+	-i=..\..\src\xrc\..\..\include -dWXUSINGDLL -dWXMAKINGDLL_XRC &
+	/fh=$(OBJS)\wxprec_xrcdll.pch $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)
+XRCDLL_OBJECTS =  &
+	$(OBJS)\xrcdll_dummy.obj &
+	$(OBJS)\xrcdll_xmlres.obj &
+	$(OBJS)\xrcdll_xh_bmp.obj &
+	$(OBJS)\xrcdll_xh_bmpbt.obj &
+	$(OBJS)\xrcdll_xh_bttn.obj &
+	$(OBJS)\xrcdll_xh_cald.obj &
+	$(OBJS)\xrcdll_xh_chckb.obj &
+	$(OBJS)\xrcdll_xh_chckl.obj &
+	$(OBJS)\xrcdll_xh_choic.obj &
+	$(OBJS)\xrcdll_xh_combo.obj &
+	$(OBJS)\xrcdll_xh_dlg.obj &
+	$(OBJS)\xrcdll_xh_frame.obj &
+	$(OBJS)\xrcdll_xh_gauge.obj &
+	$(OBJS)\xrcdll_xh_gdctl.obj &
+	$(OBJS)\xrcdll_xh_html.obj &
+	$(OBJS)\xrcdll_xh_listb.obj &
+	$(OBJS)\xrcdll_xh_listc.obj &
+	$(OBJS)\xrcdll_xh_menu.obj &
+	$(OBJS)\xrcdll_xh_notbk.obj &
+	$(OBJS)\xrcdll_xh_panel.obj &
+	$(OBJS)\xrcdll_xh_radbt.obj &
+	$(OBJS)\xrcdll_xh_radbx.obj &
+	$(OBJS)\xrcdll_xh_scrol.obj &
+	$(OBJS)\xrcdll_xh_scwin.obj &
+	$(OBJS)\xrcdll_xh_sizer.obj &
+	$(OBJS)\xrcdll_xh_slidr.obj &
+	$(OBJS)\xrcdll_xh_spin.obj &
+	$(OBJS)\xrcdll_xh_split.obj &
+	$(OBJS)\xrcdll_xh_statbar.obj &
+	$(OBJS)\xrcdll_xh_stbmp.obj &
+	$(OBJS)\xrcdll_xh_stbox.obj &
+	$(OBJS)\xrcdll_xh_stlin.obj &
+	$(OBJS)\xrcdll_xh_sttxt.obj &
+	$(OBJS)\xrcdll_xh_text.obj &
+	$(OBJS)\xrcdll_xh_toolb.obj &
+	$(OBJS)\xrcdll_xh_tree.obj &
+	$(OBJS)\xrcdll_xh_unkwn.obj &
+	$(OBJS)\xrcdll_xh_wizrd.obj &
+	$(OBJS)\xrcdll_xmlrsall.obj
+XRCLIB_CXXFLAGS = $(__DEBUGINFO_1) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) &
+	-d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) &
+	-i=..\..\src\xrc\..\..\..\include -i=$(SETUPHDIR) &
+	-i=..\..\src\xrc\..\..\include -i=..\..\src\xrc\expat\xmlparse &
+	-i=..\..\src\xrc\expat\xmltok /fh=$(OBJS)\wxprec_xrclib.pch &
+	$(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)
+XRCLIB_OBJECTS =  &
+	$(OBJS)\xrclib_dummy.obj &
+	$(OBJS)\xrclib_xmlres.obj &
+	$(OBJS)\xrclib_xh_bmp.obj &
+	$(OBJS)\xrclib_xh_bmpbt.obj &
+	$(OBJS)\xrclib_xh_bttn.obj &
+	$(OBJS)\xrclib_xh_cald.obj &
+	$(OBJS)\xrclib_xh_chckb.obj &
+	$(OBJS)\xrclib_xh_chckl.obj &
+	$(OBJS)\xrclib_xh_choic.obj &
+	$(OBJS)\xrclib_xh_combo.obj &
+	$(OBJS)\xrclib_xh_dlg.obj &
+	$(OBJS)\xrclib_xh_frame.obj &
+	$(OBJS)\xrclib_xh_gauge.obj &
+	$(OBJS)\xrclib_xh_gdctl.obj &
+	$(OBJS)\xrclib_xh_html.obj &
+	$(OBJS)\xrclib_xh_listb.obj &
+	$(OBJS)\xrclib_xh_listc.obj &
+	$(OBJS)\xrclib_xh_menu.obj &
+	$(OBJS)\xrclib_xh_notbk.obj &
+	$(OBJS)\xrclib_xh_panel.obj &
+	$(OBJS)\xrclib_xh_radbt.obj &
+	$(OBJS)\xrclib_xh_radbx.obj &
+	$(OBJS)\xrclib_xh_scrol.obj &
+	$(OBJS)\xrclib_xh_scwin.obj &
+	$(OBJS)\xrclib_xh_sizer.obj &
+	$(OBJS)\xrclib_xh_slidr.obj &
+	$(OBJS)\xrclib_xh_spin.obj &
+	$(OBJS)\xrclib_xh_split.obj &
+	$(OBJS)\xrclib_xh_statbar.obj &
+	$(OBJS)\xrclib_xh_stbmp.obj &
+	$(OBJS)\xrclib_xh_stbox.obj &
+	$(OBJS)\xrclib_xh_stlin.obj &
+	$(OBJS)\xrclib_xh_sttxt.obj &
+	$(OBJS)\xrclib_xh_text.obj &
+	$(OBJS)\xrclib_xh_toolb.obj &
+	$(OBJS)\xrclib_xh_tree.obj &
+	$(OBJS)\xrclib_xh_unkwn.obj &
+	$(OBJS)\xrclib_xh_wizrd.obj &
+	$(OBJS)\xrclib_xmlrsall.obj
 
 
 all : $(OBJS)
@@ -140,9 +299,43 @@ $(OBJS) :
 
 all : .SYMBOLIC $(__xrcdll___depname) $(__xrclib___depname)
 
+clean : .SYMBOLIC 
+	-if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+	-if exist $(OBJS)\*.res del $(OBJS)\*.res
+	-if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
+	-if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
+	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc_wat$(VENDORTAG).dll
+	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.lib
+	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.lib
+
+!ifeq SHARED 1
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc_wat$(VENDORTAG).dll :  $(XRCDLL_OBJECTS)
+	@%create $(OBJS)\xrcdll.lbc
+	@%append $(OBJS)\xrcdll.lbc option quiet
+	@%append $(OBJS)\xrcdll.lbc name $^@
+	@%append $(OBJS)\xrcdll.lbc option caseexact
+	@%append $(OBJS)\xrcdll.lbc $(LDFLAGS) $(__DEBUGINFO_2)  libpath $(LIBDIRNAME)
+	@for %i in ($(XRCDLL_OBJECTS)) do @%append $(OBJS)\xrcdll.lbc file %i
+	@for %i in ( $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib  $(__WXLIB_HTML_p)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_XML_p)  $(__WXLIB_BASE_p) ) do @%append $(OBJS)\xrcdll.lbc library %i
+	@%append $(OBJS)\xrcdll.lbc
+	@%append $(OBJS)\xrcdll.lbc system nt_dll
+	wlink @$(OBJS)\xrcdll.lbc
+	wlib -q -n -b $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.lib +$^@
+!endif
+
+!ifeq SHARED 0
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.lib :  $(XRCLIB_OBJECTS)
+	@%create $(OBJS)\xrclib.lbc
+	@for %i in ($(XRCLIB_OBJECTS)) do @%append $(OBJS)\xrclib.lbc +%i
+	wlib -q -p4096 -n -b $^@ @$(OBJS)\xrclib.lbc
+!endif
+
 $(OBJS)\xrcdll_dummy.obj :  .AUTODEPEND ../../src/xrc\..\..\..\src\msw\dummy.cpp
 	$(CXX) -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
 
+$(OBJS)\xrcdll_xmlres.obj :  .AUTODEPEND ../../src/xrc\xmlres.cpp
+	$(CXX) -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
+
 $(OBJS)\xrcdll_xh_bmp.obj :  .AUTODEPEND ../../src/xrc\xh_bmp.cpp
 	$(CXX) -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
 
@@ -221,6 +414,9 @@ $(OBJS)\xrcdll_xh_spin.obj :  .AUTODEPEND ../../src/xrc\xh_spin.cpp
 $(OBJS)\xrcdll_xh_split.obj :  .AUTODEPEND ../../src/xrc\xh_split.cpp
 	$(CXX) -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
 
+$(OBJS)\xrcdll_xh_statbar.obj :  .AUTODEPEND ../../src/xrc\xh_statbar.cpp
+	$(CXX) -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
+
 $(OBJS)\xrcdll_xh_stbmp.obj :  .AUTODEPEND ../../src/xrc\xh_stbmp.cpp
 	$(CXX) -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
 
@@ -248,27 +444,15 @@ $(OBJS)\xrcdll_xh_unkwn.obj :  .AUTODEPEND ../../src/xrc\xh_unkwn.cpp
 $(OBJS)\xrcdll_xh_wizrd.obj :  .AUTODEPEND ../../src/xrc\xh_wizrd.cpp
 	$(CXX) -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
 
-$(OBJS)\xrcdll_xml.obj :  .AUTODEPEND ../../src/xrc\xml.cpp
-	$(CXX) -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
-
-$(OBJS)\xrcdll_xmlparse.obj :  .AUTODEPEND ../../src/xrc\expat\xmlparse\xmlparse.c
-	$(CC) -zq -fo=$^@ $(XRCDLL_CFLAGS) $<
-
-$(OBJS)\xrcdll_xmlres.obj :  .AUTODEPEND ../../src/xrc\xmlres.cpp
-	$(CXX) -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
-
-$(OBJS)\xrcdll_xmlrole.obj :  .AUTODEPEND ../../src/xrc\expat\xmltok\xmlrole.c
-	$(CC) -zq -fo=$^@ $(XRCDLL_CFLAGS) $<
-
 $(OBJS)\xrcdll_xmlrsall.obj :  .AUTODEPEND ../../src/xrc\xmlrsall.cpp
 	$(CXX) -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
 
-$(OBJS)\xrcdll_xmltok.obj :  .AUTODEPEND ../../src/xrc\expat\xmltok\xmltok.c
-	$(CC) -zq -fo=$^@ $(XRCDLL_CFLAGS) $<
-
 $(OBJS)\xrclib_dummy.obj :  .AUTODEPEND ../../src/xrc\..\..\..\src\msw\dummy.cpp
 	$(CXX) -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
 
+$(OBJS)\xrclib_xmlres.obj :  .AUTODEPEND ../../src/xrc\xmlres.cpp
+	$(CXX) -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
+
 $(OBJS)\xrclib_xh_bmp.obj :  .AUTODEPEND ../../src/xrc\xh_bmp.cpp
 	$(CXX) -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
 
@@ -347,6 +531,9 @@ $(OBJS)\xrclib_xh_spin.obj :  .AUTODEPEND ../../src/xrc\xh_spin.cpp
 $(OBJS)\xrclib_xh_split.obj :  .AUTODEPEND ../../src/xrc\xh_split.cpp
 	$(CXX) -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
 
+$(OBJS)\xrclib_xh_statbar.obj :  .AUTODEPEND ../../src/xrc\xh_statbar.cpp
+	$(CXX) -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
+
 $(OBJS)\xrclib_xh_stbmp.obj :  .AUTODEPEND ../../src/xrc\xh_stbmp.cpp
 	$(CXX) -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
 
@@ -374,51 +561,5 @@ $(OBJS)\xrclib_xh_unkwn.obj :  .AUTODEPEND ../../src/xrc\xh_unkwn.cpp
 $(OBJS)\xrclib_xh_wizrd.obj :  .AUTODEPEND ../../src/xrc\xh_wizrd.cpp
 	$(CXX) -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
 
-$(OBJS)\xrclib_xml.obj :  .AUTODEPEND ../../src/xrc\xml.cpp
-	$(CXX) -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
-
-$(OBJS)\xrclib_xmlparse.obj :  .AUTODEPEND ../../src/xrc\expat\xmlparse\xmlparse.c
-	$(CC) -zq -fo=$^@ $(XRCLIB_CFLAGS) $<
-
-$(OBJS)\xrclib_xmlres.obj :  .AUTODEPEND ../../src/xrc\xmlres.cpp
-	$(CXX) -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
-
-$(OBJS)\xrclib_xmlrole.obj :  .AUTODEPEND ../../src/xrc\expat\xmltok\xmlrole.c
-	$(CC) -zq -fo=$^@ $(XRCLIB_CFLAGS) $<
-
 $(OBJS)\xrclib_xmlrsall.obj :  .AUTODEPEND ../../src/xrc\xmlrsall.cpp
 	$(CXX) -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
-
-$(OBJS)\xrclib_xmltok.obj :  .AUTODEPEND ../../src/xrc\expat\xmltok\xmltok.c
-	$(CC) -zq -fo=$^@ $(XRCLIB_CFLAGS) $<
-
-clean : .SYMBOLIC 
-	-if exist $(OBJS)\*.obj del $(OBJS)\*.obj
-	-if exist $(OBJS)\*.res del $(OBJS)\*.res
-	-if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
-	-if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
-	-if exist ..\..\src\xrc\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc_wat$(VENDORTAG).dll del ..\..\src\xrc\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc_wat$(VENDORTAG).dll
-	-if exist ..\..\src\xrc\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.lib del ..\..\src\xrc\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.lib
-	-if exist ..\..\src\xrc\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.lib del ..\..\src\xrc\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.lib
-
-!ifeq SHARED 1
-..\..\src\xrc\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc_wat$(VENDORTAG).dll :  $(OBJS)\xrcdll_dummy.obj $(OBJS)\xrcdll_xmlparse.obj $(OBJS)\xrcdll_xmltok.obj $(OBJS)\xrcdll_xmlrole.obj $(OBJS)\xrcdll_xml.obj $(OBJS)\xrcdll_xmlres.obj $(OBJS)\xrcdll_xh_bmp.obj $(OBJS)\xrcdll_xh_bmpbt.obj $(OBJS)\xrcdll_xh_bttn.obj $(OBJS)\xrcdll_xh_cald.obj $(OBJS)\xrcdll_xh_chckb.obj $(OBJS)\xrcdll_xh_chckl.obj $(OBJS)\xrcdll_xh_choic.obj $(OBJS)\xrcdll_xh_combo.obj $(OBJS)\xrcdll_xh_dlg.obj $(OBJS)\xrcdll_xh_frame.obj $(OBJS)\xrcdll_xh_gauge.obj $(OBJS)\xrcdll_xh_gdctl.obj $(OBJS)\xrcdll_xh_html.obj $(OBJS)\xrcdll_xh_listb.obj $(OBJS)\xrcdll_xh_listc.obj $(OBJS)\xrcdll_xh_menu.obj $(OBJS)\xrcdll_xh_notbk.obj $(OBJS)\xrcdll_xh_panel.obj $(OBJS)\xrcdll_xh_radbt.obj $(OBJS)\xrcdll_xh_radbx.obj $(OBJS)\xrcdll_xh_scrol.obj $(OBJS)\xrcdll_xh_scwin.obj $(OBJS)\xrcdll_xh_sizer.obj $(OBJS)\xrcdll_xh_slidr.obj $(OBJS)\xrcdll_xh_spin.obj $(OBJS)\xrcdll_xh_split.obj $(OBJS)\xrcdll_xh_stbmp.obj $(OBJS)\xrcdll_xh_stbox.obj $(OBJS)\xrcdll_xh_stlin.obj $(OBJS)\xrcdll_xh_sttxt.obj $(OBJS)\xrcdll_xh_text.obj $(OBJS)\xrcdll_xh_toolb.obj $(OBJS)\xrcdll_xh_tree.obj $(OBJS)\xrcdll_xh_unkwn.obj $(OBJS)\xrcdll_xh_wizrd.obj $(OBJS)\xrcdll_xmlrsall.obj
-	@%create $(OBJS)\xrcdll.lbc
-	@%append $(OBJS)\xrcdll.lbc option quiet
-	@%append $(OBJS)\xrcdll.lbc name $^@
-	@%append $(OBJS)\xrcdll.lbc option incremental
-	@%append $(OBJS)\xrcdll.lbc $(LDFLAGS) $(__DEBUGFLAG_1)  libpath ..\..\src\xrc\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-	@for %i in ( $(OBJS)\xrcdll_dummy.obj $(OBJS)\xrcdll_xmlparse.obj $(OBJS)\xrcdll_xmltok.obj $(OBJS)\xrcdll_xmlrole.obj $(OBJS)\xrcdll_xml.obj $(OBJS)\xrcdll_xmlres.obj $(OBJS)\xrcdll_xh_bmp.obj $(OBJS)\xrcdll_xh_bmpbt.obj $(OBJS)\xrcdll_xh_bttn.obj $(OBJS)\xrcdll_xh_cald.obj $(OBJS)\xrcdll_xh_chckb.obj $(OBJS)\xrcdll_xh_chckl.obj $(OBJS)\xrcdll_xh_choic.obj $(OBJS)\xrcdll_xh_combo.obj $(OBJS)\xrcdll_xh_dlg.obj $(OBJS)\xrcdll_xh_frame.obj $(OBJS)\xrcdll_xh_gauge.obj $(OBJS)\xrcdll_xh_gdctl.obj $(OBJS)\xrcdll_xh_html.obj $(OBJS)\xrcdll_xh_listb.obj $(OBJS)\xrcdll_xh_listc.obj $(OBJS)\xrcdll_xh_menu.obj $(OBJS)\xrcdll_xh_notbk.obj $(OBJS)\xrcdll_xh_panel.obj $(OBJS)\xrcdll_xh_radbt.obj $(OBJS)\xrcdll_xh_radbx.obj $(OBJS)\xrcdll_xh_scrol.obj $(OBJS)\xrcdll_xh_scwin.obj $(OBJS)\xrcdll_xh_sizer.obj $(OBJS)\xrcdll_xh_slidr.obj $(OBJS)\xrcdll_xh_spin.obj $(OBJS)\xrcdll_xh_split.obj $(OBJS)\xrcdll_xh_stbmp.obj $(OBJS)\xrcdll_xh_stbox.obj $(OBJS)\xrcdll_xh_stlin.obj $(OBJS)\xrcdll_xh_sttxt.obj $(OBJS)\xrcdll_xh_text.obj $(OBJS)\xrcdll_xh_toolb.obj $(OBJS)\xrcdll_xh_tree.obj $(OBJS)\xrcdll_xh_unkwn.obj $(OBJS)\xrcdll_xh_wizrd.obj $(OBJS)\xrcdll_xmlrsall.obj) do @%append $(OBJS)\xrcdll.lbc file %i
-	@for %i in ( $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib  kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib  $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)) do @%append $(OBJS)\xrcdll.lbc library %i
-	@%append $(OBJS)\xrcdll.lbc
-	@%append $(OBJS)\xrcdll.lbc system nt_dll
-	wlink @$(OBJS)\xrcdll.lbc
-	wlib -q -n -b ..\..\src\xrc\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.lib +$^@
-!endif
-
-!ifeq SHARED 0
-..\..\src\xrc\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.lib :  $(OBJS)\xrclib_dummy.obj $(OBJS)\xrclib_xmlparse.obj $(OBJS)\xrclib_xmltok.obj $(OBJS)\xrclib_xmlrole.obj $(OBJS)\xrclib_xml.obj $(OBJS)\xrclib_xmlres.obj $(OBJS)\xrclib_xh_bmp.obj $(OBJS)\xrclib_xh_bmpbt.obj $(OBJS)\xrclib_xh_bttn.obj $(OBJS)\xrclib_xh_cald.obj $(OBJS)\xrclib_xh_chckb.obj $(OBJS)\xrclib_xh_chckl.obj $(OBJS)\xrclib_xh_choic.obj $(OBJS)\xrclib_xh_combo.obj $(OBJS)\xrclib_xh_dlg.obj $(OBJS)\xrclib_xh_frame.obj $(OBJS)\xrclib_xh_gauge.obj $(OBJS)\xrclib_xh_gdctl.obj $(OBJS)\xrclib_xh_html.obj $(OBJS)\xrclib_xh_listb.obj $(OBJS)\xrclib_xh_listc.obj $(OBJS)\xrclib_xh_menu.obj $(OBJS)\xrclib_xh_notbk.obj $(OBJS)\xrclib_xh_panel.obj $(OBJS)\xrclib_xh_radbt.obj $(OBJS)\xrclib_xh_radbx.obj $(OBJS)\xrclib_xh_scrol.obj $(OBJS)\xrclib_xh_scwin.obj $(OBJS)\xrclib_xh_sizer.obj $(OBJS)\xrclib_xh_slidr.obj $(OBJS)\xrclib_xh_spin.obj $(OBJS)\xrclib_xh_split.obj $(OBJS)\xrclib_xh_stbmp.obj $(OBJS)\xrclib_xh_stbox.obj $(OBJS)\xrclib_xh_stlin.obj $(OBJS)\xrclib_xh_sttxt.obj $(OBJS)\xrclib_xh_text.obj $(OBJS)\xrclib_xh_toolb.obj $(OBJS)\xrclib_xh_tree.obj $(OBJS)\xrclib_xh_unkwn.obj $(OBJS)\xrclib_xh_wizrd.obj $(OBJS)\xrclib_xmlrsall.obj
-	@%create $(OBJS)\xrclib.lbc
-	@for %i in ( $(OBJS)\xrclib_dummy.obj $(OBJS)\xrclib_xmlparse.obj $(OBJS)\xrclib_xmltok.obj $(OBJS)\xrclib_xmlrole.obj $(OBJS)\xrclib_xml.obj $(OBJS)\xrclib_xmlres.obj $(OBJS)\xrclib_xh_bmp.obj $(OBJS)\xrclib_xh_bmpbt.obj $(OBJS)\xrclib_xh_bttn.obj $(OBJS)\xrclib_xh_cald.obj $(OBJS)\xrclib_xh_chckb.obj $(OBJS)\xrclib_xh_chckl.obj $(OBJS)\xrclib_xh_choic.obj $(OBJS)\xrclib_xh_combo.obj $(OBJS)\xrclib_xh_dlg.obj $(OBJS)\xrclib_xh_frame.obj $(OBJS)\xrclib_xh_gauge.obj $(OBJS)\xrclib_xh_gdctl.obj $(OBJS)\xrclib_xh_html.obj $(OBJS)\xrclib_xh_listb.obj $(OBJS)\xrclib_xh_listc.obj $(OBJS)\xrclib_xh_menu.obj $(OBJS)\xrclib_xh_notbk.obj $(OBJS)\xrclib_xh_panel.obj $(OBJS)\xrclib_xh_radbt.obj $(OBJS)\xrclib_xh_radbx.obj $(OBJS)\xrclib_xh_scrol.obj $(OBJS)\xrclib_xh_scwin.obj $(OBJS)\xrclib_xh_sizer.obj $(OBJS)\xrclib_xh_slidr.obj $(OBJS)\xrclib_xh_spin.obj $(OBJS)\xrclib_xh_split.obj $(OBJS)\xrclib_xh_stbmp.obj $(OBJS)\xrclib_xh_stbox.obj $(OBJS)\xrclib_xh_stlin.obj $(OBJS)\xrclib_xh_sttxt.obj $(OBJS)\xrclib_xh_text.obj $(OBJS)\xrclib_xh_toolb.obj $(OBJS)\xrclib_xh_tree.obj $(OBJS)\xrclib_xh_unkwn.obj $(OBJS)\xrclib_xh_wizrd.obj $(OBJS)\xrclib_xmlrsall.obj) do @%append $(OBJS)\xrclib.lbc +%i
-	wlib -q -p2048 -n -b $^@ @$(OBJS)\xrclib.lbc
-!endif