Patch #808669 more warngins and unicode fixes

[wxWidgets.git] / samples / erase / makefile.bcc

diff --git a/samples/erase/makefile.bcc b/samples/erase/makefile.bcc
index abc4a207be671c7bde4c907fa8b7085539984ceb..4afa72ed56c9268f587ff74d8e2a8a07a3f605b7 100644 (file)
--- a/samples/erase/makefile.bcc
+++ b/samples/erase/makefile.bcc
@@ -118,10 +118,10 @@ __RUNTIME_LIBS_7 = i
 __RUNTIME_LIBS_7 = 
 !endif
 !if "$(UNICODE)" == "1"
 __RUNTIME_LIBS_7 = 
 !endif
 !if "$(UNICODE)" == "1"

-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=1
+__UNICODE_DEFINE_p = -D_UNICODE

 !endif
 !if "$(UNICODE)" == "1"
 !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
 !endif
 !if "$(MSLU)" == "1"
 __UNICOWS_LIB_p = unicows.lib


@@ -157,14 +157,19 @@ $(OBJS)\erase_erase.obj: .\erase.cpp
        $(CXX) -q -c -P -o$@ $(ERASE_CXXFLAGS) $**
 
 $(OBJS)\erase_erase.res: .\erase.rc
        $(CXX) -q -c -P -o$@ $(ERASE_CXXFLAGS) $**
 
 $(OBJS)\erase_erase.res: .\erase.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)\erase.exe del $(OBJS)\erase.exe
 
 clean: 
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
        -if exist $(OBJS)\*.res del $(OBJS)\*.res
        -if exist $(OBJS)\erase.exe del $(OBJS)\erase.exe

+       -if exist $(OBJS)\erase.tds del $(OBJS)\erase.tds
+       -if exist $(OBJS)\erase.ilc del $(OBJS)\erase.ilc
+       -if exist $(OBJS)\erase.ild del $(OBJS)\erase.ild
+       -if exist $(OBJS)\erase.ilf del $(OBJS)\erase.ilf
+       -if exist $(OBJS)\erase.ils del $(OBJS)\erase.ils

 
 $(OBJS)\erase.exe: $(ERASE_OBJECTS)  $(OBJS)\erase_erase.res
        ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa @&&|
 
 $(OBJS)\erase.exe: $(ERASE_OBJECTS)  $(OBJS)\erase_erase.res
        ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa @&&|

-       c0w32.obj $(ERASE_OBJECTS),$@,, $(__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)\erase_erase.res
+       c0w32.obj $(ERASE_OBJECTS),$@,, $(__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)\erase_erase.res

 |
 |