Updated makefiles etc. for 2.5.1

[wxWidgets.git] / samples / html / help / makefile.bcc

diff --git a/samples/html/help/makefile.bcc b/samples/html/help/makefile.bcc
index a4b3375dd8d680bf631f0d9b7b3708d28f5edf1a..639d04a3bbf2672049274466714d98483b7f6cd9 100644 (file)
--- a/samples/html/help/makefile.bcc
+++ b/samples/html/help/makefile.bcc
@@ -118,10 +118,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
@@ -161,12 +161,17 @@ $(OBJS)\help_help.obj: .\help.cpp
        $(CXX) -q -c -P -o$@ $(HELP_CXXFLAGS) $**
 
 $(OBJS)\help_help.res: .\help.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 $**
+       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 $**
 
 clean: 
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
        -if exist $(OBJS)\*.res del $(OBJS)\*.res
        -if exist $(OBJS)\help.exe del $(OBJS)\help.exe
+       -if exist $(OBJS)\help.tds del $(OBJS)\help.tds
+       -if exist $(OBJS)\help.ilc del $(OBJS)\help.ilc
+       -if exist $(OBJS)\help.ild del $(OBJS)\help.ild
+       -if exist $(OBJS)\help.ilf del $(OBJS)\help.ilf
+       -if exist $(OBJS)\help.ils del $(OBJS)\help.ils
 
 data: 
        if not exist $(OBJS)\helpfiles mkdir $(OBJS)\helpfiles
@@ -174,5 +179,5 @@ data:
 
 $(OBJS)\help.exe: $(HELP_OBJECTS)  $(OBJS)\help_help.res
        ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa @&&|
-       c0w32.obj $(HELP_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_7).lib,, $(OBJS)\help_help.res
+       c0w32.obj $(HELP_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_7).lib,, $(OBJS)\help_help.res
 |