fixes

[wxWidgets.git] / contrib / src / xrc / makefile.b32

diff --git a/contrib/src/xrc/makefile.b32 b/contrib/src/xrc/makefile.b32
index dc7d4fa68a9c2b49bb38840d946cf21b3b24dde6..3a08c27f73c60005825fe1d3e49f24f14280ea06 100644 (file)
--- a/contrib/src/xrc/makefile.b32
+++ b/contrib/src/xrc/makefile.b32
@@ -9,32 +9,74 @@
 
 WXDIR = $(WXWIN)
 
+LIBTARGET=wxxrc
+
+!include $(WXDIR)\src\makeb32.env
+
 expat_dir = $(WXDIR)\contrib\src\xrc\expat
 XMLPARSEDIR = $(expat_dir)\xmlparse 
 XMLTOKDIR = $(expat_dir)\xmltok
 
-EXPAT_DEFS=-I$(expat_dir)\xmlparse -I$(expat_dir)\xmltok
-EXPAT_OBJECTS=xmltok.obj xmlrole.obj xmlparse.obj
+EXPAT_DEFS=-I$(expat_dir)\xmlparse -I$(expat_dir)\xmltok -I$(BCCDIR)\include 
+EXPAT_OBJECTS=$(OBJ_PATH)\xmltok.obj $(OBJ_PATH)\xmlrole.obj $(OBJ_PATH)\xmlparse.obj
 
 EXTRACPPFLAGS=$(wxLIBXMLDIR) $(EXPAT_DEFS)
 
-LIBTARGET=$(WXDIR)\lib\wxxrc.lib
-
 OBJECTS=$(EXPAT_OBJECTS) \
-        xml.obj xmlres.obj xmlrsall.obj \
-        xh_bttn.obj xh_chckb.obj xh_chckl.obj xh_choic.obj xh_combo.obj xh_dlg.obj \
-        xh_gauge.obj xh_html.obj xh_menu.obj xh_notbk.obj xh_panel.obj xh_radbt.obj \
-        xh_radbx.obj xh_sizer.obj xh_slidr.obj xh_spin.obj xh_stbmp.obj xh_sttxt.obj \
-        xh_text.obj xh_listb.obj xh_toolb.obj xh_stlin.obj xh_bmp.obj \
-        xh_bmpbt.obj xh_cald.obj xh_listc.obj xh_scrol.obj xh_stbox.obj \
-        xh_tree.obj xh_unkwn.obj xh_frame.obj xh_gdctl.obj
+        $(OBJ_PATH)\xml.obj $(OBJ_PATH)\xmlres.obj $(OBJ_PATH)\xmlrsall.obj \
+        $(OBJ_PATH)\xh_bttn.obj $(OBJ_PATH)\xh_chckb.obj $(OBJ_PATH)\xh_chckl.obj $(OBJ_PATH)\xh_choic.obj $(OBJ_PATH)\xh_combo.obj $(OBJ_PATH)\xh_dlg.obj \
+        $(OBJ_PATH)\xh_gauge.obj $(OBJ_PATH)\xh_html.obj $(OBJ_PATH)\xh_menu.obj $(OBJ_PATH)\xh_notbk.obj $(OBJ_PATH)\xh_panel.obj $(OBJ_PATH)\xh_radbt.obj \
+        $(OBJ_PATH)\xh_radbx.obj $(OBJ_PATH)\xh_sizer.obj $(OBJ_PATH)\xh_slidr.obj $(OBJ_PATH)\xh_spin.obj $(OBJ_PATH)\xh_stbmp.obj $(OBJ_PATH)\xh_sttxt.obj \
+        $(OBJ_PATH)\xh_text.obj $(OBJ_PATH)\xh_listb.obj $(OBJ_PATH)\xh_toolb.obj $(OBJ_PATH)\xh_stlin.obj $(OBJ_PATH)\xh_bmp.obj \
+        $(OBJ_PATH)\xh_bmpbt.obj $(OBJ_PATH)\xh_cald.obj $(OBJ_PATH)\xh_listc.obj $(OBJ_PATH)\xh_scrol.obj $(OBJ_PATH)\xh_stbox.obj \
+        $(OBJ_PATH)\xh_tree.obj $(OBJ_PATH)\xh_unkwn.obj $(OBJ_PATH)\xh_frame.obj $(OBJ_PATH)\xh_gdctl.obj $(OBJ_PATH)\xh_scwin.obj \
+        $(OBJ_PATH)\xh_split.obj $(OBJ_PATH)\xh_wizrd.obj
 
 !include $(WXDIR)\src\makelib.b32
 
 {$(XMLPARSEDIR)}.c.obj:
-       bcc32 $(EXPAT_DEFS) -c -w-ccc -w-rch -w-par {$< }
+       bcc32 $(EXPAT_DEFS) -c -w-ccc -w-rch -w-par -n$(OBJ_PATH) {$< }
 
 {$(XMLTOKDIR)}.c.obj:
-       bcc32 $(EXPAT_DEFS) -c -w-ccc -w-rch -w-par {$< }
+       bcc32 $(EXPAT_DEFS) -c -w-ccc -w-rch -w-par -n$(OBJ_PATH) {$< }
+
+$(OBJ_PATH)\xml.obj: xml.cpp
+$(OBJ_PATH)\xmlres.obj: xmlres.cpp
+$(OBJ_PATH)\xmlrsall.obj: xmlrsall.cpp
+$(OBJ_PATH)\xh_bttn.obj: xh_bttn.cpp
+$(OBJ_PATH)\xh_chckb.obj: xh_chckb.cpp
+$(OBJ_PATH)\xh_chckl.obj: xh_chckl.cpp
+$(OBJ_PATH)\xh_choic.obj: xh_choic.cpp
+$(OBJ_PATH)\xh_combo.obj: xh_combo.cpp
+$(OBJ_PATH)\xh_dlg.obj: xh_dlg.cpp
+$(OBJ_PATH)\xh_gauge.obj: xh_gauge.cpp
+$(OBJ_PATH)\xh_html.obj: xh_html.cpp
+$(OBJ_PATH)\xh_menu.obj: xh_menu.cpp
+$(OBJ_PATH)\xh_notbk.obj: xh_notbk.cpp
+$(OBJ_PATH)\xh_panel.obj: xh_panel.cpp
+$(OBJ_PATH)\xh_radbt.obj: xh_radbt.cpp
+$(OBJ_PATH)\xh_radbx.obj: xh_radbx.cpp
+$(OBJ_PATH)\xh_sizer.obj: xh_sizer.cpp
+$(OBJ_PATH)\xh_slidr.obj: xh_slidr.cpp
+$(OBJ_PATH)\xh_spin.obj: xh_spin.cpp
+$(OBJ_PATH)\xh_stbmp.obj: xh_stbmp.cpp
+$(OBJ_PATH)\xh_sttxt.obj: xh_sttxt.cpp
+$(OBJ_PATH)\xh_text.obj: xh_text.cpp
+$(OBJ_PATH)\xh_listb.obj: xh_listb.cpp
+$(OBJ_PATH)\xh_toolb.obj: xh_toolb.cpp
+$(OBJ_PATH)\xh_stlin.obj: xh_stlin.cpp
+$(OBJ_PATH)\xh_bmp.obj: xh_bmp.cpp
+$(OBJ_PATH)\xh_bmpbt.obj: xh_bmpbt.cpp
+$(OBJ_PATH)\xh_cald.obj: xh_cald.cpp
+$(OBJ_PATH)\xh_listc.obj: xh_listc.cpp
+$(OBJ_PATH)\xh_scrol.obj: xh_scrol.cpp
+$(OBJ_PATH)\xh_stbox.obj: xh_stbox.cpp
+$(OBJ_PATH)\xh_tree.obj: xh_tree.cpp
+$(OBJ_PATH)\xh_unkwn.obj: xh_unkwn.cpp
+$(OBJ_PATH)\xh_frame.obj: xh_frame.cpp
+$(OBJ_PATH)\xh_gdctl.obj: xh_gdctl.cpp
+$(OBJ_PATH)\xh_scwin.obj: xh_scwin.cpp
+$(OBJ_PATH)\xh_split.obj: xh_split.cpp
+$(OBJ_PATH)\xh_wizrd.obj: xh_wizrd.cpp