Applied patch [ 809066 ] Cleanup for text2rtf

[wxWidgets.git] / contrib / samples / plot / makefile.bcc

diff --git a/contrib/samples/plot/makefile.bcc b/contrib/samples/plot/makefile.bcc
index f5f5b91b8ff7e8734114bb078b236fd65fcdf2ff..959b4bf7e79f0eb522c850acd28033774a1f6267 100644 (file)
--- a/contrib/samples/plot/makefile.bcc
+++ b/contrib/samples/plot/makefile.bcc
@@ -119,10 +119,10 @@ __RUNTIME_LIBS_7 = i
 __RUNTIME_LIBS_7 = 
 !endif
 !if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=1
+__UNICODE_DEFINE_p = -D_UNICODE
 !endif
 !if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=1
+__UNICODE_DEFINE_p_1 = -d_UNICODE
 !endif
 !if "$(MSLU)" == "1"
 __UNICOWS_LIB_p = unicows.lib
@@ -158,14 +158,19 @@ $(OBJS)\plot_plot.obj: .\plot.cpp
        $(CXX) -q -c -P -o$@ $(PLOT_CXXFLAGS) $**
 
 $(OBJS)\plot_plot.res: .\plot.rc
-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\..\include -i$(SETUPHDIR) -i. $(__DLLFLAG_p_1) -i.\..\..\..\samples -i.\..\..\include $**
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include  -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\..\include -i$(SETUPHDIR) -i. $(__DLLFLAG_p_1) -i.\..\..\..\samples -i.\..\..\include $**
 
 clean: 
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
        -if exist $(OBJS)\*.res del $(OBJS)\*.res
        -if exist $(OBJS)\plot.exe del $(OBJS)\plot.exe
+       -if exist $(OBJS)\plot.tds del $(OBJS)\plot.tds
+       -if exist $(OBJS)\plot.ilc del $(OBJS)\plot.ilc
+       -if exist $(OBJS)\plot.ild del $(OBJS)\plot.ild
+       -if exist $(OBJS)\plot.ilf del $(OBJS)\plot.ilf
+       -if exist $(OBJS)\plot.ils del $(OBJS)\plot.ils
 
 $(OBJS)\plot.exe: $(PLOT_OBJECTS)  $(OBJS)\plot_plot.res
        ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa @&&|
-       c0w32.obj $(PLOT_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot.lib $(__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_7).lib,, $(OBJS)\plot_plot.res
+       c0w32.obj $(PLOT_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot.lib  $(__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_7).lib,, $(OBJS)\plot_plot.res
 |