regenerated with DESTDIR fixes

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

diff --git a/contrib/build/xrc/makefile.gcc b/contrib/build/xrc/makefile.gcc
index 02a9298d78c39e4188340476b0251aa8d72ffce7..52bac58d8b7e732939aef8962aac44f67b1494e6 100644 (file)
--- a/contrib/build/xrc/makefile.gcc
+++ b/contrib/build/xrc/makefile.gcc
@@ -1,51 +1,10 @@
-

 # =========================================================================
 #     This makefile was generated by
 #     Bakefile 0.1.1 (http://bakefile.sourceforge.net)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
 # =========================================================================
 #     This makefile was generated by
 #     Bakefile 0.1.1 (http://bakefile.sourceforge.net)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

-
-# -------------------------------------------------------------------------
-# These are configurable options:
-# -------------------------------------------------------------------------
-
-# Type of compiled binaries [debug,release]
-BUILD = release
-# C compiler 
-CC = gcc
-# Name of your custom configuration. This affects directory
-#            where object files are stored as well as the location of
-#            compiled .lib files and setup.h under the lib/ toplevel directory. 
-CFG = 
-# Standard flags for CC 
-CFLAGS = 
-# Standard preprocessor flags (common for CC and CXX) 
-CPPFLAGS = 
-# C++ compiler 
-CXX = g++
-# Standard flags for C++ 
-CXXFLAGS = 
-# Set the version of your Mingw installation here.
-#                "3" ...... this is for Mingw 2.0 or newer that cames with gcc3
-#                "2.95" ... for Mingw 1.1 or any of the older versions [3,2.95]
-GCC_VERSION = 3
-# Standard linker flags 
-LDFLAGS = 
-# Multiple libraries or single huge monolithic one? [0,1]
-MONOLITHIC = 1
-# Is this official build by wxWindows developers? [0,1]
-OFFICIAL_BUILD = 0
-# What type of library to build? [0,1]
-SHARED = 1
-# Compile Unicode build of wxWindows? [0,1]
-UNICODE = 0
-# Build GUI libraries? [0,1]
-USE_GUI = 1
-# Use this to name your customized DLLs differently 
-VENDOR = custom
-# Build wxUniversal instead of native port? [0,1]
-WXUNIV = 0
+include ../../../build/msw/config.gcc

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


@@ -53,17 +12,109 @@ WXUNIV = 0
 
 ### Variables: ###
 
 
 ### Variables: ###
 

-XRCDLL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I..\..\src\xrc\..\..\..\include -I..\..\src\xrc\..\..\..\lib\gcc_$(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) 
-OBJS = gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-XRCDLL_CFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I..\..\src\xrc\..\..\..\include -I..\..\src\xrc\..\..\..\lib\gcc_$(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) 
-XRCLIB_CFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I..\..\src\xrc\..\..\..\include -I..\..\src\xrc\..\..\..\lib\gcc_$(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) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I..\..\src\xrc\..\..\..\include -I..\..\src\xrc\..\..\..\lib\gcc_$(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 = \
+       gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+XRCDLL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
+       -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
+       $(__UNICODE_DEFINE_p) -I..\..\src\xrc\..\..\..\include -I$(SETUPHDIR) -Wall \
+       -I..\..\src\xrc\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_XRC $(CXXFLAGS)
+XRCDLL_OBJECTS =  \
+       $(OBJS)\xrcdll_dummy.o \
+       $(OBJS)\xrcdll_xmlres.o \
+       $(OBJS)\xrcdll_xh_bmp.o \
+       $(OBJS)\xrcdll_xh_bmpbt.o \
+       $(OBJS)\xrcdll_xh_bttn.o \
+       $(OBJS)\xrcdll_xh_cald.o \
+       $(OBJS)\xrcdll_xh_chckb.o \
+       $(OBJS)\xrcdll_xh_chckl.o \
+       $(OBJS)\xrcdll_xh_choic.o \
+       $(OBJS)\xrcdll_xh_combo.o \
+       $(OBJS)\xrcdll_xh_dlg.o \
+       $(OBJS)\xrcdll_xh_frame.o \
+       $(OBJS)\xrcdll_xh_gauge.o \
+       $(OBJS)\xrcdll_xh_gdctl.o \
+       $(OBJS)\xrcdll_xh_html.o \
+       $(OBJS)\xrcdll_xh_listb.o \
+       $(OBJS)\xrcdll_xh_listc.o \
+       $(OBJS)\xrcdll_xh_menu.o \
+       $(OBJS)\xrcdll_xh_notbk.o \
+       $(OBJS)\xrcdll_xh_panel.o \
+       $(OBJS)\xrcdll_xh_radbt.o \
+       $(OBJS)\xrcdll_xh_radbx.o \
+       $(OBJS)\xrcdll_xh_scrol.o \
+       $(OBJS)\xrcdll_xh_scwin.o \
+       $(OBJS)\xrcdll_xh_sizer.o \
+       $(OBJS)\xrcdll_xh_slidr.o \
+       $(OBJS)\xrcdll_xh_spin.o \
+       $(OBJS)\xrcdll_xh_split.o \
+       $(OBJS)\xrcdll_xh_stbmp.o \
+       $(OBJS)\xrcdll_xh_stbox.o \
+       $(OBJS)\xrcdll_xh_stlin.o \
+       $(OBJS)\xrcdll_xh_sttxt.o \
+       $(OBJS)\xrcdll_xh_text.o \
+       $(OBJS)\xrcdll_xh_toolb.o \
+       $(OBJS)\xrcdll_xh_tree.o \
+       $(OBJS)\xrcdll_xh_unkwn.o \
+       $(OBJS)\xrcdll_xh_wizrd.o \
+       $(OBJS)\xrcdll_xmlrsall.o
+XRCLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
+       -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
+       $(__UNICODE_DEFINE_p) -I..\..\src\xrc\..\..\..\include -I$(SETUPHDIR) -Wall \
+       -I..\..\src\xrc\..\..\include -I..\..\src\xrc\expat\xmlparse \
+       -I..\..\src\xrc\expat\xmltok $(CXXFLAGS)
+XRCLIB_OBJECTS =  \
+       $(OBJS)\xrclib_dummy.o \
+       $(OBJS)\xrclib_xmlres.o \
+       $(OBJS)\xrclib_xh_bmp.o \
+       $(OBJS)\xrclib_xh_bmpbt.o \
+       $(OBJS)\xrclib_xh_bttn.o \
+       $(OBJS)\xrclib_xh_cald.o \
+       $(OBJS)\xrclib_xh_chckb.o \
+       $(OBJS)\xrclib_xh_chckl.o \
+       $(OBJS)\xrclib_xh_choic.o \
+       $(OBJS)\xrclib_xh_combo.o \
+       $(OBJS)\xrclib_xh_dlg.o \
+       $(OBJS)\xrclib_xh_frame.o \
+       $(OBJS)\xrclib_xh_gauge.o \
+       $(OBJS)\xrclib_xh_gdctl.o \
+       $(OBJS)\xrclib_xh_html.o \
+       $(OBJS)\xrclib_xh_listb.o \
+       $(OBJS)\xrclib_xh_listc.o \
+       $(OBJS)\xrclib_xh_menu.o \
+       $(OBJS)\xrclib_xh_notbk.o \
+       $(OBJS)\xrclib_xh_panel.o \
+       $(OBJS)\xrclib_xh_radbt.o \
+       $(OBJS)\xrclib_xh_radbx.o \
+       $(OBJS)\xrclib_xh_scrol.o \
+       $(OBJS)\xrclib_xh_scwin.o \
+       $(OBJS)\xrclib_xh_sizer.o \
+       $(OBJS)\xrclib_xh_slidr.o \
+       $(OBJS)\xrclib_xh_spin.o \
+       $(OBJS)\xrclib_xh_split.o \
+       $(OBJS)\xrclib_xh_stbmp.o \
+       $(OBJS)\xrclib_xh_stbox.o \
+       $(OBJS)\xrclib_xh_stlin.o \
+       $(OBJS)\xrclib_xh_sttxt.o \
+       $(OBJS)\xrclib_xh_text.o \
+       $(OBJS)\xrclib_xh_toolb.o \
+       $(OBJS)\xrclib_xh_tree.o \
+       $(OBJS)\xrclib_xh_unkwn.o \
+       $(OBJS)\xrclib_xh_wizrd.o \
+       $(OBJS)\xrclib_xmlrsall.o

 
 ### Conditionally set variables: ###
 
 ifeq ($(GCC_VERSION),2.95)
 GCCFLAGS = -fvtable-thunks
 endif
 
 ### Conditionally set variables: ###
 
 ifeq ($(GCC_VERSION),2.95)
 GCCFLAGS = -fvtable-thunks
 endif

+ifeq ($(SHARED),0)
+LIBDIRNAME = ..\..\src\xrc\..\..\..\lib\gcc_lib$(CFG)
+endif
+ifeq ($(SHARED),1)
+LIBDIRNAME = ..\..\src\xrc\..\..\..\lib\gcc_dll$(CFG)
+endif

 ifeq ($(USE_GUI),0)
 PORTNAME = base
 endif
 ifeq ($(USE_GUI),0)
 PORTNAME = base
 endif


@@ -77,6 +128,11 @@ ifeq ($(OFFICIAL_BUILD),1)
 VENDORTAG = 
 endif
 ifeq ($(BUILD),debug)
 VENDORTAG = 
 endif
 ifeq ($(BUILD),debug)

+ifeq ($(DEBUG_FLAG),default)
+WXDEBUGFLAG = d
+endif
+endif
+ifeq ($(DEBUG_FLAG),1)

 WXDEBUGFLAG = d
 endif
 ifeq ($(SHARED),1)
 WXDEBUGFLAG = d
 endif
 ifeq ($(SHARED),1)


@@ -89,14 +145,38 @@ ifeq ($(WXUNIV),1)
 WXUNIVNAME = univ
 endif
 ifeq ($(BUILD),debug)
 WXUNIVNAME = univ
 endif
 ifeq ($(BUILD),debug)

-__DEBUGFLAG = -g
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = -g
+endif

 endif
 ifeq ($(BUILD),release)
 endif
 ifeq ($(BUILD),release)

-__DEBUGFLAG = 
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = 
+endif
+endif
+ifeq ($(DEBUG_INFO),0)
+__DEBUGINFO = 
+endif
+ifeq ($(DEBUG_INFO),1)
+__DEBUGINFO = -g

 endif
 ifeq ($(BUILD),debug)
 endif
 ifeq ($(BUILD),debug)

+ifeq ($(DEBUG_FLAG),default)

 __DEBUG_DEFINE_p = -D__WXDEBUG__
 endif
 __DEBUG_DEFINE_p = -D__WXDEBUG__
 endif

+endif
+ifeq ($(DEBUG_FLAG),1)
+__DEBUG_DEFINE_p = -D__WXDEBUG__
+endif
+ifeq ($(USE_GUI),1)
+__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
+endif

 ifeq ($(BUILD),debug)
 __OPTIMIZEFLAG = -O0
 endif
 ifeq ($(BUILD),debug)
 __OPTIMIZEFLAG = -O0
 endif


@@ -104,34 +184,43 @@ ifeq ($(BUILD),release)
 __OPTIMIZEFLAG = -O2
 endif
 ifeq ($(UNICODE),1)
 __OPTIMIZEFLAG = -O2
 endif
 ifeq ($(UNICODE),1)

-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=1
+__UNICODE_DEFINE_p = -D_UNICODE
+endif
+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_ADV_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv

 endif
 ifeq ($(MONOLITHIC),0)
 __WXLIB_BASE_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)
 endif
 ifeq ($(MONOLITHIC),0)
 endif
 ifeq ($(MONOLITHIC),0)
 __WXLIB_BASE_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)
 endif
 ifeq ($(MONOLITHIC),0)

-__WXLIB_CORE_p = -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core
+__WXLIB_CORE_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core

 endif
 ifeq ($(MONOLITHIC),0)
 endif
 ifeq ($(MONOLITHIC),0)

-__WXLIB_HTML_p = -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html
+__WXLIB_HTML_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html

 endif
 ifeq ($(MONOLITHIC),1)
 endif
 ifeq ($(MONOLITHIC),1)

-__WXLIB_MONO_p = -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+__WXLIB_MONO_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_XML_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml

 endif
 ifeq ($(WXUNIV),1)
 __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
 endif
 ifeq ($(SHARED),1)
 endif
 ifeq ($(WXUNIV),1)
 __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
 endif
 ifeq ($(SHARED),1)

-__install_xrcdll___depname = install_xrcdll
+__xrcdll___depname = \
+       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc_gcc$(VENDORTAG).dll

 endif
 ifeq ($(SHARED),0)
 endif
 ifeq ($(SHARED),0)

-__install_xrclib___depname = install_xrclib
-endif
-ifeq ($(SHARED),1)
-__xrcdll___depname = ..\..\src\xrc\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc_gcc$(VENDORTAG).dll
-endif
-ifeq ($(SHARED),0)
-__xrclib___depname = ..\..\src\xrc\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.a
+__xrclib___depname = \
+       $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.a

 endif
 
 
 endif
 
 


@@ -143,291 +232,250 @@ $(OBJS):
 
 all: $(__xrcdll___depname) $(__xrclib___depname)
 
 
 all: $(__xrcdll___depname) $(__xrclib___depname)
 

-$(OBJS)\xrcdll_dummy.o: ../../src/xrc\..\..\..\src\msw\dummy.cpp
-       $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $<
-
-$(OBJS)\xrcdll_xh_bmp.o: ../../src/xrc\xh_bmp.cpp
+$(OBJS)\xrcdll_dummy.o: ../../src/xrc/../../../src/msw/dummy.cpp

        $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
        $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 

-$(OBJS)\xrcdll_xh_bmpbt.o: ../../src/xrc\xh_bmpbt.cpp
+$(OBJS)\xrcdll_xh_bmp.o: ../../src/xrc/xh_bmp.cpp

        $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
        $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 

-$(OBJS)\xrcdll_xh_bttn.o: ../../src/xrc\xh_bttn.cpp
+$(OBJS)\xrcdll_xh_bmpbt.o: ../../src/xrc/xh_bmpbt.cpp

        $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
        $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 

-$(OBJS)\xrcdll_xh_cald.o: ../../src/xrc\xh_cald.cpp
+$(OBJS)\xrcdll_xh_bttn.o: ../../src/xrc/xh_bttn.cpp

        $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
        $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 

-$(OBJS)\xrcdll_xh_chckb.o: ../../src/xrc\xh_chckb.cpp
+$(OBJS)\xrcdll_xh_cald.o: ../../src/xrc/xh_cald.cpp

        $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
        $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 

-$(OBJS)\xrcdll_xh_chckl.o: ../../src/xrc\xh_chckl.cpp
+$(OBJS)\xrcdll_xh_chckb.o: ../../src/xrc/xh_chckb.cpp

        $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
        $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 

-$(OBJS)\xrcdll_xh_choic.o: ../../src/xrc\xh_choic.cpp
+$(OBJS)\xrcdll_xh_chckl.o: ../../src/xrc/xh_chckl.cpp

        $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
        $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 

-$(OBJS)\xrcdll_xh_combo.o: ../../src/xrc\xh_combo.cpp
+$(OBJS)\xrcdll_xh_choic.o: ../../src/xrc/xh_choic.cpp

        $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
        $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 

-$(OBJS)\xrcdll_xh_dlg.o: ../../src/xrc\xh_dlg.cpp
+$(OBJS)\xrcdll_xh_combo.o: ../../src/xrc/xh_combo.cpp

        $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
        $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 

-$(OBJS)\xrcdll_xh_frame.o: ../../src/xrc\xh_frame.cpp
+$(OBJS)\xrcdll_xh_dlg.o: ../../src/xrc/xh_dlg.cpp

        $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
        $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 

-$(OBJS)\xrcdll_xh_gauge.o: ../../src/xrc\xh_gauge.cpp
+$(OBJS)\xrcdll_xh_frame.o: ../../src/xrc/xh_frame.cpp

        $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
        $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 

-$(OBJS)\xrcdll_xh_gdctl.o: ../../src/xrc\xh_gdctl.cpp
+$(OBJS)\xrcdll_xh_gauge.o: ../../src/xrc/xh_gauge.cpp

        $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
        $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 

-$(OBJS)\xrcdll_xh_html.o: ../../src/xrc\xh_html.cpp
+$(OBJS)\xrcdll_xh_gdctl.o: ../../src/xrc/xh_gdctl.cpp

        $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
        $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 

-$(OBJS)\xrcdll_xh_listb.o: ../../src/xrc\xh_listb.cpp
+$(OBJS)\xrcdll_xh_html.o: ../../src/xrc/xh_html.cpp

        $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
        $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 

-$(OBJS)\xrcdll_xh_listc.o: ../../src/xrc\xh_listc.cpp
+$(OBJS)\xrcdll_xh_listb.o: ../../src/xrc/xh_listb.cpp

        $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
        $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 

-$(OBJS)\xrcdll_xh_menu.o: ../../src/xrc\xh_menu.cpp
+$(OBJS)\xrcdll_xh_listc.o: ../../src/xrc/xh_listc.cpp

        $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
        $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 

-$(OBJS)\xrcdll_xh_notbk.o: ../../src/xrc\xh_notbk.cpp
+$(OBJS)\xrcdll_xh_menu.o: ../../src/xrc/xh_menu.cpp

        $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
        $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 

-$(OBJS)\xrcdll_xh_panel.o: ../../src/xrc\xh_panel.cpp
+$(OBJS)\xrcdll_xh_notbk.o: ../../src/xrc/xh_notbk.cpp

        $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
        $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 

-$(OBJS)\xrcdll_xh_radbt.o: ../../src/xrc\xh_radbt.cpp
+$(OBJS)\xrcdll_xh_panel.o: ../../src/xrc/xh_panel.cpp

        $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
        $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 

-$(OBJS)\xrcdll_xh_radbx.o: ../../src/xrc\xh_radbx.cpp
+$(OBJS)\xrcdll_xh_radbt.o: ../../src/xrc/xh_radbt.cpp

        $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
        $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 

-$(OBJS)\xrcdll_xh_scrol.o: ../../src/xrc\xh_scrol.cpp
+$(OBJS)\xrcdll_xh_radbx.o: ../../src/xrc/xh_radbx.cpp

        $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
        $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 

-$(OBJS)\xrcdll_xh_scwin.o: ../../src/xrc\xh_scwin.cpp
+$(OBJS)\xrcdll_xh_scrol.o: ../../src/xrc/xh_scrol.cpp

        $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
        $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 

-$(OBJS)\xrcdll_xh_sizer.o: ../../src/xrc\xh_sizer.cpp
+$(OBJS)\xrcdll_xh_scwin.o: ../../src/xrc/xh_scwin.cpp

        $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
        $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 

-$(OBJS)\xrcdll_xh_slidr.o: ../../src/xrc\xh_slidr.cpp
+$(OBJS)\xrcdll_xh_sizer.o: ../../src/xrc/xh_sizer.cpp

        $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
        $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 

-$(OBJS)\xrcdll_xh_spin.o: ../../src/xrc\xh_spin.cpp
+$(OBJS)\xrcdll_xh_slidr.o: ../../src/xrc/xh_slidr.cpp

        $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
        $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 

-$(OBJS)\xrcdll_xh_split.o: ../../src/xrc\xh_split.cpp
+$(OBJS)\xrcdll_xh_spin.o: ../../src/xrc/xh_spin.cpp

        $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
        $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 

-$(OBJS)\xrcdll_xh_stbmp.o: ../../src/xrc\xh_stbmp.cpp
+$(OBJS)\xrcdll_xh_split.o: ../../src/xrc/xh_split.cpp

        $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
        $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 

-$(OBJS)\xrcdll_xh_stbox.o: ../../src/xrc\xh_stbox.cpp
+$(OBJS)\xrcdll_xh_stbmp.o: ../../src/xrc/xh_stbmp.cpp

        $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
        $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 

-$(OBJS)\xrcdll_xh_stlin.o: ../../src/xrc\xh_stlin.cpp
+$(OBJS)\xrcdll_xh_stbox.o: ../../src/xrc/xh_stbox.cpp

        $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
        $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 

-$(OBJS)\xrcdll_xh_sttxt.o: ../../src/xrc\xh_sttxt.cpp
+$(OBJS)\xrcdll_xh_stlin.o: ../../src/xrc/xh_stlin.cpp

        $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
        $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 

-$(OBJS)\xrcdll_xh_text.o: ../../src/xrc\xh_text.cpp
+$(OBJS)\xrcdll_xh_sttxt.o: ../../src/xrc/xh_sttxt.cpp

        $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
        $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 

-$(OBJS)\xrcdll_xh_toolb.o: ../../src/xrc\xh_toolb.cpp
+$(OBJS)\xrcdll_xh_text.o: ../../src/xrc/xh_text.cpp

        $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
        $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 

-$(OBJS)\xrcdll_xh_tree.o: ../../src/xrc\xh_tree.cpp
+$(OBJS)\xrcdll_xh_toolb.o: ../../src/xrc/xh_toolb.cpp

        $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
        $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 

-$(OBJS)\xrcdll_xh_unkwn.o: ../../src/xrc\xh_unkwn.cpp
+$(OBJS)\xrcdll_xh_tree.o: ../../src/xrc/xh_tree.cpp

        $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
        $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 

-$(OBJS)\xrcdll_xh_wizrd.o: ../../src/xrc\xh_wizrd.cpp
+$(OBJS)\xrcdll_xh_unkwn.o: ../../src/xrc/xh_unkwn.cpp

        $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
        $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 

-$(OBJS)\xrcdll_xml.o: ../../src/xrc\xml.cpp
+$(OBJS)\xrcdll_xh_wizrd.o: ../../src/xrc/xh_wizrd.cpp

        $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
        $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 

-$(OBJS)\xrcdll_xmlparse.o: ../../src/xrc\expat\xmlparse\xmlparse.c
-       $(CC) -c -o $@ $(XRCDLL_CFLAGS) $<
-
-$(OBJS)\xrcdll_xmlres.o: ../../src/xrc\xmlres.cpp
+$(OBJS)\xrcdll_xmlres.o: ../../src/xrc/xmlres.cpp

        $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
        $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 

-$(OBJS)\xrcdll_xmlrole.o: ../../src/xrc\expat\xmltok\xmlrole.c
-       $(CC) -c -o $@ $(XRCDLL_CFLAGS) $<
-
-$(OBJS)\xrcdll_xmlrsall.o: ../../src/xrc\xmlrsall.cpp
+$(OBJS)\xrcdll_xmlrsall.o: ../../src/xrc/xmlrsall.cpp

        $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
        $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 

-$(OBJS)\xrcdll_xmltok.o: ../../src/xrc\expat\xmltok\xmltok.c
-       $(CC) -c -o $@ $(XRCDLL_CFLAGS) $<
-
-$(OBJS)\xrclib_dummy.o: ../../src/xrc\..\..\..\src\msw\dummy.cpp
+$(OBJS)\xrclib_dummy.o: ../../src/xrc/../../../src/msw/dummy.cpp

        $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
        $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 

-$(OBJS)\xrclib_xh_bmp.o: ../../src/xrc\xh_bmp.cpp
+$(OBJS)\xrclib_xh_bmp.o: ../../src/xrc/xh_bmp.cpp

        $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
        $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 

-$(OBJS)\xrclib_xh_bmpbt.o: ../../src/xrc\xh_bmpbt.cpp
+$(OBJS)\xrclib_xh_bmpbt.o: ../../src/xrc/xh_bmpbt.cpp

        $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
        $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 

-$(OBJS)\xrclib_xh_bttn.o: ../../src/xrc\xh_bttn.cpp
+$(OBJS)\xrclib_xh_bttn.o: ../../src/xrc/xh_bttn.cpp

        $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
        $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 

-$(OBJS)\xrclib_xh_cald.o: ../../src/xrc\xh_cald.cpp
+$(OBJS)\xrclib_xh_cald.o: ../../src/xrc/xh_cald.cpp

        $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
        $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 

-$(OBJS)\xrclib_xh_chckb.o: ../../src/xrc\xh_chckb.cpp
+$(OBJS)\xrclib_xh_chckb.o: ../../src/xrc/xh_chckb.cpp

        $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
        $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 

-$(OBJS)\xrclib_xh_chckl.o: ../../src/xrc\xh_chckl.cpp
+$(OBJS)\xrclib_xh_chckl.o: ../../src/xrc/xh_chckl.cpp

        $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
        $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 

-$(OBJS)\xrclib_xh_choic.o: ../../src/xrc\xh_choic.cpp
+$(OBJS)\xrclib_xh_choic.o: ../../src/xrc/xh_choic.cpp

        $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
        $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 

-$(OBJS)\xrclib_xh_combo.o: ../../src/xrc\xh_combo.cpp
+$(OBJS)\xrclib_xh_combo.o: ../../src/xrc/xh_combo.cpp

        $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
        $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 

-$(OBJS)\xrclib_xh_dlg.o: ../../src/xrc\xh_dlg.cpp
+$(OBJS)\xrclib_xh_dlg.o: ../../src/xrc/xh_dlg.cpp

        $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
        $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 

-$(OBJS)\xrclib_xh_frame.o: ../../src/xrc\xh_frame.cpp
+$(OBJS)\xrclib_xh_frame.o: ../../src/xrc/xh_frame.cpp

        $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
        $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 

-$(OBJS)\xrclib_xh_gauge.o: ../../src/xrc\xh_gauge.cpp
+$(OBJS)\xrclib_xh_gauge.o: ../../src/xrc/xh_gauge.cpp

        $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
        $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 

-$(OBJS)\xrclib_xh_gdctl.o: ../../src/xrc\xh_gdctl.cpp
+$(OBJS)\xrclib_xh_gdctl.o: ../../src/xrc/xh_gdctl.cpp

        $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
        $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 

-$(OBJS)\xrclib_xh_html.o: ../../src/xrc\xh_html.cpp
+$(OBJS)\xrclib_xh_html.o: ../../src/xrc/xh_html.cpp

        $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
        $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 

-$(OBJS)\xrclib_xh_listb.o: ../../src/xrc\xh_listb.cpp
+$(OBJS)\xrclib_xh_listb.o: ../../src/xrc/xh_listb.cpp

        $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
        $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 

-$(OBJS)\xrclib_xh_listc.o: ../../src/xrc\xh_listc.cpp
+$(OBJS)\xrclib_xh_listc.o: ../../src/xrc/xh_listc.cpp

        $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
        $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 

-$(OBJS)\xrclib_xh_menu.o: ../../src/xrc\xh_menu.cpp
+$(OBJS)\xrclib_xh_menu.o: ../../src/xrc/xh_menu.cpp

        $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
        $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 

-$(OBJS)\xrclib_xh_notbk.o: ../../src/xrc\xh_notbk.cpp
+$(OBJS)\xrclib_xh_notbk.o: ../../src/xrc/xh_notbk.cpp

        $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
        $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 

-$(OBJS)\xrclib_xh_panel.o: ../../src/xrc\xh_panel.cpp
+$(OBJS)\xrclib_xh_panel.o: ../../src/xrc/xh_panel.cpp

        $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
        $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 

-$(OBJS)\xrclib_xh_radbt.o: ../../src/xrc\xh_radbt.cpp
+$(OBJS)\xrclib_xh_radbt.o: ../../src/xrc/xh_radbt.cpp

        $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
        $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 

-$(OBJS)\xrclib_xh_radbx.o: ../../src/xrc\xh_radbx.cpp
+$(OBJS)\xrclib_xh_radbx.o: ../../src/xrc/xh_radbx.cpp

        $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
        $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 

-$(OBJS)\xrclib_xh_scrol.o: ../../src/xrc\xh_scrol.cpp
+$(OBJS)\xrclib_xh_scrol.o: ../../src/xrc/xh_scrol.cpp

        $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
        $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 

-$(OBJS)\xrclib_xh_scwin.o: ../../src/xrc\xh_scwin.cpp
+$(OBJS)\xrclib_xh_scwin.o: ../../src/xrc/xh_scwin.cpp

        $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
        $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 

-$(OBJS)\xrclib_xh_sizer.o: ../../src/xrc\xh_sizer.cpp
+$(OBJS)\xrclib_xh_sizer.o: ../../src/xrc/xh_sizer.cpp

        $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
        $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 

-$(OBJS)\xrclib_xh_slidr.o: ../../src/xrc\xh_slidr.cpp
+$(OBJS)\xrclib_xh_slidr.o: ../../src/xrc/xh_slidr.cpp

        $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
        $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 

-$(OBJS)\xrclib_xh_spin.o: ../../src/xrc\xh_spin.cpp
+$(OBJS)\xrclib_xh_spin.o: ../../src/xrc/xh_spin.cpp

        $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
        $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 

-$(OBJS)\xrclib_xh_split.o: ../../src/xrc\xh_split.cpp
+$(OBJS)\xrclib_xh_split.o: ../../src/xrc/xh_split.cpp

        $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
        $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 

-$(OBJS)\xrclib_xh_stbmp.o: ../../src/xrc\xh_stbmp.cpp
+$(OBJS)\xrclib_xh_stbmp.o: ../../src/xrc/xh_stbmp.cpp

        $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
        $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 

-$(OBJS)\xrclib_xh_stbox.o: ../../src/xrc\xh_stbox.cpp
+$(OBJS)\xrclib_xh_stbox.o: ../../src/xrc/xh_stbox.cpp

        $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
        $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 

-$(OBJS)\xrclib_xh_stlin.o: ../../src/xrc\xh_stlin.cpp
+$(OBJS)\xrclib_xh_stlin.o: ../../src/xrc/xh_stlin.cpp

        $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
        $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 

-$(OBJS)\xrclib_xh_sttxt.o: ../../src/xrc\xh_sttxt.cpp
+$(OBJS)\xrclib_xh_sttxt.o: ../../src/xrc/xh_sttxt.cpp

        $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
        $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 

-$(OBJS)\xrclib_xh_text.o: ../../src/xrc\xh_text.cpp
+$(OBJS)\xrclib_xh_text.o: ../../src/xrc/xh_text.cpp

        $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
        $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 

-$(OBJS)\xrclib_xh_toolb.o: ../../src/xrc\xh_toolb.cpp
+$(OBJS)\xrclib_xh_toolb.o: ../../src/xrc/xh_toolb.cpp

        $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
        $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 

-$(OBJS)\xrclib_xh_tree.o: ../../src/xrc\xh_tree.cpp
+$(OBJS)\xrclib_xh_tree.o: ../../src/xrc/xh_tree.cpp

        $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
        $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 

-$(OBJS)\xrclib_xh_unkwn.o: ../../src/xrc\xh_unkwn.cpp
+$(OBJS)\xrclib_xh_unkwn.o: ../../src/xrc/xh_unkwn.cpp

        $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
        $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 

-$(OBJS)\xrclib_xh_wizrd.o: ../../src/xrc\xh_wizrd.cpp
+$(OBJS)\xrclib_xh_wizrd.o: ../../src/xrc/xh_wizrd.cpp

        $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
        $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 

-$(OBJS)\xrclib_xml.o: ../../src/xrc\xml.cpp
+$(OBJS)\xrclib_xmlres.o: ../../src/xrc/xmlres.cpp

        $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
        $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 

-$(OBJS)\xrclib_xmlparse.o: ../../src/xrc\expat\xmlparse\xmlparse.c
-       $(CC) -c -o $@ $(XRCLIB_CFLAGS) $<
-
-$(OBJS)\xrclib_xmlres.o: ../../src/xrc\xmlres.cpp
-       $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
-
-$(OBJS)\xrclib_xmlrole.o: ../../src/xrc\expat\xmltok\xmlrole.c
-       $(CC) -c -o $@ $(XRCLIB_CFLAGS) $<
-
-$(OBJS)\xrclib_xmlrsall.o: ../../src/xrc\xmlrsall.cpp
+$(OBJS)\xrclib_xmlrsall.o: ../../src/xrc/xmlrsall.cpp

        $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
        $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 

-$(OBJS)\xrclib_xmltok.o: ../../src/xrc\expat\xmltok\xmltok.c
-       $(CC) -c -o $@ $(XRCLIB_CFLAGS) $<
-

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

-       -if exist ..\..\src\xrc\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc_gcc$(VENDORTAG).dll del ..\..\src\xrc\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc_gcc$(VENDORTAG).dll
-       -if exist ..\..\src\xrc\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.a del ..\..\src\xrc\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.a
-       -if exist ..\..\src\xrc\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.a del ..\..\src\xrc\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.a
-
-install: all $(__install_xrcdll___depname) $(__install_xrclib___depname)
-
-ifeq ($(SHARED),1)
-install_xrcdll: 
-       mkdir /usr/local/lib
-       copy /Y ..\..\src\xrc\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.a /usr/local/lib
-       copy /Y ..\..\src\xrc\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc_gcc$(VENDORTAG).dll /usr/local/lib
-endif
-
-ifeq ($(SHARED),0)
-install_xrclib: 
-       mkdir /usr/local/lib
-       copy /Y ..\..\src\xrc\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.a /usr/local/lib
-endif
-
-uninstall: 
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc_gcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc_gcc$(VENDORTAG).dll
+       -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.a
+       -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.a

 
 ifeq ($(SHARED),1)
 
 ifeq ($(SHARED),1)

-..\..\src\xrc\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc_gcc$(VENDORTAG).dll: $(OBJS)\xrcdll_dummy.o $(OBJS)\xrcdll_xmlparse.o $(OBJS)\xrcdll_xmltok.o $(OBJS)\xrcdll_xmlrole.o $(OBJS)\xrcdll_xml.o $(OBJS)\xrcdll_xmlres.o $(OBJS)\xrcdll_xh_bmp.o $(OBJS)\xrcdll_xh_bmpbt.o $(OBJS)\xrcdll_xh_bttn.o $(OBJS)\xrcdll_xh_cald.o $(OBJS)\xrcdll_xh_chckb.o $(OBJS)\xrcdll_xh_chckl.o $(OBJS)\xrcdll_xh_choic.o $(OBJS)\xrcdll_xh_combo.o $(OBJS)\xrcdll_xh_dlg.o $(OBJS)\xrcdll_xh_frame.o $(OBJS)\xrcdll_xh_gauge.o $(OBJS)\xrcdll_xh_gdctl.o $(OBJS)\xrcdll_xh_html.o $(OBJS)\xrcdll_xh_listb.o $(OBJS)\xrcdll_xh_listc.o $(OBJS)\xrcdll_xh_menu.o $(OBJS)\xrcdll_xh_notbk.o $(OBJS)\xrcdll_xh_panel.o $(OBJS)\xrcdll_xh_radbt.o $(OBJS)\xrcdll_xh_radbx.o $(OBJS)\xrcdll_xh_scrol.o $(OBJS)\xrcdll_xh_scwin.o $(OBJS)\xrcdll_xh_sizer.o $(OBJS)\xrcdll_xh_slidr.o $(OBJS)\xrcdll_xh_spin.o $(OBJS)\xrcdll_xh_split.o $(OBJS)\xrcdll_xh_stbmp.o $(OBJS)\xrcdll_xh_stbox.o $(OBJS)\xrcdll_xh_stlin.o $(OBJS)\xrcdll_xh_sttxt.o $(OBJS)\xrcdll_xh_text.o $(OBJS)\xrcdll_xh_toolb.o $(OBJS)\xrcdll_xh_tree.o $(OBJS)\xrcdll_xh_unkwn.o $(OBJS)\xrcdll_xh_wizrd.o $(OBJS)\xrcdll_xmlrsall.o
-       $(CXX) -shared -o $@  $(OBJS)\xrcdll_dummy.o $(OBJS)\xrcdll_xmlparse.o $(OBJS)\xrcdll_xmltok.o $(OBJS)\xrcdll_xmlrole.o $(OBJS)\xrcdll_xml.o $(OBJS)\xrcdll_xmlres.o $(OBJS)\xrcdll_xh_bmp.o $(OBJS)\xrcdll_xh_bmpbt.o $(OBJS)\xrcdll_xh_bttn.o $(OBJS)\xrcdll_xh_cald.o $(OBJS)\xrcdll_xh_chckb.o $(OBJS)\xrcdll_xh_chckl.o $(OBJS)\xrcdll_xh_choic.o $(OBJS)\xrcdll_xh_combo.o $(OBJS)\xrcdll_xh_dlg.o $(OBJS)\xrcdll_xh_frame.o $(OBJS)\xrcdll_xh_gauge.o $(OBJS)\xrcdll_xh_gdctl.o $(OBJS)\xrcdll_xh_html.o $(OBJS)\xrcdll_xh_listb.o $(OBJS)\xrcdll_xh_listc.o $(OBJS)\xrcdll_xh_menu.o $(OBJS)\xrcdll_xh_notbk.o $(OBJS)\xrcdll_xh_panel.o $(OBJS)\xrcdll_xh_radbt.o $(OBJS)\xrcdll_xh_radbx.o $(OBJS)\xrcdll_xh_scrol.o $(OBJS)\xrcdll_xh_scwin.o $(OBJS)\xrcdll_xh_sizer.o $(OBJS)\xrcdll_xh_slidr.o $(OBJS)\xrcdll_xh_spin.o $(OBJS)\xrcdll_xh_split.o $(OBJS)\xrcdll_xh_stbmp.o $(OBJS)\xrcdll_xh_stbox.o $(OBJS)\xrcdll_xh_stlin.o $(OBJS)\xrcdll_xh_sttxt.o $(OBJS)\xrcdll_xh_text.o $(OBJS)\xrcdll_xh_toolb.o $(OBJS)\xrcdll_xh_tree.o $(OBJS)\xrcdll_xh_unkwn.o $(OBJS)\xrcdll_xh_wizrd.o $(OBJS)\xrcdll_xmlrsall.o $(LDFLAGS) -Wl,--out-implib,$(OBJS)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.a $(__DEBUGFLAG) -mthreads -L..\..\src\xrc\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--out-implib,..\..\src\xrc\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(LIBPREFIX)wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.a  $(__WXLIB_MONO_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXDEBUGFLAG)  -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32  $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc_gcc$(VENDORTAG).dll: $(XRCDLL_OBJECTS)
+       $(CXX) -shared -o $@ $(XRCDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.a  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG)  $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32  $(__WXLIB_HTML_p)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_XML_p)  $(__WXLIB_BASE_p)

 endif
 
 ifeq ($(SHARED),0)
 endif
 
 ifeq ($(SHARED),0)

-..\..\src\xrc\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.a: $(OBJS)\xrclib_dummy.o $(OBJS)\xrclib_xmlparse.o $(OBJS)\xrclib_xmltok.o $(OBJS)\xrclib_xmlrole.o $(OBJS)\xrclib_xml.o $(OBJS)\xrclib_xmlres.o $(OBJS)\xrclib_xh_bmp.o $(OBJS)\xrclib_xh_bmpbt.o $(OBJS)\xrclib_xh_bttn.o $(OBJS)\xrclib_xh_cald.o $(OBJS)\xrclib_xh_chckb.o $(OBJS)\xrclib_xh_chckl.o $(OBJS)\xrclib_xh_choic.o $(OBJS)\xrclib_xh_combo.o $(OBJS)\xrclib_xh_dlg.o $(OBJS)\xrclib_xh_frame.o $(OBJS)\xrclib_xh_gauge.o $(OBJS)\xrclib_xh_gdctl.o $(OBJS)\xrclib_xh_html.o $(OBJS)\xrclib_xh_listb.o $(OBJS)\xrclib_xh_listc.o $(OBJS)\xrclib_xh_menu.o $(OBJS)\xrclib_xh_notbk.o $(OBJS)\xrclib_xh_panel.o $(OBJS)\xrclib_xh_radbt.o $(OBJS)\xrclib_xh_radbx.o $(OBJS)\xrclib_xh_scrol.o $(OBJS)\xrclib_xh_scwin.o $(OBJS)\xrclib_xh_sizer.o $(OBJS)\xrclib_xh_slidr.o $(OBJS)\xrclib_xh_spin.o $(OBJS)\xrclib_xh_split.o $(OBJS)\xrclib_xh_stbmp.o $(OBJS)\xrclib_xh_stbox.o $(OBJS)\xrclib_xh_stlin.o $(OBJS)\xrclib_xh_sttxt.o $(OBJS)\xrclib_xh_text.o $(OBJS)\xrclib_xh_toolb.o $(OBJS)\xrclib_xh_tree.o $(OBJS)\xrclib_xh_unkwn.o $(OBJS)\xrclib_xh_wizrd.o $(OBJS)\xrclib_xmlrsall.o
+$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.a: $(XRCLIB_OBJECTS)

        if exist $@ del $@
        if exist $@ del $@

-       ar rcu $@  $(OBJS)\xrclib_dummy.o $(OBJS)\xrclib_xmlparse.o $(OBJS)\xrclib_xmltok.o $(OBJS)\xrclib_xmlrole.o $(OBJS)\xrclib_xml.o $(OBJS)\xrclib_xmlres.o $(OBJS)\xrclib_xh_bmp.o $(OBJS)\xrclib_xh_bmpbt.o $(OBJS)\xrclib_xh_bttn.o $(OBJS)\xrclib_xh_cald.o $(OBJS)\xrclib_xh_chckb.o $(OBJS)\xrclib_xh_chckl.o $(OBJS)\xrclib_xh_choic.o $(OBJS)\xrclib_xh_combo.o $(OBJS)\xrclib_xh_dlg.o $(OBJS)\xrclib_xh_frame.o $(OBJS)\xrclib_xh_gauge.o $(OBJS)\xrclib_xh_gdctl.o $(OBJS)\xrclib_xh_html.o $(OBJS)\xrclib_xh_listb.o $(OBJS)\xrclib_xh_listc.o $(OBJS)\xrclib_xh_menu.o $(OBJS)\xrclib_xh_notbk.o $(OBJS)\xrclib_xh_panel.o $(OBJS)\xrclib_xh_radbt.o $(OBJS)\xrclib_xh_radbx.o $(OBJS)\xrclib_xh_scrol.o $(OBJS)\xrclib_xh_scwin.o $(OBJS)\xrclib_xh_sizer.o $(OBJS)\xrclib_xh_slidr.o $(OBJS)\xrclib_xh_spin.o $(OBJS)\xrclib_xh_split.o $(OBJS)\xrclib_xh_stbmp.o $(OBJS)\xrclib_xh_stbox.o $(OBJS)\xrclib_xh_stlin.o $(OBJS)\xrclib_xh_sttxt.o $(OBJS)\xrclib_xh_text.o $(OBJS)\xrclib_xh_toolb.o $(OBJS)\xrclib_xh_tree.o $(OBJS)\xrclib_xh_unkwn.o $(OBJS)\xrclib_xh_wizrd.o $(OBJS)\xrclib_xmlrsall.o
+       ar rcu $@ $(XRCLIB_OBJECTS)

        ranlib $@
 endif
 
        ranlib $@
 endif
 

-.PHONY: all clean install install_xrcdll install_xrclib uninstall
+.PHONY: all clean