diff --git a/make/defs-cpp.mk b/make/defs-cpp.mk index fa96d337..71abbddf 100644 --- a/make/defs-cpp.mk +++ b/make/defs-cpp.mk @@ -71,7 +71,7 @@ endif # ----- tool chain ifneq ($(TARGET_TRIPLET),$(HOST_TRIPLET)) # we're cross-compiling - + TC_BIN_PREFIX ?= $(TARGET_TRIPLET)- TC_SYS_ROOT ?= /usr/$(TARGET_TRIPLET) @@ -93,9 +93,9 @@ ifneq ($(TARGET_TRIPLET),$(HOST_TRIPLET)) # we're cross-compiling MS_LD ?= wine $(HOME)/local/mingw/packages/msvcpp/bin/LIB.EXE endif - PROJECT_CFLAGS += -I$(TC_SYS_ROOT)/include - PROJECT_CPPFLAGS += -I$(TC_SYS_ROOT)/include - PROJECT_LDFLAGS += -L$(TC_SYS_ROOT)/lib + #PROJECT_CFLAGS += -I$(TC_SYS_ROOT)/include + #PROJECT_CPPFLAGS += -I$(TC_SYS_ROOT)/include + #PROJECT_LDFLAGS += -L$(TC_SYS_ROOT)/lib else # we're not cross-compiling @@ -127,7 +127,7 @@ ifeq ($(COMPILER_SUITE),gcc) RANLIB ?= $(TC_BIN_PREFIX)ranlib AR ?= $(TC_BIN_PREFIX)ar PKG_CONFIG_EXE ?= $(TC_BIN_PREFIX)pkg-config - + # compiler and linker # gcc GCC_VERSION := $(shell $(GCC) -v 2>&1 | $(SED) '/gcc.version/I !d; s/.*version *//I; s/ \+.*//') @@ -154,7 +154,7 @@ ifeq ($(COMPILER_SUITE),gcc) #BUILD_CPPFLAGS += -Wsuggest-override endif endif - + ifeq ($(shell $(TEST) $(GCC_MAJOR) -ge 5; $(ECHO) $$?),0) ifeq ($(USE_CPP_FORCE_OVERRIDE),true) GCC_CPPFLAGS += -Werror=suggest-override @@ -195,14 +195,14 @@ OBJ += $(addprefix $(FLAVOUR_PREFIX),$(patsubst %.S,%.o, #PREREQ_C += $(foreach dir,$(PREREQ_DIR),$(wildcard $(dir)/*.c)) #PREREQ_CPP += $(foreach dir,$(PREREQ_DIR),$(wildcard $(dir)/*.c)) \ -# $(foreach dir,$(PREREQ_DIR),$(wildcard $(dir)/*.cpp)) +# $(foreach dir,$(PREREQ_DIR),$(wildcard $(dir)/*.cpp)) #PREREQ_CSRC += $(PREREQ_H) $(PREREQ_C) $(PREREQ_CPP) REQUIRED_DIR += $(patsubst %,$(MODDIR)/%,$(REQUIRED)) REQUIRED_DONE += $(patsubst %,%/all.done,$(REQUIRED_DIR)) REQUIRED_H += $(foreach dir,$(REQUIRED_DIR),$(wildcard $(dir)/*.h)) REQUIRED_C += $(foreach dir,$(REQUIRED_DIR),$(wildcard $(dir)/*.c)) REQUIRED_CPP += $(foreach dir,$(REQUIRED_DIR),$(wildcard $(dir)/*.cpp)) \ - $(foreach dir,$(PREREQ_DIR),$(wildcard $(dir)/*.cpp)) + $(foreach dir,$(PREREQ_DIR),$(wildcard $(dir)/*.cpp)) REQUIRED_CSRC += $(REQUIRED_H) $(REQUIRED_C) $(REQUIRED_CPP) ALL_C += $(LOCAL_C) $(PREREQ_CPP)