X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/75a0a7b7de0cb3d5645ec014b60431b5fa2c7095..adb8a71bbc0ba11aad0b417db24f7267a250b6c3:/contrib/build/xrc/makefile.gcc

diff --git a/contrib/build/xrc/makefile.gcc b/contrib/build/xrc/makefile.gcc
index e904c592d6..72f7618eec 100644
--- a/contrib/build/xrc/makefile.gcc
+++ b/contrib/build/xrc/makefile.gcc
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.1.1 (http://bakefile.sourceforge.net)
+#     Bakefile 0.1.3 (http://bakefile.sourceforge.net)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
@@ -16,10 +16,11 @@ 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) \
-	-I..\..\src\xrc\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_XRC $(CXXFLAGS)
+XRCDLL_CXXFLAGS = $(__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 \
+	$(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_0) $(CPPFLAGS) $(CXXFLAGS)
 XRCDLL_OBJECTS =  \
 	$(OBJS)\xrcdll_dummy.o \
 	$(OBJS)\xrcdll_xmlres.o \
@@ -49,6 +50,7 @@ XRCDLL_OBJECTS =  \
 	$(OBJS)\xrcdll_xh_slidr.o \
 	$(OBJS)\xrcdll_xh_spin.o \
 	$(OBJS)\xrcdll_xh_split.o \
+	$(OBJS)\xrcdll_xh_statbar.o \
 	$(OBJS)\xrcdll_xh_stbmp.o \
 	$(OBJS)\xrcdll_xh_stbox.o \
 	$(OBJS)\xrcdll_xh_stlin.o \
@@ -59,11 +61,12 @@ XRCDLL_OBJECTS =  \
 	$(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) \
+XRCLIB_CXXFLAGS = $(__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)
+	-I..\..\src\xrc\expat\xmltok $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_0) \
+	$(CPPFLAGS) $(CXXFLAGS)
 XRCLIB_OBJECTS =  \
 	$(OBJS)\xrclib_dummy.o \
 	$(OBJS)\xrclib_xmlres.o \
@@ -93,6 +96,7 @@ XRCLIB_OBJECTS =  \
 	$(OBJS)\xrclib_xh_slidr.o \
 	$(OBJS)\xrclib_xh_spin.o \
 	$(OBJS)\xrclib_xh_split.o \
+	$(OBJS)\xrclib_xh_statbar.o \
 	$(OBJS)\xrclib_xh_stbmp.o \
 	$(OBJS)\xrclib_xh_stbox.o \
 	$(OBJS)\xrclib_xh_stlin.o \
@@ -109,12 +113,6 @@ XRCLIB_OBJECTS =  \
 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
@@ -135,15 +133,57 @@ endif
 ifeq ($(DEBUG_FLAG),1)
 WXDEBUGFLAG = d
 endif
-ifeq ($(SHARED),1)
-WXDLLFLAG = dll
-endif
 ifeq ($(UNICODE),1)
 WXUNICODEFLAG = u
 endif
 ifeq ($(WXUNIV),1)
 WXUNIVNAME = univ
 endif
+ifeq ($(SHARED),1)
+WXDLLFLAG = dll
+endif
+ifeq ($(SHARED),1)
+__xrcdll___depname = \
+	$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc_gcc$(VENDORTAG).dll
+endif
+ifeq ($(MONOLITHIC),1)
+__WXLIB_MONO_p = \
+	-lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
+endif
+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_HTML_p = \
+	-lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_ADV_p = \
+	-lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_CORE_p = \
+	-lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_XML_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_BASE_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+endif
+ifeq ($(SHARED),0)
+__xrclib___depname = \
+	$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.a
+endif
 ifeq ($(BUILD),debug)
 ifeq ($(DEBUG_INFO),default)
 __DEBUGINFO = -g
@@ -161,66 +201,42 @@ ifeq ($(DEBUG_INFO),1)
 __DEBUGINFO = -g
 endif
 ifeq ($(BUILD),debug)
-ifeq ($(DEBUG_FLAG),default)
-__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),release)
 __OPTIMIZEFLAG = -O2
 endif
-ifeq ($(UNICODE),1)
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=1
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG = -fno-rtti
 endif
-ifeq ($(MSLU),1)
-__UNICOWS_LIB_p = -lunicows
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG = 
 endif
-ifeq ($(MONOLITHIC),0)
-__WXLIB_ADV_p = \
-	-lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv
-endif
-ifeq ($(MONOLITHIC),0)
-__WXLIB_BASE_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG_0 = -fno-exceptions
 endif
-ifeq ($(MONOLITHIC),0)
-__WXLIB_CORE_p = \
-	-lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG_0 = 
 endif
-ifeq ($(MONOLITHIC),0)
-__WXLIB_HTML_p = \
-	-lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
 endif
-ifeq ($(MONOLITHIC),1)
-__WXLIB_MONO_p = \
-	-lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+ifeq ($(BUILD),debug)
+ifeq ($(DEBUG_FLAG),default)
+__DEBUG_DEFINE_p = -D__WXDEBUG__
 endif
-ifeq ($(MONOLITHIC),0)
-__WXLIB_XML_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml
 endif
-ifeq ($(WXUNIV),1)
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+ifeq ($(DEBUG_FLAG),1)
+__DEBUG_DEFINE_p = -D__WXDEBUG__
 endif
-ifeq ($(SHARED),1)
-__xrcdll___depname = \
-	$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc_gcc$(VENDORTAG).dll
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p = -D_UNICODE
 endif
 ifeq ($(SHARED),0)
-__xrclib___depname = \
-	$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.a
+LIBDIRNAME = ..\..\src\xrc\..\..\..\lib\gcc_lib$(CFG)
+endif
+ifeq ($(SHARED),1)
+LIBDIRNAME = ..\..\src\xrc\..\..\..\lib\gcc_dll$(CFG)
 endif
 
 
@@ -232,250 +248,256 @@ $(OBJS):
 
 all: $(__xrcdll___depname) $(__xrclib___depname)
 
-$(OBJS)\xrcdll_dummy.o: ../../src/xrc\..\..\..\src\msw\dummy.cpp
+clean: 
+	-if exist $(OBJS)\*.o del $(OBJS)\*.o
+	-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)
+$(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$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG)  $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32  $(__WXLIB_HTML_p)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_XML_p)  $(__WXLIB_BASE_p)
+endif
+
+ifeq ($(SHARED),0)
+$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.a: $(XRCLIB_OBJECTS)
+	if exist $@ del $@
+	ar rcu $@ $(XRCLIB_OBJECTS)
+	ranlib $@
+endif
+
+$(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_xmlres.o: ../../src/xrc/xmlres.cpp
 	$(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) $<
 
-$(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) $<
 
-$(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) $<
 
-$(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) $<
 
-$(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) $<
 
-$(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) $<
 
-$(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) $<
 
-$(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) $<
 
-$(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) $<
 
-$(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) $<
 
-$(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) $<
 
-$(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) $<
 
-$(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) $<
 
-$(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) $<
 
-$(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) $<
 
-$(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) $<
 
-$(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) $<
 
-$(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) $<
 
-$(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) $<
 
-$(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) $<
 
-$(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) $<
 
-$(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) $<
 
-$(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) $<
 
-$(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) $<
 
-$(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) $<
 
-$(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) $<
 
-$(OBJS)\xrcdll_xh_stbox.o: ../../src/xrc\xh_stbox.cpp
+$(OBJS)\xrcdll_xh_statbar.o: ../../src/xrc/xh_statbar.cpp
 	$(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
-$(OBJS)\xrcdll_xh_stlin.o: ../../src/xrc\xh_stlin.cpp
+$(OBJS)\xrcdll_xh_stbmp.o: ../../src/xrc/xh_stbmp.cpp
 	$(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
-$(OBJS)\xrcdll_xh_sttxt.o: ../../src/xrc\xh_sttxt.cpp
+$(OBJS)\xrcdll_xh_stbox.o: ../../src/xrc/xh_stbox.cpp
 	$(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
-$(OBJS)\xrcdll_xh_text.o: ../../src/xrc\xh_text.cpp
+$(OBJS)\xrcdll_xh_stlin.o: ../../src/xrc/xh_stlin.cpp
 	$(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
-$(OBJS)\xrcdll_xh_toolb.o: ../../src/xrc\xh_toolb.cpp
+$(OBJS)\xrcdll_xh_sttxt.o: ../../src/xrc/xh_sttxt.cpp
 	$(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
-$(OBJS)\xrcdll_xh_tree.o: ../../src/xrc\xh_tree.cpp
+$(OBJS)\xrcdll_xh_text.o: ../../src/xrc/xh_text.cpp
 	$(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
-$(OBJS)\xrcdll_xh_unkwn.o: ../../src/xrc\xh_unkwn.cpp
+$(OBJS)\xrcdll_xh_toolb.o: ../../src/xrc/xh_toolb.cpp
 	$(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
-$(OBJS)\xrcdll_xh_wizrd.o: ../../src/xrc\xh_wizrd.cpp
+$(OBJS)\xrcdll_xh_tree.o: ../../src/xrc/xh_tree.cpp
 	$(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
-$(OBJS)\xrcdll_xmlres.o: ../../src/xrc\xmlres.cpp
+$(OBJS)\xrcdll_xh_unkwn.o: ../../src/xrc/xh_unkwn.cpp
 	$(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
-$(OBJS)\xrcdll_xmlrsall.o: ../../src/xrc\xmlrsall.cpp
+$(OBJS)\xrcdll_xh_wizrd.o: ../../src/xrc/xh_wizrd.cpp
 	$(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
-$(OBJS)\xrclib_dummy.o: ../../src/xrc\..\..\..\src\msw\dummy.cpp
-	$(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
+$(OBJS)\xrcdll_xmlrsall.o: ../../src/xrc/xmlrsall.cpp
+	$(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
-$(OBJS)\xrclib_xh_bmp.o: ../../src/xrc\xh_bmp.cpp
+$(OBJS)\xrclib_dummy.o: ../../src/xrc/../../../src/msw/dummy.cpp
 	$(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
-$(OBJS)\xrclib_xh_bmpbt.o: ../../src/xrc\xh_bmpbt.cpp
+$(OBJS)\xrclib_xmlres.o: ../../src/xrc/xmlres.cpp
 	$(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
-$(OBJS)\xrclib_xh_bttn.o: ../../src/xrc\xh_bttn.cpp
+$(OBJS)\xrclib_xh_bmp.o: ../../src/xrc/xh_bmp.cpp
 	$(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
-$(OBJS)\xrclib_xh_cald.o: ../../src/xrc\xh_cald.cpp
+$(OBJS)\xrclib_xh_bmpbt.o: ../../src/xrc/xh_bmpbt.cpp
 	$(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
-$(OBJS)\xrclib_xh_chckb.o: ../../src/xrc\xh_chckb.cpp
+$(OBJS)\xrclib_xh_bttn.o: ../../src/xrc/xh_bttn.cpp
 	$(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
-$(OBJS)\xrclib_xh_chckl.o: ../../src/xrc\xh_chckl.cpp
+$(OBJS)\xrclib_xh_cald.o: ../../src/xrc/xh_cald.cpp
 	$(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
-$(OBJS)\xrclib_xh_choic.o: ../../src/xrc\xh_choic.cpp
+$(OBJS)\xrclib_xh_chckb.o: ../../src/xrc/xh_chckb.cpp
 	$(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
-$(OBJS)\xrclib_xh_combo.o: ../../src/xrc\xh_combo.cpp
+$(OBJS)\xrclib_xh_chckl.o: ../../src/xrc/xh_chckl.cpp
 	$(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
-$(OBJS)\xrclib_xh_dlg.o: ../../src/xrc\xh_dlg.cpp
+$(OBJS)\xrclib_xh_choic.o: ../../src/xrc/xh_choic.cpp
 	$(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
-$(OBJS)\xrclib_xh_frame.o: ../../src/xrc\xh_frame.cpp
+$(OBJS)\xrclib_xh_combo.o: ../../src/xrc/xh_combo.cpp
 	$(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
-$(OBJS)\xrclib_xh_gauge.o: ../../src/xrc\xh_gauge.cpp
+$(OBJS)\xrclib_xh_dlg.o: ../../src/xrc/xh_dlg.cpp
 	$(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
-$(OBJS)\xrclib_xh_gdctl.o: ../../src/xrc\xh_gdctl.cpp
+$(OBJS)\xrclib_xh_frame.o: ../../src/xrc/xh_frame.cpp
 	$(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
-$(OBJS)\xrclib_xh_html.o: ../../src/xrc\xh_html.cpp
+$(OBJS)\xrclib_xh_gauge.o: ../../src/xrc/xh_gauge.cpp
 	$(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
-$(OBJS)\xrclib_xh_listb.o: ../../src/xrc\xh_listb.cpp
+$(OBJS)\xrclib_xh_gdctl.o: ../../src/xrc/xh_gdctl.cpp
 	$(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
-$(OBJS)\xrclib_xh_listc.o: ../../src/xrc\xh_listc.cpp
+$(OBJS)\xrclib_xh_html.o: ../../src/xrc/xh_html.cpp
 	$(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
-$(OBJS)\xrclib_xh_menu.o: ../../src/xrc\xh_menu.cpp
+$(OBJS)\xrclib_xh_listb.o: ../../src/xrc/xh_listb.cpp
 	$(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
-$(OBJS)\xrclib_xh_notbk.o: ../../src/xrc\xh_notbk.cpp
+$(OBJS)\xrclib_xh_listc.o: ../../src/xrc/xh_listc.cpp
 	$(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
-$(OBJS)\xrclib_xh_panel.o: ../../src/xrc\xh_panel.cpp
+$(OBJS)\xrclib_xh_menu.o: ../../src/xrc/xh_menu.cpp
 	$(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
-$(OBJS)\xrclib_xh_radbt.o: ../../src/xrc\xh_radbt.cpp
+$(OBJS)\xrclib_xh_notbk.o: ../../src/xrc/xh_notbk.cpp
 	$(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
-$(OBJS)\xrclib_xh_radbx.o: ../../src/xrc\xh_radbx.cpp
+$(OBJS)\xrclib_xh_panel.o: ../../src/xrc/xh_panel.cpp
 	$(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
-$(OBJS)\xrclib_xh_scrol.o: ../../src/xrc\xh_scrol.cpp
+$(OBJS)\xrclib_xh_radbt.o: ../../src/xrc/xh_radbt.cpp
 	$(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
-$(OBJS)\xrclib_xh_scwin.o: ../../src/xrc\xh_scwin.cpp
+$(OBJS)\xrclib_xh_radbx.o: ../../src/xrc/xh_radbx.cpp
 	$(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
-$(OBJS)\xrclib_xh_sizer.o: ../../src/xrc\xh_sizer.cpp
+$(OBJS)\xrclib_xh_scrol.o: ../../src/xrc/xh_scrol.cpp
 	$(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
-$(OBJS)\xrclib_xh_slidr.o: ../../src/xrc\xh_slidr.cpp
+$(OBJS)\xrclib_xh_scwin.o: ../../src/xrc/xh_scwin.cpp
 	$(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
-$(OBJS)\xrclib_xh_spin.o: ../../src/xrc\xh_spin.cpp
+$(OBJS)\xrclib_xh_sizer.o: ../../src/xrc/xh_sizer.cpp
 	$(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
-$(OBJS)\xrclib_xh_split.o: ../../src/xrc\xh_split.cpp
+$(OBJS)\xrclib_xh_slidr.o: ../../src/xrc/xh_slidr.cpp
 	$(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
-$(OBJS)\xrclib_xh_stbmp.o: ../../src/xrc\xh_stbmp.cpp
+$(OBJS)\xrclib_xh_spin.o: ../../src/xrc/xh_spin.cpp
 	$(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
-$(OBJS)\xrclib_xh_stbox.o: ../../src/xrc\xh_stbox.cpp
+$(OBJS)\xrclib_xh_split.o: ../../src/xrc/xh_split.cpp
 	$(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
-$(OBJS)\xrclib_xh_stlin.o: ../../src/xrc\xh_stlin.cpp
+$(OBJS)\xrclib_xh_statbar.o: ../../src/xrc/xh_statbar.cpp
 	$(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
-$(OBJS)\xrclib_xh_sttxt.o: ../../src/xrc\xh_sttxt.cpp
+$(OBJS)\xrclib_xh_stbmp.o: ../../src/xrc/xh_stbmp.cpp
 	$(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
-$(OBJS)\xrclib_xh_text.o: ../../src/xrc\xh_text.cpp
+$(OBJS)\xrclib_xh_stbox.o: ../../src/xrc/xh_stbox.cpp
 	$(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
-$(OBJS)\xrclib_xh_toolb.o: ../../src/xrc\xh_toolb.cpp
+$(OBJS)\xrclib_xh_stlin.o: ../../src/xrc/xh_stlin.cpp
 	$(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
-$(OBJS)\xrclib_xh_tree.o: ../../src/xrc\xh_tree.cpp
+$(OBJS)\xrclib_xh_sttxt.o: ../../src/xrc/xh_sttxt.cpp
 	$(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
-$(OBJS)\xrclib_xh_unkwn.o: ../../src/xrc\xh_unkwn.cpp
+$(OBJS)\xrclib_xh_text.o: ../../src/xrc/xh_text.cpp
 	$(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
-$(OBJS)\xrclib_xh_wizrd.o: ../../src/xrc\xh_wizrd.cpp
+$(OBJS)\xrclib_xh_toolb.o: ../../src/xrc/xh_toolb.cpp
 	$(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
-$(OBJS)\xrclib_xmlres.o: ../../src/xrc\xmlres.cpp
+$(OBJS)\xrclib_xh_tree.o: ../../src/xrc/xh_tree.cpp
 	$(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
-$(OBJS)\xrclib_xmlrsall.o: ../../src/xrc\xmlrsall.cpp
+$(OBJS)\xrclib_xh_unkwn.o: ../../src/xrc/xh_unkwn.cpp
 	$(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
-clean: 
-	-if exist $(OBJS)\*.o del $(OBJS)\*.o
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc_gcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(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)
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(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
+$(OBJS)\xrclib_xh_wizrd.o: ../../src/xrc/xh_wizrd.cpp
+	$(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
-ifeq ($(SHARED),0)
-$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.a: $(XRCLIB_OBJECTS)
-	if exist $@ del $@
-	ar rcu $@ $(XRCLIB_OBJECTS)
-	ranlib $@
-endif
+$(OBJS)\xrclib_xmlrsall.o: ../../src/xrc/xmlrsall.cpp
+	$(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
 .PHONY: all clean