Fix memory leak by letting the base class version handle the

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

diff --git a/samples/richedit/makefile.bcc b/samples/richedit/makefile.bcc
index e19fb2f67f6b125ad62081ae7bff1b00df47c1b1..d34b0333911d87b7205f86e7903dc2c9df2f41df 100644 (file)
--- a/samples/richedit/makefile.bcc
+++ b/samples/richedit/makefile.bcc
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.1.1 (http://bakefile.sourceforge.net)
+#     Bakefile 0.1.3 (http://bakefile.sourceforge.net)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
@@ -23,6 +23,8 @@ BCCDIR = $(MAKEDIR)\..
 
 OBJS = \
        bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
 RICHEDIT_CXXFLAGS = $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include $(__DEBUGINFO) \
        $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
        $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) \
@@ -33,17 +35,9 @@ RICHEDIT_OBJECTS =  \
        $(OBJS)\richedit_wxllist.obj \
        $(OBJS)\richedit_wxlparser.obj \
        $(OBJS)\richedit_wxlwindow.obj
-SETUPHDIR = \
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
 
 ### Conditionally set variables: ###
 
-!if "$(SHARED)" == "0"
-LIBDIRNAME = .\..\..\lib\bcc_lib$(CFG)
-!endif
-!if "$(SHARED)" == "1"
-LIBDIRNAME = .\..\..\lib\bcc_dll$(CFG)
-!endif
 !if "$(USE_GUI)" == "0"
 PORTNAME = base
 !endif
@@ -56,53 +50,14 @@ WXDEBUGFLAG = d
 !if "$(DEBUG_FLAG)" == "1"
 WXDEBUGFLAG = d
 !endif
-!if "$(SHARED)" == "1"
-WXDLLFLAG = dll
-!endif
 !if "$(UNICODE)" == "1"
 WXUNICODEFLAG = u
 !endif
 !if "$(WXUNIV)" == "1"
 WXUNIVNAME = univ
 !endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO = -v
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO = -v-
-!endif
-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO = -v-
-!endif
-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO = -v
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
-__DEBUG_DEFINE_p = -D__WXDEBUG__
-!endif
-!if "$(DEBUG_FLAG)" == "1"
-__DEBUG_DEFINE_p = -D__WXDEBUG__
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
-__DEBUG_DEFINE_p_1 = -d__WXDEBUG__
-!endif
-!if "$(DEBUG_FLAG)" == "1"
-__DEBUG_DEFINE_p_1 = -d__WXDEBUG__
-!endif
-!if "$(SHARED)" == "1"
-__DLLFLAG_p = -DWXUSINGDLL
-!endif
 !if "$(SHARED)" == "1"
-__DLLFLAG_p_1 = -dWXUSINGDLL
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+WXDLLFLAG = dll
 !endif
 !if "$(BUILD)" == "debug"
 __OPTIMIZEFLAG_2 = -Od
@@ -122,31 +77,76 @@ __RUNTIME_LIBS_7 = i
 !if "$(RUNTIME_LIBS)" == "static"
 __RUNTIME_LIBS_7 = 
 !endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
+__DEBUG_DEFINE_p = -D__WXDEBUG__
+!endif
+!if "$(DEBUG_FLAG)" == "1"
+__DEBUG_DEFINE_p = -D__WXDEBUG__
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
+__DEBUG_DEFINE_p_1 = -d__WXDEBUG__
+!endif
+!if "$(DEBUG_FLAG)" == "1"
+__DEBUG_DEFINE_p_1 = -d__WXDEBUG__
+!endif
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p = -D_UNICODE
 !endif
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p_1 = -d_UNICODE
 !endif
-!if "$(MSLU)" == "1"
-__UNICOWS_LIB_p = unicows.lib
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = -DWXUSINGDLL
 !endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = -dWXUSINGDLL
 !endif
 !if "$(MONOLITHIC)" == "0"
 __WXLIB_CORE_p = \
        wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib
 !endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
+!endif
 !if "$(MONOLITHIC)" == "1"
 __WXLIB_MONO_p = \
        wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
 !endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
 !endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(SHARED)" == "0"
+LIBDIRNAME = .\..\..\lib\bcc_lib$(CFG)
+!endif
+!if "$(SHARED)" == "1"
+LIBDIRNAME = .\..\..\lib\bcc_dll$(CFG)
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO = -v
 !endif
 
 
@@ -158,8 +158,24 @@ $(OBJS):
 
 all: $(OBJS)\richedit.exe data
 
-$(OBJS)\richedit_kbList.obj: .\kbList.cpp
-       $(CXX) -q -c -P -o$@ $(RICHEDIT_CXXFLAGS) $**
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\richedit.exe del $(OBJS)\richedit.exe
+       -if exist $(OBJS)\richedit.tds del $(OBJS)\richedit.tds
+       -if exist $(OBJS)\richedit.ilc del $(OBJS)\richedit.ilc
+       -if exist $(OBJS)\richedit.ild del $(OBJS)\richedit.ild
+       -if exist $(OBJS)\richedit.ilf del $(OBJS)\richedit.ilf
+       -if exist $(OBJS)\richedit.ils del $(OBJS)\richedit.ils
+
+$(OBJS)\richedit.exe: $(RICHEDIT_OBJECTS)  $(OBJS)\richedit_sample.res
+       ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa @&&|
+       c0w32.obj $(RICHEDIT_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib  import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\richedit_sample.res
+|
+
+data: 
+       if not exist $(OBJS) mkdir $(OBJS)
+       for %f in (wxLayout.cpp) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
 
 $(OBJS)\richedit_sample.res: .\..\..\samples\sample.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 $**
@@ -167,6 +183,9 @@ $(OBJS)\richedit_sample.res: .\..\..\samples\sample.rc
 $(OBJS)\richedit_wxLayout.obj: .\wxLayout.cpp
        $(CXX) -q -c -P -o$@ $(RICHEDIT_CXXFLAGS) $**
 
+$(OBJS)\richedit_kbList.obj: .\kbList.cpp
+       $(CXX) -q -c -P -o$@ $(RICHEDIT_CXXFLAGS) $**
+
 $(OBJS)\richedit_wxllist.obj: .\wxllist.cpp
        $(CXX) -q -c -P -o$@ $(RICHEDIT_CXXFLAGS) $**
 
@@ -175,22 +194,3 @@ $(OBJS)\richedit_wxlparser.obj: .\wxlparser.cpp
 
 $(OBJS)\richedit_wxlwindow.obj: .\wxlwindow.cpp
        $(CXX) -q -c -P -o$@ $(RICHEDIT_CXXFLAGS) $**
-
-clean: 
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res
-       -if exist $(OBJS)\richedit.exe del $(OBJS)\richedit.exe
-       -if exist $(OBJS)\richedit.tds del $(OBJS)\richedit.tds
-       -if exist $(OBJS)\richedit.ilc del $(OBJS)\richedit.ilc
-       -if exist $(OBJS)\richedit.ild del $(OBJS)\richedit.ild
-       -if exist $(OBJS)\richedit.ilf del $(OBJS)\richedit.ilf
-       -if exist $(OBJS)\richedit.ils del $(OBJS)\richedit.ils
-
-data: 
-       if not exist $(OBJS) mkdir $(OBJS)
-       for %f in (wxLayout.cpp) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
-
-$(OBJS)\richedit.exe: $(RICHEDIT_OBJECTS)  $(OBJS)\richedit_sample.res
-       ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa @&&|
-       c0w32.obj $(RICHEDIT_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)\richedit_sample.res
-|