X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3f55f5b81fbe7a2294912663c192113209bbc930..c0b0635cf69537ca32377bad5650b39402cb21b6:/contrib/build/fl/makefile.vc?ds=sidebyside diff --git a/contrib/build/fl/makefile.vc b/contrib/build/fl/makefile.vc index 2f2b3477d9..3bca8de951 100644 --- a/contrib/build/fl/makefile.vc +++ b/contrib/build/fl/makefile.vc @@ -1,10 +1,10 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.4 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= -!include <../../../build/config.vc> +!include <../../../build/msw/config.vc> # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -12,17 +12,21 @@ ### 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$(LIBDIRNAME) /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\..\..\..\src\expat\lib /I..\..\src\fl\..\..\include \ - /DWXUSINGDLL /DWXMAKINGDLL_FL $(CXXFLAGS) /Yu"wx/wxprec.h" \ - /Fp"$(OBJS)\wxprec_fldll.pch" +WX_RELEASE_NODOT = 25 +WX_VERSION_NODOT = $(WX_RELEASE_NODOT)3 +OBJS = \ + vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(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 \ @@ -42,16 +46,14 @@ FLDLL_OBJECTS = \ $(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$(LIBDIRNAME) /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\..\..\..\src\expat\lib /I..\..\src\fl\..\..\include \ - $(CXXFLAGS) /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 \ @@ -71,10 +73,6 @@ FLLIB_OBJECTS = \ $(OBJS)\fllib_rowlayoutpl.obj \ $(OBJS)\fllib_toolwnd.obj \ $(OBJS)\fllib_updatesmgr.obj -LIBDIRNAME = \ - ..\..\src\fl\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -OBJS = \ - vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) ### Conditionally set variables: ### @@ -96,41 +94,21 @@ 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 = d -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO = d -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_1 = +!if "$(SHARED)" == "1" +WXDLLFLAG = dll !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" -__DEBUGINFO_2 = /Zi +__DEBUGINFO_2 = /DEBUG !endif !if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" __DEBUGINFO_2 = @@ -139,31 +117,32 @@ __DEBUGINFO_2 = __DEBUGINFO_2 = !endif !if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_2 = /Zi +__DEBUGINFO_2 = /DEBUG !endif !if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_12 = +____DEBUGRUNTIME_3_p = !endif !if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_12 = d +____DEBUGRUNTIME_3_p = /D_DEBUG !endif !if "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_12 = $(__DEBUGINFO) +____DEBUGRUNTIME_3_p = $(____DEBUGINFO) !endif !if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_3 = +__DEBUGRUNTIME_4 = !endif !if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_3 = d +__DEBUGRUNTIME_4 = d !endif !if "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = $(__DEBUGINFO) +__DEBUGRUNTIME_4 = $(__DEBUGINFO) !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 -!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 @@ -171,75 +150,122 @@ __LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib !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 -!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 -!if "$(BUILD)" == "release" -__OPTIMIZEFLAG = /O2 +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = \ + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !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 -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS = T +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_15_p = !endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p = /DwxUSE_UNICODE=1 +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_15_p = /D_DEBUG !endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!if "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_15_p = $(____DEBUGINFO) !endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = \ - wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_16 = !endif -!if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = \ - wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_16 = d !endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ +!if "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_16 = $(__DEBUGINFO) +!endif +!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)" == "release" && "$(DEBUG_INFO)" == "default" -____DEBUGINFO = /DNDEBUG +____DEBUGINFO = !endif !if "$(DEBUG_INFO)" == "0" -____DEBUGINFO = /DNDEBUG +____DEBUGINFO = !endif !if "$(DEBUG_INFO)" == "1" ____DEBUGINFO = /D_DEBUG !endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_11_p = /DNDEBUG +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO = d !endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_11_p = /D_DEBUG +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO = !endif -!if "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_11_p = $(____DEBUGINFO) +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO = !endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p = /DNDEBUG +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO = d !endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p = /D_DEBUG +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG = /Od !endif -!if "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = $(____DEBUGINFO) +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG = /O2 !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 +!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 !if "$(SHARED)" == "0" -__fllib___depname = \ - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib +LIBDIRNAME = ..\..\src\fl\..\..\..\lib\vc_lib$(CFG) +!endif +!if "$(SHARED)" == "1" +LIBDIRNAME = ..\..\src\fl\..\..\..\lib\vc_dll$(CFG) !endif @@ -251,6 +277,33 @@ $(OBJS): 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)$(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 $(__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) $** @@ -266,9 +319,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_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) $** @@ -305,6 +355,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)\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) $** @@ -320,9 +373,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_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) $** @@ -358,25 +408,3 @@ $(OBJS)\fllib_toolwnd.obj: ../../src/fl\toolwnd.cpp $(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: $(FLDLL_OBJECTS) $(OBJS)\fldll_dummy.obj - 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 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: $(FLLIB_OBJECTS) $(OBJS)\fllib_dummy.obj - if exist $@ del $@ - lib /NOLOGO /OUT:$@ @<< - $(FLLIB_OBJECTS) -<< -!endif