Deleting void is undefined.

[wxWidgets.git] / contrib / build / fl / makefile.bcc

diff --git a/contrib/build/fl/makefile.bcc b/contrib/build/fl/makefile.bcc
index dfbe53bfb3552d9dd60842f980b6223cc6b0910f..2038afd1a29324a095364cbefd91de912fe0a564 100644 (file)
--- a/contrib/build/fl/makefile.bcc
+++ b/contrib/build/fl/makefile.bcc
@@ -1,43 +1,78 @@
 # =========================================================================
 #     This makefile was generated by
 # =========================================================================
 #     This makefile was generated by

-#     Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net)
+#     Bakefile 0.1.4 (http://bakefile.sourceforge.net)

 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

+.autodepend
+

 !ifndef BCCDIR
 !ifndef BCCDIR

+!ifndef MAKEDIR
+!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
+!endif

 BCCDIR = $(MAKEDIR)\..
 !endif
 
 BCCDIR = $(MAKEDIR)\..
 !endif
 

-!include ../../../build/config.bcc
+!include ../../../build/msw/config.bcc

 
 # -------------------------------------------------------------------------
 # Do not modify the rest of this file!
 # -------------------------------------------------------------------------
 
 
 # -------------------------------------------------------------------------
 # Do not modify the rest of this file!
 # -------------------------------------------------------------------------
 

-!if "$(BCCDIR)" == "\.."
-!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
-!endif
-

 ### Variables: ###
 
 ### Variables: ###
 

-FLDLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) \
-       -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
-       $(__UNICODE_DEFINE_p) -I..\..\src\fl\..\..\..\include \
-       -I..\..\src\fl\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \
-       -I..\..\src\fl\..\..\..\src\tiff -I..\..\src\fl\..\..\..\src\jpeg \
-       -I..\..\src\fl\..\..\..\src\png -I..\..\src\fl\..\..\..\src\zlib \
-       -I..\..\src\fl\..\..\..\src\regex -I..\..\src\fl\..\..\include \
-       -DWXUSINGDLL -DWXMAKINGDLL_FL $(CXXFLAGS) -Hu -H=$(OBJS)\wxprec_fldll.csm
-FLLIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) \
-       -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
-       $(__UNICODE_DEFINE_p) -I..\..\src\fl\..\..\..\include \
-       -I..\..\src\fl\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \
-       -I..\..\src\fl\..\..\..\src\tiff -I..\..\src\fl\..\..\..\src\jpeg \
-       -I..\..\src\fl\..\..\..\src\png -I..\..\src\fl\..\..\..\src\zlib \
-       -I..\..\src\fl\..\..\..\src\regex -I..\..\src\fl\..\..\include $(CXXFLAGS) \
-       -Hu -H=$(OBJS)\wxprec_fllib.csm

 OBJS = \
        bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 OBJS = \
        bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)

+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+FLDLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
+       $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
+       $(__UNICODE_DEFINE_p) -I..\..\src\fl\..\..\..\include -I$(SETUPHDIR) \
+       -I..\..\src\fl\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_FL -Hu \
+       -H=$(OBJS)\wxprec_fldll.csm $(CPPFLAGS) $(CXXFLAGS)
+FLDLL_OBJECTS =  \
+       $(OBJS)\fldll_dummy.obj \
+       $(OBJS)\fldll_antiflickpl.obj \
+       $(OBJS)\fldll_bardragpl.obj \
+       $(OBJS)\fldll_barhintspl.obj \
+       $(OBJS)\fldll_cbcustom.obj \
+       $(OBJS)\fldll_controlbar.obj \
+       $(OBJS)\fldll_dyntbar.obj \
+       $(OBJS)\fldll_dyntbarhnd.obj \
+       $(OBJS)\fldll_frmview.obj \
+       $(OBJS)\fldll_garbagec.obj \
+       $(OBJS)\fldll_gcupdatesmgr.obj \
+       $(OBJS)\fldll_hintanimpl.obj \
+       $(OBJS)\fldll_newbmpbtn.obj \
+       $(OBJS)\fldll_panedrawpl.obj \
+       $(OBJS)\fldll_rowdragpl.obj \
+       $(OBJS)\fldll_rowlayoutpl.obj \
+       $(OBJS)\fldll_toolwnd.obj \
+       $(OBJS)\fldll_updatesmgr.obj
+FLLIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
+       $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
+       $(__UNICODE_DEFINE_p) -I..\..\src\fl\..\..\..\include -I$(SETUPHDIR) \
+       -I..\..\src\fl\..\..\include -Hu -H=$(OBJS)\wxprec_fllib.csm $(CPPFLAGS) \
+       $(CXXFLAGS)
+FLLIB_OBJECTS =  \
+       $(OBJS)\fllib_dummy.obj \
+       $(OBJS)\fllib_antiflickpl.obj \
+       $(OBJS)\fllib_bardragpl.obj \
+       $(OBJS)\fllib_barhintspl.obj \
+       $(OBJS)\fllib_cbcustom.obj \
+       $(OBJS)\fllib_controlbar.obj \
+       $(OBJS)\fllib_dyntbar.obj \
+       $(OBJS)\fllib_dyntbarhnd.obj \
+       $(OBJS)\fllib_frmview.obj \
+       $(OBJS)\fllib_garbagec.obj \
+       $(OBJS)\fllib_gcupdatesmgr.obj \
+       $(OBJS)\fllib_hintanimpl.obj \
+       $(OBJS)\fllib_newbmpbtn.obj \
+       $(OBJS)\fllib_panedrawpl.obj \
+       $(OBJS)\fllib_rowdragpl.obj \
+       $(OBJS)\fllib_rowlayoutpl.obj \
+       $(OBJS)\fllib_toolwnd.obj \
+       $(OBJS)\fllib_updatesmgr.obj

 
 ### Conditionally set variables: ###
 
 
 ### Conditionally set variables: ###
 


@@ -53,11 +88,11 @@ VENDORTAG = _$(VENDOR)
 !if "$(OFFICIAL_BUILD)" == "1"
 VENDORTAG = 
 !endif
 !if "$(OFFICIAL_BUILD)" == "1"
 VENDORTAG = 
 !endif

-!if "$(BUILD)" == "debug"
+!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"

 WXDEBUGFLAG = d
 !endif
 WXDEBUGFLAG = d
 !endif

-!if "$(SHARED)" == "1"
-WXDLLFLAG = dll
+!if "$(DEBUG_FLAG)" == "1"
+WXDEBUGFLAG = d

 !endif
 !if "$(UNICODE)" == "1"
 WXUNICODEFLAG = u
 !endif
 !if "$(UNICODE)" == "1"
 WXUNICODEFLAG = u


@@ -65,14 +100,57 @@ WXUNICODEFLAG = u
 !if "$(WXUNIV)" == "1"
 WXUNIVNAME = univ
 !endif
 !if "$(WXUNIV)" == "1"
 WXUNIVNAME = univ
 !endif

-!if "$(BUILD)" == "debug"
-__DEBUGFLAG = -v
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll

 !endif
 !endif

-!if "$(BUILD)" == "release"
-__DEBUGFLAG = -v-
+!if "$(SHARED)" == "1"
+__fldll___depname = \
+       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_bcc$(VENDORTAG).dll

 !endif
 !endif

-!if "$(BUILD)" == "debug"
-__DEBUG_DEFINE_p = -D__WXDEBUG__
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_8 = i
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_8 = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!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 "$(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 "$(SHARED)" == "0"
+__fllib___depname = \
+       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib
+!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"
 __OPTIMIZEFLAG = -Od
 !endif
 !if "$(BUILD)" == "debug"
 __OPTIMIZEFLAG = -Od


@@ -86,36 +164,23 @@ __RUNTIME_LIBS = -tWR
 !if "$(RUNTIME_LIBS)" == "static"
 __RUNTIME_LIBS = 
 !endif
 !if "$(RUNTIME_LIBS)" == "static"
 __RUNTIME_LIBS = 
 !endif

-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_7 = i
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_7 = 
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=1
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__

 !endif
 !endif

-!if "$(MONOLITHIC)" == "0"
-__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
+!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
+__DEBUG_DEFINE_p = -D__WXDEBUG__

 !endif
 !endif

-!if "$(MONOLITHIC)" == "0"
-__WXLIB_CORE_p = \
-       wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib
+!if "$(DEBUG_FLAG)" == "1"
+__DEBUG_DEFINE_p = -D__WXDEBUG__

 !endif
 !endif

-!if "$(MONOLITHIC)" == "1"
-__WXLIB_MONO_p = \
-       wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = -D_UNICODE

 !endif
 !endif

-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+!if "$(SHARED)" == "0"
+LIBDIRNAME = ..\..\src\fl\..\..\..\lib\bcc_lib$(CFG)

 !endif
 !if "$(SHARED)" == "1"
 !endif
 !if "$(SHARED)" == "1"

-__fldll___depname = \
-       ..\..\src\fl\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_bcc$(VENDORTAG).dll
-!endif
-!if "$(SHARED)" == "0"
-__fllib___depname = \
-       ..\..\src\fl\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib
+LIBDIRNAME = ..\..\src\fl\..\..\..\lib\bcc_dll$(CFG)

 !endif
 
 
 !endif
 
 


@@ -127,6 +192,37 @@ $(OBJS):
 
 all: $(__fldll___depname) $(__fllib___depname)
 
 
 all: $(__fldll___depname) $(__fllib___depname)
 

+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_bcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_bcc$(VENDORTAG).dll
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_bcc$(VENDORTAG).tds del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_bcc$(VENDORTAG).tds
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_bcc$(VENDORTAG).ilc del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_bcc$(VENDORTAG).ilc
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_bcc$(VENDORTAG).ild del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_bcc$(VENDORTAG).ild
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_bcc$(VENDORTAG).ilf del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_bcc$(VENDORTAG).ilf
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_bcc$(VENDORTAG).ils del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_bcc$(VENDORTAG).ils
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib
+
+!if "$(SHARED)" == "1"
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_bcc$(VENDORTAG).dll: $(OBJS)\fldll_dummy.obj  $(FLDLL_OBJECTS)
+       ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) @&&|
+       c0d32.obj $(FLDLL_OBJECTS),$@,, $(__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  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  import32.lib cw32mt$(__RUNTIME_LIBS_8).lib,,
+|
+       implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl $@
+!endif
+
+!if "$(SHARED)" == "0"
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib: $(OBJS)\fllib_dummy.obj  $(FLLIB_OBJECTS)
+       if exist $@ del $@
+       tlib /a /p4096 $@ @&&|
+       $(FLLIB_OBJECTS)
+|
+!endif
+
+$(OBJS)\fldll_dummy.obj: ../../src/fl\..\..\..\src\msw\dummy.cpp
+       $(CXX) -q -c -P -o$@ $(FLDLL_CXXFLAGS) -H $**
+

 $(OBJS)\fldll_antiflickpl.obj: ../../src/fl\antiflickpl.cpp
        $(CXX) -q -c -P -o$@ $(FLDLL_CXXFLAGS) $**
 
 $(OBJS)\fldll_antiflickpl.obj: ../../src/fl\antiflickpl.cpp
        $(CXX) -q -c -P -o$@ $(FLDLL_CXXFLAGS) $**
 


@@ -142,9 +238,6 @@ $(OBJS)\fldll_cbcustom.obj: ../../src/fl\cbcustom.cpp
 $(OBJS)\fldll_controlbar.obj: ../../src/fl\controlbar.cpp
        $(CXX) -q -c -P -o$@ $(FLDLL_CXXFLAGS) $**
 
 $(OBJS)\fldll_controlbar.obj: ../../src/fl\controlbar.cpp
        $(CXX) -q -c -P -o$@ $(FLDLL_CXXFLAGS) $**
 

-$(OBJS)\fldll_dummy.obj: ../../src/fl\..\..\..\src\msw\dummy.cpp
-       $(CXX) -q -c -P -o$@ $(FLDLL_CXXFLAGS) -H $**
-

 $(OBJS)\fldll_dyntbar.obj: ../../src/fl\dyntbar.cpp
        $(CXX) -q -c -P -o$@ $(FLDLL_CXXFLAGS) $**
 
 $(OBJS)\fldll_dyntbar.obj: ../../src/fl\dyntbar.cpp
        $(CXX) -q -c -P -o$@ $(FLDLL_CXXFLAGS) $**
 


@@ -181,6 +274,9 @@ $(OBJS)\fldll_toolwnd.obj: ../../src/fl\toolwnd.cpp
 $(OBJS)\fldll_updatesmgr.obj: ../../src/fl\updatesmgr.cpp
        $(CXX) -q -c -P -o$@ $(FLDLL_CXXFLAGS) $**
 
 $(OBJS)\fldll_updatesmgr.obj: ../../src/fl\updatesmgr.cpp
        $(CXX) -q -c -P -o$@ $(FLDLL_CXXFLAGS) $**
 

+$(OBJS)\fllib_dummy.obj: ../../src/fl\..\..\..\src\msw\dummy.cpp
+       $(CXX) -q -c -P -o$@ $(FLLIB_CXXFLAGS) -H $**
+

 $(OBJS)\fllib_antiflickpl.obj: ../../src/fl\antiflickpl.cpp
        $(CXX) -q -c -P -o$@ $(FLLIB_CXXFLAGS) $**
 
 $(OBJS)\fllib_antiflickpl.obj: ../../src/fl\antiflickpl.cpp
        $(CXX) -q -c -P -o$@ $(FLLIB_CXXFLAGS) $**
 


@@ -196,9 +292,6 @@ $(OBJS)\fllib_cbcustom.obj: ../../src/fl\cbcustom.cpp
 $(OBJS)\fllib_controlbar.obj: ../../src/fl\controlbar.cpp
        $(CXX) -q -c -P -o$@ $(FLLIB_CXXFLAGS) $**
 
 $(OBJS)\fllib_controlbar.obj: ../../src/fl\controlbar.cpp
        $(CXX) -q -c -P -o$@ $(FLLIB_CXXFLAGS) $**
 

-$(OBJS)\fllib_dummy.obj: ../../src/fl\..\..\..\src\msw\dummy.cpp
-       $(CXX) -q -c -P -o$@ $(FLLIB_CXXFLAGS) -H $**
-

 $(OBJS)\fllib_dyntbar.obj: ../../src/fl\dyntbar.cpp
        $(CXX) -q -c -P -o$@ $(FLLIB_CXXFLAGS) $**
 
 $(OBJS)\fllib_dyntbar.obj: ../../src/fl\dyntbar.cpp
        $(CXX) -q -c -P -o$@ $(FLLIB_CXXFLAGS) $**
 


@@ -234,26 +327,3 @@ $(OBJS)\fllib_toolwnd.obj: ../../src/fl\toolwnd.cpp
 
 $(OBJS)\fllib_updatesmgr.obj: ../../src/fl\updatesmgr.cpp
        $(CXX) -q -c -P -o$@ $(FLLIB_CXXFLAGS) $**
 
 $(OBJS)\fllib_updatesmgr.obj: ../../src/fl\updatesmgr.cpp
        $(CXX) -q -c -P -o$@ $(FLLIB_CXXFLAGS) $**

-
-clean: 
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res
-       -if exist ..\..\src\fl\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_bcc$(VENDORTAG).dll del ..\..\src\fl\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_bcc$(VENDORTAG).dll
-       -if exist ..\..\src\fl\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib del ..\..\src\fl\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib
-       -if exist ..\..\src\fl\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib del ..\..\src\fl\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib
-
-!if "$(SHARED)" == "1"
-..\..\src\fl\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_bcc$(VENDORTAG).dll: $(OBJS)\fldll_dummy.obj $(OBJS)\fldll_dummy.obj $(OBJS)\fldll_antiflickpl.obj $(OBJS)\fldll_bardragpl.obj $(OBJS)\fldll_barhintspl.obj $(OBJS)\fldll_cbcustom.obj $(OBJS)\fldll_controlbar.obj $(OBJS)\fldll_dyntbar.obj $(OBJS)\fldll_dyntbarhnd.obj $(OBJS)\fldll_frmview.obj $(OBJS)\fldll_garbagec.obj $(OBJS)\fldll_gcupdatesmgr.obj $(OBJS)\fldll_hintanimpl.obj $(OBJS)\fldll_newbmpbtn.obj $(OBJS)\fldll_panedrawpl.obj $(OBJS)\fldll_rowdragpl.obj $(OBJS)\fldll_rowlayoutpl.obj $(OBJS)\fldll_toolwnd.obj $(OBJS)\fldll_updatesmgr.obj
-       ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGFLAG)  -L..\..\src\fl\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) @&&|
-       c0d32.obj  $(OBJS)\fldll_dummy.obj $(OBJS)\fldll_antiflickpl.obj $(OBJS)\fldll_bardragpl.obj $(OBJS)\fldll_barhintspl.obj $(OBJS)\fldll_cbcustom.obj $(OBJS)\fldll_controlbar.obj $(OBJS)\fldll_dyntbar.obj $(OBJS)\fldll_dyntbarhnd.obj $(OBJS)\fldll_frmview.obj $(OBJS)\fldll_garbagec.obj $(OBJS)\fldll_gcupdatesmgr.obj $(OBJS)\fldll_hintanimpl.obj $(OBJS)\fldll_newbmpbtn.obj $(OBJS)\fldll_panedrawpl.obj $(OBJS)\fldll_rowdragpl.obj $(OBJS)\fldll_rowlayoutpl.obj $(OBJS)\fldll_toolwnd.obj $(OBJS)\fldll_updatesmgr.obj,$@,, $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib  import32.lib ole2w32.lib  $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) cw32mt$(__RUNTIME_LIBS_7).lib,,
-|
-       implib -f ..\..\src\fl\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl $@
-!endif
-
-!if "$(SHARED)" == "0"
-..\..\src\fl\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib: $(OBJS)\fllib_dummy.obj $(OBJS)\fllib_dummy.obj $(OBJS)\fllib_antiflickpl.obj $(OBJS)\fllib_bardragpl.obj $(OBJS)\fllib_barhintspl.obj $(OBJS)\fllib_cbcustom.obj $(OBJS)\fllib_controlbar.obj $(OBJS)\fllib_dyntbar.obj $(OBJS)\fllib_dyntbarhnd.obj $(OBJS)\fllib_frmview.obj $(OBJS)\fllib_garbagec.obj $(OBJS)\fllib_gcupdatesmgr.obj $(OBJS)\fllib_hintanimpl.obj $(OBJS)\fllib_newbmpbtn.obj $(OBJS)\fllib_panedrawpl.obj $(OBJS)\fllib_rowdragpl.obj $(OBJS)\fllib_rowlayoutpl.obj $(OBJS)\fllib_toolwnd.obj $(OBJS)\fllib_updatesmgr.obj
-       if exist $@ del $@
-       tlib /a /p2048 $@ @&&|
-       $(OBJS)\fllib_dummy.obj $(OBJS)\fllib_antiflickpl.obj $(OBJS)\fllib_bardragpl.obj $(OBJS)\fllib_barhintspl.obj $(OBJS)\fllib_cbcustom.obj $(OBJS)\fllib_controlbar.obj $(OBJS)\fllib_dyntbar.obj $(OBJS)\fllib_dyntbarhnd.obj $(OBJS)\fllib_frmview.obj $(OBJS)\fllib_garbagec.obj $(OBJS)\fllib_gcupdatesmgr.obj $(OBJS)\fllib_hintanimpl.obj $(OBJS)\fllib_newbmpbtn.obj $(OBJS)\fllib_panedrawpl.obj $(OBJS)\fllib_rowdragpl.obj $(OBJS)\fllib_rowlayoutpl.obj $(OBJS)\fllib_toolwnd.obj $(OBJS)\fllib_updatesmgr.obj
-|
-!endif