Updated makefiles etc. for 2.5.1

[wxWidgets.git] / utils / tex2rtf / src / makefile.bcc

diff --git a/utils/tex2rtf/src/makefile.bcc b/utils/tex2rtf/src/makefile.bcc
index 3a2fff1d59f7bb3849710f19856103612d034f72..3775a3c11df0cc9889aecc1d197363cd2f3f3934 100644 (file)
--- a/utils/tex2rtf/src/makefile.bcc
+++ b/utils/tex2rtf/src/makefile.bcc
@@ -138,10 +138,10 @@ __RUNTIME_LIBS_0 = i
 __RUNTIME_LIBS_0 = 
 !endif
 !if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=1
+__UNICODE_DEFINE_p = -D_UNICODE
 !endif
 !if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p_3 = -dwxUSE_UNICODE=1
+__UNICODE_DEFINE_p_3 = -d_UNICODE
 !endif
 !if "$(MSLU)" == "1"
 __UNICOWS_LIB_p = unicows.lib
@@ -187,7 +187,7 @@ $(OBJS)\tex2rtf_gui_rtfutils.obj: .\rtfutils.cpp
        $(CXX) -q -c -P -o$@ $(TEX2RTF_GUI_CXXFLAGS) $**
 
 $(OBJS)\tex2rtf_gui_sample.res: .\..\..\..\samples\sample.rc
-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_3) $(__DEBUG_DEFINE_p_3) $(__UNICODE_DEFINE_p_3) -i.\..\..\..\include -i$(SETUPHDIR) -i. $(__DLLFLAG_p_3) -i.\..\..\..\samples $**
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include  -d__WXMSW__ $(__WXUNIV_DEFINE_p_3) $(__DEBUG_DEFINE_p_3) $(__UNICODE_DEFINE_p_3) -i.\..\..\..\include -i$(SETUPHDIR) -i. $(__DLLFLAG_p_3) -i.\..\..\..\samples $**
 
 $(OBJS)\tex2rtf_gui_table.obj: .\table.cpp
        $(CXX) -q -c -P -o$@ $(TEX2RTF_GUI_CXXFLAGS) $**
@@ -232,14 +232,24 @@ clean:
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
        -if exist $(OBJS)\*.res del $(OBJS)\*.res
        -if exist $(OBJS)\tex2rtf.exe del $(OBJS)\tex2rtf.exe
+       -if exist $(OBJS)\tex2rtf.tds del $(OBJS)\tex2rtf.tds
+       -if exist $(OBJS)\tex2rtf.ilc del $(OBJS)\tex2rtf.ilc
+       -if exist $(OBJS)\tex2rtf.ild del $(OBJS)\tex2rtf.ild
+       -if exist $(OBJS)\tex2rtf.ilf del $(OBJS)\tex2rtf.ilf
+       -if exist $(OBJS)\tex2rtf.ils del $(OBJS)\tex2rtf.ils
        -if exist $(OBJS)\tex2rtf_gui.exe del $(OBJS)\tex2rtf_gui.exe
+       -if exist $(OBJS)\tex2rtf_gui.tds del $(OBJS)\tex2rtf_gui.tds
+       -if exist $(OBJS)\tex2rtf_gui.ilc del $(OBJS)\tex2rtf_gui.ilc
+       -if exist $(OBJS)\tex2rtf_gui.ild del $(OBJS)\tex2rtf_gui.ild
+       -if exist $(OBJS)\tex2rtf_gui.ilf del $(OBJS)\tex2rtf_gui.ilf
+       -if exist $(OBJS)\tex2rtf_gui.ils del $(OBJS)\tex2rtf_gui.ils
 
 $(OBJS)\tex2rtf.exe: $(TEX2RTF_OBJECTS)
        ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO)  -L$(LIBDIRNAME) -ap @&&|
-       c0x32.obj $(TEX2RTF_OBJECTS),$@,, $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  $(__UNICOWS_LIB_p) import32.lib ole2w32.lib import32.lib cw32mt$(__RUNTIME_LIBS_0).lib,,
+       c0x32.obj $(TEX2RTF_OBJECTS),$@,, $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS_0).lib,,
 |
 
 $(OBJS)\tex2rtf_gui.exe: $(TEX2RTF_GUI_OBJECTS)  $(OBJS)\tex2rtf_gui_sample.res
        ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa @&&|
-       c0w32.obj $(TEX2RTF_GUI_OBJECTS),$@,, $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  $(__UNICOWS_LIB_p) import32.lib ole2w32.lib  import32.lib cw32mt$(__RUNTIME_LIBS_0).lib,, $(OBJS)\tex2rtf_gui_sample.res
+       c0w32.obj $(TEX2RTF_GUI_OBJECTS),$@,, $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib  import32.lib cw32mt$(__RUNTIME_LIBS_0).lib,, $(OBJS)\tex2rtf_gui_sample.res
 |