X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b17c1746930b29c13d5bfff0009721cbcefa53f1..65baafba0e8cd74f2264b7e2f7625ff5bea84864:/contrib/build/fl/makefile.gcc

diff --git a/contrib/build/fl/makefile.gcc b/contrib/build/fl/makefile.gcc
index fe33ca71c0..2d511f93b7 100644
--- a/contrib/build/fl/makefile.gcc
+++ b/contrib/build/fl/makefile.gcc
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.1.2 (http://bakefile.sourceforge.net)
+#     Bakefile 0.1.9 (http://bakefile.sourceforge.net)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
@@ -12,17 +12,24 @@ include ../../../build/msw/config.gcc
 
 ### Variables: ###
 
+CPPDEPS = -MT$@ -MF$@.d -MD
+WX_RELEASE_NODOT = 27
+WX_VERSION_NODOT = $(WX_RELEASE_NODOT)0
 OBJS = \
 	gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = ..\..\src\fl\..\..\..\lib\gcc_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \
 	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-FLDLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H \
-	-D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
-	-I..\..\src\fl\..\..\..\include -I$(SETUPHDIR) -Wall \
-	-I..\..\src\fl\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_FL \
-	$(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_0) $(CPPFLAGS) $(CXXFLAGS)
+FLDLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) $(GCCFLAGS) \
+	-DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
+	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
+	$(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) -I..\..\src\fl\..\..\..\include \
+	-I$(SETUPHDIR) -W -Wall -I..\..\src\fl\..\..\include -DWXUSINGDLL \
+	-DWXMAKINGDLL_FL $(__RTTIFLAG) $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy \
+	$(CPPFLAGS) $(CXXFLAGS)
 FLDLL_OBJECTS =  \
 	$(OBJS)\fldll_dummy.o \
+	$(OBJS)\fldll_version_rc.o \
 	$(OBJS)\fldll_antiflickpl.o \
 	$(OBJS)\fldll_bardragpl.o \
 	$(OBJS)\fldll_barhintspl.o \
@@ -40,11 +47,12 @@ FLDLL_OBJECTS =  \
 	$(OBJS)\fldll_rowlayoutpl.o \
 	$(OBJS)\fldll_toolwnd.o \
 	$(OBJS)\fldll_updatesmgr.o
-FLLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H \
-	-D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
-	-I..\..\src\fl\..\..\..\include -I$(SETUPHDIR) -Wall \
-	-I..\..\src\fl\..\..\include $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_0) \
-	$(CPPFLAGS) $(CXXFLAGS)
+FLLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) $(GCCFLAGS) \
+	-DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
+	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
+	$(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) -I..\..\src\fl\..\..\..\include \
+	-I$(SETUPHDIR) -W -Wall -I..\..\src\fl\..\..\include $(__RTTIFLAG) \
+	$(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
 FLLIB_OBJECTS =  \
 	$(OBJS)\fllib_dummy.o \
 	$(OBJS)\fllib_antiflickpl.o \
@@ -99,13 +107,51 @@ endif
 ifeq ($(SHARED),1)
 WXDLLFLAG = dll
 endif
+ifeq ($(SHARED),0)
+LIBTYPE_SUFFIX = lib
+endif
+ifeq ($(SHARED),1)
+LIBTYPE_SUFFIX = dll
+endif
+ifeq ($(MONOLITHIC),0)
+EXTRALIBS_FOR_BASE = 
+endif
+ifeq ($(MONOLITHIC),1)
+EXTRALIBS_FOR_BASE =  
+endif
 ifeq ($(SHARED),1)
 __fldll___depname = \
-	$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_gcc$(VENDORTAG).dll
+	$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl_gcc$(VENDORTAG).dll
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+endif
+ifeq ($(BUILD),debug)
+ifeq ($(DEBUG_FLAG),default)
+__DEBUG_DEFINE_p_1 = --define __WXDEBUG__
+endif
+endif
+ifeq ($(DEBUG_FLAG),1)
+__DEBUG_DEFINE_p_1 = --define __WXDEBUG__
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p_1 = --define _UNICODE
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1
 endif
 ifeq ($(MONOLITHIC),1)
 __WXLIB_MONO_p = \
-	-lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+	-lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
 endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
@@ -121,14 +167,15 @@ __UNICOWS_LIB_p = -lunicows
 endif
 ifeq ($(MONOLITHIC),0)
 __WXLIB_CORE_p = \
-	-lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core
+	-lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
 endif
 ifeq ($(MONOLITHIC),0)
-__WXLIB_BASE_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+__WXLIB_BASE_p = \
+	-lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
 endif
 ifeq ($(SHARED),0)
 __fllib___depname = \
-	$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.a
+	$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl.a
 endif
 ifeq ($(BUILD),debug)
 ifeq ($(DEBUG_INFO),default)
@@ -152,17 +199,23 @@ endif
 ifeq ($(BUILD),release)
 __OPTIMIZEFLAG = -O2
 endif
-ifeq ($(USE_EXCEPTIONS),0)
-__EXCEPTIONSFLAG = -fno-rtti
+ifeq ($(USE_THREADS),0)
+__THREADSFLAG = 
 endif
-ifeq ($(USE_EXCEPTIONS),1)
-__EXCEPTIONSFLAG = 
+ifeq ($(USE_THREADS),1)
+__THREADSFLAG = -mthreads
+endif
+ifeq ($(USE_RTTI),0)
+__RTTIFLAG = -fno-rtti
+endif
+ifeq ($(USE_RTTI),1)
+__RTTIFLAG = 
 endif
 ifeq ($(USE_EXCEPTIONS),0)
-__EXCEPTIONSFLAG_0 = -fno-exceptions
+__EXCEPTIONSFLAG = -fno-exceptions
 endif
 ifeq ($(USE_EXCEPTIONS),1)
-__EXCEPTIONSFLAG_0 = 
+__EXCEPTIONSFLAG = 
 endif
 ifeq ($(WXUNIV),1)
 __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
@@ -175,14 +228,20 @@ endif
 ifeq ($(DEBUG_FLAG),1)
 __DEBUG_DEFINE_p = -D__WXDEBUG__
 endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p = -DwxNO_RTTI
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p = -DwxNO_THREADS
+endif
 ifeq ($(UNICODE),1)
 __UNICODE_DEFINE_p = -D_UNICODE
 endif
-ifeq ($(SHARED),0)
-LIBDIRNAME = ..\..\src\fl\..\..\..\lib\gcc_lib$(CFG)
-endif
-ifeq ($(SHARED),1)
-LIBDIRNAME = ..\..\src\fl\..\..\..\lib\gcc_dll$(CFG)
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
 endif
 
 
@@ -196,128 +255,136 @@ all: $(__fldll___depname) $(__fllib___depname)
 
 clean: 
 	-if exist $(OBJS)\*.o del $(OBJS)\*.o
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_gcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_gcc$(VENDORTAG).dll
-	-if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.a
-	-if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.a
+	-if exist $(OBJS)\*.d del $(OBJS)\*.d
+	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl_gcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl_gcc$(VENDORTAG).dll
+	-if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl.a
+	-if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl.a
 
 ifeq ($(SHARED),1)
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_gcc$(VENDORTAG).dll: $(FLDLL_OBJECTS)
-	$(CXX) -shared -o $@ $(FLDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.a  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG)  $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl_gcc$(VENDORTAG).dll: $(FLDLL_OBJECTS) $(OBJS)\fldll_version_rc.o
+	$(CXX) -shared -fPIC -o $@ $(FLDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl.a  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)
 endif
 
 ifeq ($(SHARED),0)
-$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.a: $(FLLIB_OBJECTS)
+$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl.a: $(FLLIB_OBJECTS)
 	if exist $@ del $@
 	ar rcu $@ $(FLLIB_OBJECTS)
 	ranlib $@
 endif
 
 $(OBJS)\fldll_dummy.o: ../../src/fl/../../../src/msw/dummy.cpp
-	$(CXX) -c -o $@ $(FLDLL_CXXFLAGS) $<
+	$(CXX) -c -o $@ $(FLDLL_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\fldll_version_rc.o: ../../src/fl/../../../src/msw/version.rc
+	windres --use-temp-file -i$< -o$@   --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir ../../src/fl/../../../include --include-dir $(SETUPHDIR) --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl_gcc$(VENDORTAG)
 
 $(OBJS)\fldll_antiflickpl.o: ../../src/fl/antiflickpl.cpp
-	$(CXX) -c -o $@ $(FLDLL_CXXFLAGS) $<
+	$(CXX) -c -o $@ $(FLDLL_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\fldll_bardragpl.o: ../../src/fl/bardragpl.cpp
-	$(CXX) -c -o $@ $(FLDLL_CXXFLAGS) $<
+	$(CXX) -c -o $@ $(FLDLL_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\fldll_barhintspl.o: ../../src/fl/barhintspl.cpp
-	$(CXX) -c -o $@ $(FLDLL_CXXFLAGS) $<
+	$(CXX) -c -o $@ $(FLDLL_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\fldll_cbcustom.o: ../../src/fl/cbcustom.cpp
-	$(CXX) -c -o $@ $(FLDLL_CXXFLAGS) $<
+	$(CXX) -c -o $@ $(FLDLL_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\fldll_controlbar.o: ../../src/fl/controlbar.cpp
-	$(CXX) -c -o $@ $(FLDLL_CXXFLAGS) $<
+	$(CXX) -c -o $@ $(FLDLL_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\fldll_dyntbar.o: ../../src/fl/dyntbar.cpp
-	$(CXX) -c -o $@ $(FLDLL_CXXFLAGS) $<
+	$(CXX) -c -o $@ $(FLDLL_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\fldll_dyntbarhnd.o: ../../src/fl/dyntbarhnd.cpp
-	$(CXX) -c -o $@ $(FLDLL_CXXFLAGS) $<
+	$(CXX) -c -o $@ $(FLDLL_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\fldll_frmview.o: ../../src/fl/frmview.cpp
-	$(CXX) -c -o $@ $(FLDLL_CXXFLAGS) $<
+	$(CXX) -c -o $@ $(FLDLL_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\fldll_garbagec.o: ../../src/fl/garbagec.cpp
-	$(CXX) -c -o $@ $(FLDLL_CXXFLAGS) $<
+	$(CXX) -c -o $@ $(FLDLL_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\fldll_gcupdatesmgr.o: ../../src/fl/gcupdatesmgr.cpp
-	$(CXX) -c -o $@ $(FLDLL_CXXFLAGS) $<
+	$(CXX) -c -o $@ $(FLDLL_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\fldll_hintanimpl.o: ../../src/fl/hintanimpl.cpp
-	$(CXX) -c -o $@ $(FLDLL_CXXFLAGS) $<
+	$(CXX) -c -o $@ $(FLDLL_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\fldll_newbmpbtn.o: ../../src/fl/newbmpbtn.cpp
-	$(CXX) -c -o $@ $(FLDLL_CXXFLAGS) $<
+	$(CXX) -c -o $@ $(FLDLL_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\fldll_panedrawpl.o: ../../src/fl/panedrawpl.cpp
-	$(CXX) -c -o $@ $(FLDLL_CXXFLAGS) $<
+	$(CXX) -c -o $@ $(FLDLL_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\fldll_rowdragpl.o: ../../src/fl/rowdragpl.cpp
-	$(CXX) -c -o $@ $(FLDLL_CXXFLAGS) $<
+	$(CXX) -c -o $@ $(FLDLL_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\fldll_rowlayoutpl.o: ../../src/fl/rowlayoutpl.cpp
-	$(CXX) -c -o $@ $(FLDLL_CXXFLAGS) $<
+	$(CXX) -c -o $@ $(FLDLL_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\fldll_toolwnd.o: ../../src/fl/toolwnd.cpp
-	$(CXX) -c -o $@ $(FLDLL_CXXFLAGS) $<
+	$(CXX) -c -o $@ $(FLDLL_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\fldll_updatesmgr.o: ../../src/fl/updatesmgr.cpp
-	$(CXX) -c -o $@ $(FLDLL_CXXFLAGS) $<
+	$(CXX) -c -o $@ $(FLDLL_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\fllib_dummy.o: ../../src/fl/../../../src/msw/dummy.cpp
-	$(CXX) -c -o $@ $(FLLIB_CXXFLAGS) $<
+	$(CXX) -c -o $@ $(FLLIB_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\fllib_antiflickpl.o: ../../src/fl/antiflickpl.cpp
-	$(CXX) -c -o $@ $(FLLIB_CXXFLAGS) $<
+	$(CXX) -c -o $@ $(FLLIB_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\fllib_bardragpl.o: ../../src/fl/bardragpl.cpp
-	$(CXX) -c -o $@ $(FLLIB_CXXFLAGS) $<
+	$(CXX) -c -o $@ $(FLLIB_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\fllib_barhintspl.o: ../../src/fl/barhintspl.cpp
-	$(CXX) -c -o $@ $(FLLIB_CXXFLAGS) $<
+	$(CXX) -c -o $@ $(FLLIB_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\fllib_cbcustom.o: ../../src/fl/cbcustom.cpp
-	$(CXX) -c -o $@ $(FLLIB_CXXFLAGS) $<
+	$(CXX) -c -o $@ $(FLLIB_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\fllib_controlbar.o: ../../src/fl/controlbar.cpp
-	$(CXX) -c -o $@ $(FLLIB_CXXFLAGS) $<
+	$(CXX) -c -o $@ $(FLLIB_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\fllib_dyntbar.o: ../../src/fl/dyntbar.cpp
-	$(CXX) -c -o $@ $(FLLIB_CXXFLAGS) $<
+	$(CXX) -c -o $@ $(FLLIB_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\fllib_dyntbarhnd.o: ../../src/fl/dyntbarhnd.cpp
-	$(CXX) -c -o $@ $(FLLIB_CXXFLAGS) $<
+	$(CXX) -c -o $@ $(FLLIB_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\fllib_frmview.o: ../../src/fl/frmview.cpp
-	$(CXX) -c -o $@ $(FLLIB_CXXFLAGS) $<
+	$(CXX) -c -o $@ $(FLLIB_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\fllib_garbagec.o: ../../src/fl/garbagec.cpp
-	$(CXX) -c -o $@ $(FLLIB_CXXFLAGS) $<
+	$(CXX) -c -o $@ $(FLLIB_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\fllib_gcupdatesmgr.o: ../../src/fl/gcupdatesmgr.cpp
-	$(CXX) -c -o $@ $(FLLIB_CXXFLAGS) $<
+	$(CXX) -c -o $@ $(FLLIB_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\fllib_hintanimpl.o: ../../src/fl/hintanimpl.cpp
-	$(CXX) -c -o $@ $(FLLIB_CXXFLAGS) $<
+	$(CXX) -c -o $@ $(FLLIB_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\fllib_newbmpbtn.o: ../../src/fl/newbmpbtn.cpp
-	$(CXX) -c -o $@ $(FLLIB_CXXFLAGS) $<
+	$(CXX) -c -o $@ $(FLLIB_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\fllib_panedrawpl.o: ../../src/fl/panedrawpl.cpp
-	$(CXX) -c -o $@ $(FLLIB_CXXFLAGS) $<
+	$(CXX) -c -o $@ $(FLLIB_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\fllib_rowdragpl.o: ../../src/fl/rowdragpl.cpp
-	$(CXX) -c -o $@ $(FLLIB_CXXFLAGS) $<
+	$(CXX) -c -o $@ $(FLLIB_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\fllib_rowlayoutpl.o: ../../src/fl/rowlayoutpl.cpp
-	$(CXX) -c -o $@ $(FLLIB_CXXFLAGS) $<
+	$(CXX) -c -o $@ $(FLLIB_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\fllib_toolwnd.o: ../../src/fl/toolwnd.cpp
-	$(CXX) -c -o $@ $(FLLIB_CXXFLAGS) $<
+	$(CXX) -c -o $@ $(FLLIB_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\fllib_updatesmgr.o: ../../src/fl/updatesmgr.cpp
-	$(CXX) -c -o $@ $(FLLIB_CXXFLAGS) $<
+	$(CXX) -c -o $@ $(FLLIB_CXXFLAGS) $(CPPDEPS) $<
 
 .PHONY: all clean
+
+
+# Dependencies tracking:
+-include $(OBJS)/*.d