X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bdc408c4c6bfdfe743372bbd090224f293e91d07..25088f1eea365f0da7aeb565932dd4fe0fd5d20e:/contrib/build/fl/makefile.bcc diff --git a/contrib/build/fl/makefile.bcc b/contrib/build/fl/makefile.bcc index c6efc4bb9d..d191b9084c 100644 --- a/contrib/build/fl/makefile.bcc +++ b/contrib/build/fl/makefile.bcc @@ -8,7 +8,7 @@ BCCDIR = $(MAKEDIR)\.. !endif -!include ../../../build/config.bcc +!include ../../../build/msw/config.bcc # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -20,28 +20,67 @@ BCCDIR = $(MAKEDIR)\.. ### 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\..\..\..\src\expat\lib \ - -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\..\..\..\src\expat\lib \ - -I..\..\src\fl\..\..\include $(CXXFLAGS) -Hu -H=$(OBJS)\wxprec_fllib.csm +FLDLL_CXXFLAGS = $(CPPFLAGS) $(__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 \ + $(CXXFLAGS) -Hu -H=$(OBJS)\wxprec_fldll.csm +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 = $(CPPFLAGS) $(__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 $(CXXFLAGS) -Hu \ + -H=$(OBJS)\wxprec_fllib.csm +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 OBJS = \ bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +SETUPHDIR = \ + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) ### Conditionally set variables: ### +!if "$(SHARED)" == "0" +LIBDIRNAME = ..\..\src\fl\..\..\..\lib\bcc_lib$(CFG) +!endif +!if "$(SHARED)" == "1" +LIBDIRNAME = ..\..\src\fl\..\..\..\lib\bcc_dll$(CFG) +!endif !if "$(USE_GUI)" == "0" PORTNAME = base !endif @@ -54,7 +93,10 @@ VENDORTAG = _$(VENDOR) !if "$(OFFICIAL_BUILD)" == "1" VENDORTAG = !endif -!if "$(BUILD)" == "debug" +!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_FLAG)" == "1" WXDEBUGFLAG = d !endif !if "$(SHARED)" == "1" @@ -66,15 +108,33 @@ WXUNICODEFLAG = u !if "$(WXUNIV)" == "1" WXUNIVNAME = univ !endif -!if "$(BUILD)" == "debug" -__DEBUGFLAG = -v +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO = -v !endif -!if "$(BUILD)" == "release" -__DEBUGFLAG = -v- +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO = -v- !endif -!if "$(BUILD)" == "debug" +!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 "$(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 +!endif !if "$(BUILD)" == "debug" __OPTIMIZEFLAG = -Od !endif @@ -96,6 +156,9 @@ __RUNTIME_LIBS_7 = !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 !endif +!if "$(MSLU)" == "1" +__UNICOWS_LIB_p = unicows.lib +!endif !if "$(MONOLITHIC)" == "0" __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif @@ -112,11 +175,11 @@ __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ !endif !if "$(SHARED)" == "1" __fldll___depname = \ - ..\..\src\fl\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_bcc$(VENDORTAG).dll + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(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)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib !endif @@ -239,22 +302,22 @@ $(OBJS)\fllib_updatesmgr.obj: ../../src/fl\updatesmgr.cpp 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)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_bcc$(VENDORTAG).dll del ..\..\src\fl\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)250$(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 exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_bcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_bcc$(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" -..\..\src\fl\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)250$(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 wxexpat$(WXDEBUGFLAG).lib import32.lib ole2w32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) cw32mt$(__RUNTIME_LIBS_7).lib,, +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_bcc$(VENDORTAG).dll: $(OBJS)\fldll_dummy.obj $(FLDLL_OBJECTS) + ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) @&&| + c0d32.obj $(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) import32.lib ole2w32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, | - implib -f ..\..\src\fl\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl $@ + implib -f $(LIBDIRNAME)\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 +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib: $(OBJS)\fllib_dummy.obj $(FLLIB_OBJECTS) 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 + $(FLLIB_OBJECTS) | !endif