diff --git a/config.mingw.mk b/config.mingw.mk index c2b6b08..f0f888c 100644 --- a/config.mingw.mk +++ b/config.mingw.mk @@ -1,5 +1,5 @@ #****************************************************************************** -# config.mingw.mk Recorder project +# config.mingw.mk Recorder project #****************************************************************************** # # File Description: @@ -31,10 +31,9 @@ include $(BUILD)config.gnu.mk # MinGW does not have --line-buffered for colorized builds LINE_BUFFERED= - # Windows overrides for extensions EXE_EXT= .exe -LIB_EXT= .lib +LIB_EXT= .a DLL_EXT= .dll # MinGW has no 'install' program diff --git a/config.mk b/config.mk index 14a4d9f..5e71d98 100644 --- a/config.mk +++ b/config.mk @@ -63,8 +63,8 @@ PREFIX_DLL?=$(PREFIX_LIB) # to the relevant GNU option names as follows: # CCFLAGS_STD=$(CC_FLAGS_STD_$(CC_STD)) # CCFLAGS_STD_gnu11=[whatever option is needed here] -CC_STD=gnu11 -CXX_STD=gnu++14 +CC_STD ?=gnu11 +CXX_STD ?=gnu++11 # Compilation flags DEFINES_debug= DEBUG diff --git a/rules.mk b/rules.mk index 38bcff7..2873997 100644 --- a/rules.mk +++ b/rules.mk @@ -332,7 +332,11 @@ ifdef TARGET DEPENDENCIES=$(SOURCES:%=$(OBJDIR)/%$(OBJ_EXT).d) OBJDIR_DEPS=$(OBJDIR)/%.deps/.mkdir +ifeq (3.80,$(firstword $(sort $(MAKE_VERSION) 3.80))) OBJ_DEPS=$(OBJDIR_DEPS) $(MAKEFILE_DEPS) | hello prebuild +else +OBJ_DEPS=$(OBJDIR_DEPS) $(MAKEFILE_DEPS) hello prebuild +endif ifndef DEPFLAGS $(OBJDIR)/%.c$(OBJ_EXT).d: %.c $(OBJ_DEPS)