Cleaned up some comments, reorganized some code

[wxWidgets.git] / contrib / build / xrc / makefile.vc

diff --git a/contrib/build/xrc/makefile.vc b/contrib/build/xrc/makefile.vc
index 41cd343b629108c62a8f768f968aac767b0b929a..34823fcf212a249b7fd8d5c7dc26fb32a55f7d8f 100644 (file)
--- a/contrib/build/xrc/makefile.vc
+++ b/contrib/build/xrc/makefile.vc
@@ -4,7 +4,7 @@
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

-!include <../../../build/config.vc>
+!include <../../../build/msw/config.vc>

 
 # -------------------------------------------------------------------------
 # Do not modify the rest of this file!
 
 # -------------------------------------------------------------------------
 # Do not modify the rest of this file!


@@ -12,14 +12,112 @@
 
 ### Variables: ###
 
 
 ### Variables: ###
 

-OBJS = vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-XRCDLL_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG_3) $(__DEBUGFLAG) /Fd..\..\src\xrc\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc_vc$(VENDORTAG).pdb $(__OPTIMIZEFLAG)  /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\..\src\xrc\..\..\..\include /I..\..\src\xrc\..\..\..\lib\vc_$(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 /Fp$(OBJS)\wxprec_xrcdll.pch /I..\..\src\xrc\..\..\include /DWXUSINGDLL /DWXMAKINGDLL_XRC /I..\..\src\xrc\expat\xmlparse /I..\..\src\xrc\expat\xmltok $(CFLAGS) 
-XRCDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG_3) $(__DEBUGFLAG) /Fd..\..\src\xrc\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc_vc$(VENDORTAG).pdb $(__OPTIMIZEFLAG)  /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\..\src\xrc\..\..\..\include /I..\..\src\xrc\..\..\..\lib\vc_$(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 /Fp$(OBJS)\wxprec_xrcdll.pch /I..\..\src\xrc\..\..\include /DWXUSINGDLL /DWXMAKINGDLL_XRC /I..\..\src\xrc\expat\xmlparse /I..\..\src\xrc\expat\xmltok $(CXXFLAGS)  /Yuwx/wxprec.h
-XRCLIB_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG_3) $(__DEBUGFLAG) /Fd..\..\src\xrc\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.pdb $(__OPTIMIZEFLAG)  /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\..\src\xrc\..\..\..\include /I..\..\src\xrc\..\..\..\lib\vc_$(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 /Fp$(OBJS)\wxprec_xrclib.pch /I..\..\src\xrc\..\..\include /I..\..\src\xrc\expat\xmlparse /I..\..\src\xrc\expat\xmltok $(CFLAGS)
-XRCLIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG_3) $(__DEBUGFLAG) /Fd..\..\src\xrc\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.pdb $(__OPTIMIZEFLAG)  /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\..\src\xrc\..\..\..\include /I..\..\src\xrc\..\..\..\lib\vc_$(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 /Fp$(OBJS)\wxprec_xrclib.pch /I..\..\src\xrc\..\..\include /I..\..\src\xrc\expat\xmlparse /I..\..\src\xrc\expat\xmltok $(CXXFLAGS) /Yuwx/wxprec.h
+OBJS = \
+       vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+XRCDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_3) /DWIN32 \
+       $(__DEBUGINFO_2) \
+       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc_vc$(VENDORTAG).pdb \
+       $(____DEBUGRUNTIME_2_p) $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\..\src\xrc\..\..\..\include \
+       /I$(SETUPHDIR) /I..\..\src\xrc\..\..\include /DWXUSINGDLL /DWXMAKINGDLL_XRC \
+       $(CXXFLAGS) /GR /GX /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_xrcdll.pch"
+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_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 = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_12) /DWIN32 \
+       $(__DEBUGINFO_2) \
+       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.pdb \
+       $(____DEBUGRUNTIME_11_p) $(__OPTIMIZEFLAG) /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 $(CXXFLAGS) /GR \
+       /GX /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_xrclib.pch"
+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_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

 
 ### Conditionally set variables: ###
 
 
 ### Conditionally set variables: ###
 

+!if "$(SHARED)" == "0"
+LIBDIRNAME = ..\..\src\xrc\..\..\..\lib\vc_lib$(CFG)
+!endif
+!if "$(SHARED)" == "1"
+LIBDIRNAME = ..\..\src\xrc\..\..\..\lib\vc_dll$(CFG)
+!endif

 !if "$(USE_GUI)" == "0"
 PORTNAME = base
 !endif
 !if "$(USE_GUI)" == "0"
 PORTNAME = base
 !endif


@@ -32,7 +130,10 @@ VENDORTAG = _$(VENDOR)
 !if "$(OFFICIAL_BUILD)" == "1"
 VENDORTAG = 
 !endif
 !if "$(OFFICIAL_BUILD)" == "1"
 VENDORTAG = 
 !endif

-!if "$(BUILD)" == "debug"
+!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
+WXDEBUGFLAG = d
+!endif
+!if "$(DEBUG_FLAG)" == "1"

 WXDEBUGFLAG = d
 !endif
 !if "$(SHARED)" == "1"
 WXDEBUGFLAG = d
 !endif
 !if "$(SHARED)" == "1"


@@ -44,27 +145,75 @@ WXUNICODEFLAG = u
 !if "$(WXUNIV)" == "1"
 WXUNIVNAME = univ
 !endif
 !if "$(WXUNIV)" == "1"
 WXUNIVNAME = univ
 !endif

-!if "$(BUILD)" == "debug"
-__DEBUGFLAG = /Zi
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = d

 !endif
 !endif

-!if "$(BUILD)" == "release"
-__DEBUGFLAG = 
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = 

 !endif
 !endif

-!if "$(BUILD)" == "debug"
-__DEBUGFLAG_1 = /DEBUG
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO = 

 !endif
 !endif

-!if "$(BUILD)" == "release"
-__DEBUGFLAG_1 = 
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO = d

 !endif
 !endif

-!if "$(BUILD)" == "debug"
-__DEBUGFLAG_3 = d
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = /DEBUG

 !endif
 !endif

-!if "$(BUILD)" == "release"
-__DEBUGFLAG_3 = 
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = 

 !endif
 !endif

-!if "$(BUILD)" == "debug"
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = /Zi
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_2 = /Zi
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_12 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_12 = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_12 = $(__DEBUGINFO)
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_3 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_3 = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_3 = $(__DEBUGINFO)
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"

 __DEBUG_DEFINE_p = /D__WXDEBUG__
 !endif
 __DEBUG_DEFINE_p = /D__WXDEBUG__
 !endif

+!if "$(DEBUG_FLAG)" == "1"
+__DEBUG_DEFINE_p = /D__WXDEBUG__
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif

 !if "$(BUILD)" == "debug"
 __OPTIMIZEFLAG = /Od
 !endif
 !if "$(BUILD)" == "debug"
 __OPTIMIZEFLAG = /Od
 !endif


@@ -75,31 +224,76 @@ __OPTIMIZEFLAG = /O2
 __RUNTIME_LIBS = D
 !endif
 !if "$(RUNTIME_LIBS)" == "static"
 __RUNTIME_LIBS = D
 !endif
 !if "$(RUNTIME_LIBS)" == "static"

-__RUNTIME_LIBS = 
+__RUNTIME_LIBS = T

 !endif
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p = /DwxUSE_UNICODE=1
 !endif
 !endif
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p = /DwxUSE_UNICODE=1
 !endif

+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_ADV_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib
+!endif

 !if "$(MONOLITHIC)" == "0"
 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "0"
 !if "$(MONOLITHIC)" == "0"
 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "0"

-__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib

 !endif
 !if "$(MONOLITHIC)" == "0"
 !endif
 !if "$(MONOLITHIC)" == "0"

-__WXLIB_HTML_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib
+__WXLIB_HTML_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib

 !endif
 !if "$(MONOLITHIC)" == "1"
 !endif
 !if "$(MONOLITHIC)" == "1"

-__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_XML_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml.lib

 !endif
 !if "$(WXUNIV)" == "1"
 __WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
 !endif
 !endif
 !if "$(WXUNIV)" == "1"
 __WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
 !endif

+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+____DEBUGINFO = /D_DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+____DEBUGINFO = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+____DEBUGINFO = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+____DEBUGINFO = /D_DEBUG
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_11_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_11_p = /D_DEBUG
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_11_p = $(____DEBUGINFO)
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_2_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_2_p = /D_DEBUG
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_2_p = $(____DEBUGINFO)
+!endif

 !if "$(SHARED)" == "1"
 !if "$(SHARED)" == "1"

-__xrcdll___depname = ..\..\src\xrc\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc_vc$(VENDORTAG).dll
+__xrcdll___depname = \
+       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc_vc$(VENDORTAG).dll

 !endif
 !if "$(SHARED)" == "0"
 !endif
 !if "$(SHARED)" == "0"

-__xrclib___depname = ..\..\src\xrc\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.lib
+__xrclib___depname = \
+       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.lib

 !endif
 
 
 !endif
 
 


@@ -219,24 +413,12 @@ $(OBJS)\xrcdll_xh_unkwn.obj: ../../src/xrc\xh_unkwn.cpp
 $(OBJS)\xrcdll_xh_wizrd.obj: ../../src/xrc\xh_wizrd.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
 
 $(OBJS)\xrcdll_xh_wizrd.obj: ../../src/xrc\xh_wizrd.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
 

-$(OBJS)\xrcdll_xml.obj: ../../src/xrc\xml.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
-
-$(OBJS)\xrcdll_xmlparse.obj: ../../src/xrc\expat\xmlparse\xmlparse.c
-       $(CC) /c /nologo /TC /Fo$@ $(XRCDLL_CFLAGS) $**
-

 $(OBJS)\xrcdll_xmlres.obj: ../../src/xrc\xmlres.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
 
 $(OBJS)\xrcdll_xmlres.obj: ../../src/xrc\xmlres.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
 

-$(OBJS)\xrcdll_xmlrole.obj: ../../src/xrc\expat\xmltok\xmlrole.c
-       $(CC) /c /nologo /TC /Fo$@ $(XRCDLL_CFLAGS) $**
-

 $(OBJS)\xrcdll_xmlrsall.obj: ../../src/xrc\xmlrsall.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
 
 $(OBJS)\xrcdll_xmlrsall.obj: ../../src/xrc\xmlrsall.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
 

-$(OBJS)\xrcdll_xmltok.obj: ../../src/xrc\expat\xmltok\xmltok.c
-       $(CC) /c /nologo /TC /Fo$@ $(XRCDLL_CFLAGS) $**
-

 $(OBJS)\xrclib_dummy.obj: ../../src/xrc\..\..\..\src\msw\dummy.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) /Ycwx/wxprec.h $**
 
 $(OBJS)\xrclib_dummy.obj: ../../src/xrc\..\..\..\src\msw\dummy.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) /Ycwx/wxprec.h $**
 


@@ -345,42 +527,30 @@ $(OBJS)\xrclib_xh_unkwn.obj: ../../src/xrc\xh_unkwn.cpp
 $(OBJS)\xrclib_xh_wizrd.obj: ../../src/xrc\xh_wizrd.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
 
 $(OBJS)\xrclib_xh_wizrd.obj: ../../src/xrc\xh_wizrd.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
 

-$(OBJS)\xrclib_xml.obj: ../../src/xrc\xml.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
-
-$(OBJS)\xrclib_xmlparse.obj: ../../src/xrc\expat\xmlparse\xmlparse.c
-       $(CC) /c /nologo /TC /Fo$@ $(XRCLIB_CFLAGS) $**
-

 $(OBJS)\xrclib_xmlres.obj: ../../src/xrc\xmlres.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
 
 $(OBJS)\xrclib_xmlres.obj: ../../src/xrc\xmlres.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
 

-$(OBJS)\xrclib_xmlrole.obj: ../../src/xrc\expat\xmltok\xmlrole.c
-       $(CC) /c /nologo /TC /Fo$@ $(XRCLIB_CFLAGS) $**
-

 $(OBJS)\xrclib_xmlrsall.obj: ../../src/xrc\xmlrsall.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
 
 $(OBJS)\xrclib_xmlrsall.obj: ../../src/xrc\xmlrsall.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
 

-$(OBJS)\xrclib_xmltok.obj: ../../src/xrc\expat\xmltok\xmltok.c
-       $(CC) /c /nologo /TC /Fo$@ $(XRCLIB_CFLAGS) $**
-

 clean: 
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
        -if exist $(OBJS)\*.res del $(OBJS)\*.res
 clean: 
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
        -if exist $(OBJS)\*.res del $(OBJS)\*.res

-       -if exist ..\..\src\xrc\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc_vc$(VENDORTAG).dll del ..\..\src\xrc\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc_vc$(VENDORTAG).dll
-       -if exist ..\..\src\xrc\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.lib del ..\..\src\xrc\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.lib
-       -if exist ..\..\src\xrc\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.lib del ..\..\src\xrc\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.lib
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc_vc$(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

 
 !if "$(SHARED)" == "1"
 
 !if "$(SHARED)" == "1"

-..\..\src\xrc\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc_vc$(VENDORTAG).dll: $(OBJS)\xrcdll_dummy.obj $(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
-       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_1)  /LIBPATH:..\..\src\xrc\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) @<<
-       $(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  $(__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) /IMPLIB:..\..\src\xrc\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.lib
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc_vc$(VENDORTAG).dll: $(OBJS)\xrcdll_dummy.obj  $(XRCDLL_OBJECTS)
+       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1)  /LIBPATH:$(LIBDIRNAME) @<<
+       $(XRCDLL_OBJECTS)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  $(__UNICOWS_LIB_p) 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_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.lib

 <<
 !endif
 
 !if "$(SHARED)" == "0"
 <<
 !endif
 
 !if "$(SHARED)" == "0"

-..\..\src\xrc\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.lib: $(OBJS)\xrclib_dummy.obj $(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
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.lib: $(OBJS)\xrclib_dummy.obj  $(XRCLIB_OBJECTS)

        if exist $@ del $@
        lib /NOLOGO /OUT:$@ @<<
        if exist $@ del $@
        lib /NOLOGO /OUT:$@ @<<

-       $(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
+       $(XRCLIB_OBJECTS)

 <<
 !endif
 <<
 !endif