From ce2c6b019016182b61514a9236f49fc6ab9fbd1f Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Sun, 3 Mar 2019 09:31:38 +0000 Subject: [PATCH] defs-cpp.mk, platform.mk: Rename variable MINGW_SYS_ROOT -> TC_SYS_ROOT Signed-off-by: Jan Lindemann --- make/defs-cpp.mk | 12 ++++++------ make/platform.mk | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/make/defs-cpp.mk b/make/defs-cpp.mk index 4cb09c2c..2630748c 100644 --- a/make/defs-cpp.mk +++ b/make/defs-cpp.mk @@ -72,12 +72,12 @@ ifeq ($(TARGET),mingw) ifneq ($(wildcard /usr/bin/i686-w64-mingw32-gcc),) PROJECT_CFLAGS += -D_WINDOWS PROJECT_CPPFLAGS += -D_WINDOWS - MINGW_SYS_ROOT ?= /usr/i686-w64-mingw32/sys-root/mingw + TC_SYS_ROOT ?= /usr/i686-w64-mingw32/sys-root/mingw CROSS_TOOL_DIR ?= CROSS_TOOL_BIN_PREFIX ?= $(CROSS_TOOL_DIR)/usr/bin/i686-w64-mingw32- - PROJECT_LDFLAGS += -L$(MINGW_SYS_ROOT)/lib - PROJECT_CFLAGS += -I$(MINGW_SYS_ROOT)/include - PROJECT_CPPFLAGS += -I$(MINGW_SYS_ROOT)/include + PROJECT_LDFLAGS += -L$(TC_SYS_ROOT)/lib + PROJECT_CFLAGS += -I$(TC_SYS_ROOT)/include + PROJECT_CPPFLAGS += -I$(TC_SYS_ROOT)/include else CROSS_TOOL_DIR ?= /opt/cross-tools CROSS_TOOL_BIN_PREFIX ?= $(CROSS_TOOL_DIR)/bin/i686-pc-mingw32- @@ -521,10 +521,10 @@ BUILD_LIBDIR = $(TOPDIR)/lib LOCAL_LIBS += $(CONTRIB_LIBS) $(PLUGIN) ifeq ($(TARGET),mingw) - ifeq ($(MINGW_SYS_ROOT),) + ifeq ($(TC_SYS_ROOT),) CONTRIB_LIBS_PATH += $(CROSS_TOOL_DIR)/bin else - CONTRIB_LIBS_PATH += $(MINGW_SYS_ROOT)/lib + CONTRIB_LIBS_PATH += $(TC_SYS_ROOT)/lib endif endif diff --git a/make/platform.mk b/make/platform.mk index 495416ac..6cf45915 100644 --- a/make/platform.mk +++ b/make/platform.mk @@ -94,7 +94,7 @@ ifneq ($(TARGET_TUPLE),$(OS_TUPLE)) FLAVOUR_PATH_PREFIX ?= win32/ FLAVOUR_PATH_SUFFIX ?= /win32 ifneq ($(wildcard /usr/bin/i686-w64-mingw32-gcc),) - MINGW_SYS_ROOT ?= /usr/i686-w64-mingw32/sys-root/mingw + TC_SYS_ROOT ?= /usr/i686-w64-mingw32/sys-root/mingw endif else FLAVOUR_PREFIX ?= $(TARGET_TRIPLET)-