Removed ambiguity between deprecated and new constructor.

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

diff --git a/contrib/build/fl/makefile.vc b/contrib/build/fl/makefile.vc
index 9b52b839c176c39fc70c282ab980d80e40b9f5b7..7cba4b3a2aab61fa6e69e1d2df900e0cbc88affb 100644 (file)
--- a/contrib/build/fl/makefile.vc
+++ b/contrib/build/fl/makefile.vc
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
 # =========================================================================
 #     This makefile was generated by

-#     Bakefile 0.1.1 (http://bakefile.sourceforge.net)
+#     Bakefile 0.1.6 (http://bakefile.sourceforge.net)

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


@@ -12,13 +12,22 @@
 
 ### Variables: ###
 
 
 ### Variables: ###
 

-FLDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_3) /DWIN32 \
-       $(__DEBUGINFO_2) \
-       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_vc$(VENDORTAG).pdb \
-       $(____DEBUGRUNTIME_2_p) $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \
-       $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\..\src\fl\..\..\..\include \
-       /I$(SETUPHDIR) /I..\..\src\fl\..\..\include /DWXUSINGDLL /DWXMAKINGDLL_FL \
-       $(CXXFLAGS) /GR /GX /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_fldll.pch"
+WX_RELEASE_NODOT = 25
+WX_VERSION_NODOT = $(WX_RELEASE_NODOT)4
+OBJS = \
+       vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = ..\..\src\fl\..\..\..\lib\vc_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+FLDLL_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_4) /DWIN32 \
+       $(__DEBUGINFO_1) \
+       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl_vc$(VENDORTAG).pdb \
+       $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       /I..\..\src\fl\..\..\..\include /I$(SETUPHDIR) /W4 \
+       /I..\..\src\fl\..\..\include /DWXUSINGDLL /DWXMAKINGDLL_FL \
+       $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_0) /Yu"wx/wxprec.h" \
+       /Fp"$(OBJS)\wxprec_fldll.pch" $(CPPFLAGS) $(CXXFLAGS)

 FLDLL_OBJECTS =  \
        $(OBJS)\fldll_dummy.obj \
        $(OBJS)\fldll_antiflickpl.obj \
 FLDLL_OBJECTS =  \
        $(OBJS)\fldll_dummy.obj \
        $(OBJS)\fldll_antiflickpl.obj \


@@ -38,13 +47,14 @@ FLDLL_OBJECTS =  \
        $(OBJS)\fldll_rowlayoutpl.obj \
        $(OBJS)\fldll_toolwnd.obj \
        $(OBJS)\fldll_updatesmgr.obj
        $(OBJS)\fldll_rowlayoutpl.obj \
        $(OBJS)\fldll_toolwnd.obj \
        $(OBJS)\fldll_updatesmgr.obj

-FLLIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_12) /DWIN32 \
-       $(__DEBUGINFO_2) \
-       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.pdb \
-       $(____DEBUGRUNTIME_11_p) $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \
-       $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\..\src\fl\..\..\..\include \
-       /I$(SETUPHDIR) /I..\..\src\fl\..\..\include $(CXXFLAGS) /GR /GX \
-       /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_fllib.pch"
+FLLIB_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_16) /DWIN32 \
+       $(__DEBUGINFO_1) \
+       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl.pdb \
+       $(____DEBUGRUNTIME_15_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       /I..\..\src\fl\..\..\..\include /I$(SETUPHDIR) /W4 \
+       /I..\..\src\fl\..\..\include $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_0) \
+       /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_fllib.pch" $(CPPFLAGS) $(CXXFLAGS)

 FLLIB_OBJECTS =  \
        $(OBJS)\fllib_dummy.obj \
        $(OBJS)\fllib_antiflickpl.obj \
 FLLIB_OBJECTS =  \
        $(OBJS)\fllib_dummy.obj \
        $(OBJS)\fllib_antiflickpl.obj \


@@ -64,19 +74,9 @@ FLLIB_OBJECTS =  \
        $(OBJS)\fllib_rowlayoutpl.obj \
        $(OBJS)\fllib_toolwnd.obj \
        $(OBJS)\fllib_updatesmgr.obj
        $(OBJS)\fllib_rowlayoutpl.obj \
        $(OBJS)\fllib_toolwnd.obj \
        $(OBJS)\fllib_updatesmgr.obj

-OBJS = \
-       vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-SETUPHDIR = \
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)

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

-!if "$(SHARED)" == "0"
-LIBDIRNAME = ..\..\src\fl\..\..\..\lib\vc_lib$(CFG)
-!endif
-!if "$(SHARED)" == "1"
-LIBDIRNAME = ..\..\src\fl\..\..\..\lib\vc_dll$(CFG)
-!endif

 !if "$(USE_GUI)" == "0"
 PORTNAME = base
 !endif
 !if "$(USE_GUI)" == "0"
 PORTNAME = base
 !endif


@@ -95,41 +95,33 @@ WXDEBUGFLAG = d
 !if "$(DEBUG_FLAG)" == "1"
 WXDEBUGFLAG = d
 !endif
 !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 "$(UNICODE)" == "1"
 WXUNICODEFLAG = u
 !endif
 !if "$(WXUNIV)" == "1"
 WXUNIVNAME = univ
 !endif

-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO = d
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO = 
-!endif
-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO = 
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll

 !endif
 !endif

-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO = d
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib

 !endif
 !endif

-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_1 = /DEBUG
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll

 !endif
 !endif

-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_1 = 
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 

 !endif
 !endif

-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO_1 = 
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  

 !endif
 !endif

-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO_1 = /DEBUG
+!if "$(SHARED)" == "1"
+__fldll___depname = \
+       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl_vc$(VENDORTAG).dll

 !endif
 !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
 !endif
 !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"

-__DEBUGINFO_2 = /Zi
+__DEBUGINFO_2 = /DEBUG

 !endif
 !if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
 __DEBUGINFO_2 = 
 !endif
 !if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
 __DEBUGINFO_2 = 


@@ -138,31 +130,32 @@ __DEBUGINFO_2 =
 __DEBUGINFO_2 = 
 !endif
 !if "$(DEBUG_INFO)" == "1"
 __DEBUGINFO_2 = 
 !endif
 !if "$(DEBUG_INFO)" == "1"

-__DEBUGINFO_2 = /Zi
+__DEBUGINFO_2 = /DEBUG

 !endif
 !if "$(DEBUG_RUNTIME_LIBS)" == "0"
 !endif
 !if "$(DEBUG_RUNTIME_LIBS)" == "0"

-__DEBUGRUNTIME_12 = 
+____DEBUGRUNTIME_3_p = 

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

-__DEBUGRUNTIME_12 = d
+____DEBUGRUNTIME_3_p = /D_DEBUG

 !endif
 !if "$(DEBUG_RUNTIME_LIBS)" == "default"
 !endif
 !if "$(DEBUG_RUNTIME_LIBS)" == "default"

-__DEBUGRUNTIME_12 = $(__DEBUGINFO)
+____DEBUGRUNTIME_3_p = $(____DEBUGINFO)

 !endif
 !if "$(DEBUG_RUNTIME_LIBS)" == "0"
 !endif
 !if "$(DEBUG_RUNTIME_LIBS)" == "0"

-__DEBUGRUNTIME_3 = 
+__DEBUGRUNTIME_4 = 

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

-__DEBUGRUNTIME_3 = d
+__DEBUGRUNTIME_4 = d

 !endif
 !if "$(DEBUG_RUNTIME_LIBS)" == "default"
 !endif
 !if "$(DEBUG_RUNTIME_LIBS)" == "default"

-__DEBUGRUNTIME_3 = $(__DEBUGINFO)
+__DEBUGRUNTIME_4 = $(__DEBUGINFO)

 !endif
 !endif

-!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
-__DEBUG_DEFINE_p = /D__WXDEBUG__
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib

 !endif
 !endif

-!if "$(DEBUG_FLAG)" == "1"
-__DEBUG_DEFINE_p = /D__WXDEBUG__
+!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_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib


@@ -170,40 +163,50 @@ __LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
 !if "$(USE_GUI)" == "1"
 __LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
 !endif

-!if "$(USE_GUI)" == "1"
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib

 !endif
 !endif

-!if "$(BUILD)" == "debug"
-__OPTIMIZEFLAG = /Od
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib

 !endif
 !endif

-!if "$(BUILD)" == "release"
-__OPTIMIZEFLAG = /O2
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib

 !endif
 !endif

-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS = D
+!if "$(SHARED)" == "0"
+__fllib___depname = \
+       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl.lib

 !endif
 !endif

-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS = T
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_15_p = 

 !endif
 !endif

-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p = /DwxUSE_UNICODE=1
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_15_p = /D_DEBUG

 !endif
 !endif

-!if "$(MSLU)" == "1"
-__UNICOWS_LIB_p = unicows.lib
+!if "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_15_p = $(____DEBUGINFO)

 !endif
 !endif

-!if "$(MONOLITHIC)" == "0"
-__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_16 = 

 !endif
 !endif

-!if "$(MONOLITHIC)" == "0"
-__WXLIB_CORE_p = \
-       wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_16 = d

 !endif
 !endif

-!if "$(MONOLITHIC)" == "1"
-__WXLIB_MONO_p = \
-       wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
+!if "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_16 = $(__DEBUGINFO)

 !endif
 !endif

-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = /Zi
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_1 = /Zi

 !endif
 !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
 ____DEBUGINFO = /D_DEBUG
 !endif
 !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
 ____DEBUGINFO = /D_DEBUG


@@ -217,31 +220,59 @@ ____DEBUGINFO =
 !if "$(DEBUG_INFO)" == "1"
 ____DEBUGINFO = /D_DEBUG
 !endif
 !if "$(DEBUG_INFO)" == "1"
 ____DEBUGINFO = /D_DEBUG
 !endif

-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_11_p = 
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = d

 !endif
 !endif

-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_11_p = /D_DEBUG
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = 

 !endif
 !endif

-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_11_p = $(____DEBUGINFO)
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO = 

 !endif
 !endif

-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_2_p = 
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO = d

 !endif
 !endif

-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_2_p = /D_DEBUG
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG = /Od

 !endif
 !endif

-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_2_p = $(____DEBUGINFO)
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG = /O2

 !endif
 !endif

-!if "$(SHARED)" == "1"
-__fldll___depname = \
-       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_vc$(VENDORTAG).dll
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS = D

 !endif
 !endif

-!if "$(SHARED)" == "0"
-__fllib___depname = \
-       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS = T
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONSFLAG = 
+!endif
+!if "$(USE_EXCEPTIONS)" == "1"
+__EXCEPTIONSFLAG = /GR
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONSFLAG_0 = 
+!endif
+!if "$(USE_EXCEPTIONS)" == "1"
+__EXCEPTIONSFLAG_0 = /GX
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = /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 "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = /D_UNICODE

 !endif
 
 
 !endif
 
 


@@ -253,6 +284,34 @@ $(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 $(OBJS)\*.pch del $(OBJS)\*.pch
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl_vc$(VENDORTAG).dll
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl_vc$(VENDORTAG).ilk
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl_vc$(VENDORTAG).pdb
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl.lib
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl.lib
+
+!if "$(SHARED)" == "1"
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl_vc$(VENDORTAG).dll: $(OBJS)\fldll_dummy.obj  $(FLDLL_OBJECTS)
+       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_2)  /LIBPATH:$(LIBDIRNAME) @<<
+       $(FLDLL_OBJECTS)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl.lib
+<<
+!endif
+
+!if "$(SHARED)" == "0"
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl.lib: $(OBJS)\fllib_dummy.obj  $(FLLIB_OBJECTS)
+       if exist $@ del $@
+       lib /NOLOGO /OUT:$@ @<<
+       $(FLLIB_OBJECTS)
+<<
+!endif
+
+$(OBJS)\fldll_dummy.obj: ../../src/fl\..\..\..\src\msw\dummy.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(FLDLL_CXXFLAGS) /Ycwx/wxprec.h $**
+

 $(OBJS)\fldll_antiflickpl.obj: ../../src/fl\antiflickpl.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(FLDLL_CXXFLAGS) $**
 
 $(OBJS)\fldll_antiflickpl.obj: ../../src/fl\antiflickpl.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(FLDLL_CXXFLAGS) $**
 


@@ -268,9 +327,6 @@ $(OBJS)\fldll_cbcustom.obj: ../../src/fl\cbcustom.cpp
 $(OBJS)\fldll_controlbar.obj: ../../src/fl\controlbar.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(FLDLL_CXXFLAGS) $**
 
 $(OBJS)\fldll_controlbar.obj: ../../src/fl\controlbar.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(FLDLL_CXXFLAGS) $**
 

-$(OBJS)\fldll_dummy.obj: ../../src/fl\..\..\..\src\msw\dummy.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(FLDLL_CXXFLAGS) /Ycwx/wxprec.h $**
-

 $(OBJS)\fldll_dyntbar.obj: ../../src/fl\dyntbar.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(FLDLL_CXXFLAGS) $**
 
 $(OBJS)\fldll_dyntbar.obj: ../../src/fl\dyntbar.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(FLDLL_CXXFLAGS) $**
 


@@ -307,6 +363,9 @@ $(OBJS)\fldll_toolwnd.obj: ../../src/fl\toolwnd.cpp
 $(OBJS)\fldll_updatesmgr.obj: ../../src/fl\updatesmgr.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(FLDLL_CXXFLAGS) $**
 
 $(OBJS)\fldll_updatesmgr.obj: ../../src/fl\updatesmgr.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(FLDLL_CXXFLAGS) $**
 

+$(OBJS)\fllib_dummy.obj: ../../src/fl\..\..\..\src\msw\dummy.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(FLLIB_CXXFLAGS) /Ycwx/wxprec.h $**
+

 $(OBJS)\fllib_antiflickpl.obj: ../../src/fl\antiflickpl.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(FLLIB_CXXFLAGS) $**
 
 $(OBJS)\fllib_antiflickpl.obj: ../../src/fl\antiflickpl.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(FLLIB_CXXFLAGS) $**
 


@@ -322,9 +381,6 @@ $(OBJS)\fllib_cbcustom.obj: ../../src/fl\cbcustom.cpp
 $(OBJS)\fllib_controlbar.obj: ../../src/fl\controlbar.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(FLLIB_CXXFLAGS) $**
 
 $(OBJS)\fllib_controlbar.obj: ../../src/fl\controlbar.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(FLLIB_CXXFLAGS) $**
 

-$(OBJS)\fllib_dummy.obj: ../../src/fl\..\..\..\src\msw\dummy.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(FLLIB_CXXFLAGS) /Ycwx/wxprec.h $**
-

 $(OBJS)\fllib_dyntbar.obj: ../../src/fl\dyntbar.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(FLLIB_CXXFLAGS) $**
 
 $(OBJS)\fllib_dyntbar.obj: ../../src/fl\dyntbar.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(FLLIB_CXXFLAGS) $**
 


@@ -361,24 +417,3 @@ $(OBJS)\fllib_toolwnd.obj: ../../src/fl\toolwnd.cpp
 $(OBJS)\fllib_updatesmgr.obj: ../../src/fl\updatesmgr.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(FLLIB_CXXFLAGS) $**
 
 $(OBJS)\fllib_updatesmgr.obj: ../../src/fl\updatesmgr.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(FLLIB_CXXFLAGS) $**
 

-clean: 
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res
-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_vc$(VENDORTAG).dll
-       -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)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_vc$(VENDORTAG).dll: $(OBJS)\fldll_dummy.obj  $(FLDLL_OBJECTS)
-       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1)  /LIBPATH:$(LIBDIRNAME) @<<
-       $(FLDLL_OBJECTS)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib  $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib
-<<
-!endif
-
-!if "$(SHARED)" == "0"
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib: $(OBJS)\fllib_dummy.obj  $(FLLIB_OBJECTS)
-       if exist $@ del $@
-       lib /NOLOGO /OUT:$@ @<<
-       $(FLLIB_OBJECTS)
-<<
-!endif