janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-23 06:30:38 +01:00
Code Activity

defs-cpp.mk, platform.mk: Rename variable MINGW_SYS_ROOT -> TC_SYS_ROOT

Browse source 
Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2019-03-03 09:31:38 +00:00
commit ce2c6b0190
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

12
make/defs-cpp.mk
View file

@ -72,12 +72,12 @@ ifeq ($(TARGET),mingw)
ifneq ($(wildcard /usr/bin/i686-w64-mingw32-gcc),) ifneq ($(wildcard /usr/bin/i686-w64-mingw32-gcc),)
PROJECT_CFLAGS += -D_WINDOWS PROJECT_CFLAGS += -D_WINDOWS
PROJECT_CPPFLAGS += -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_DIR ?=
CROSS_TOOL_BIN_PREFIX ?= $(CROSS_TOOL_DIR)/usr/bin/i686-w64-mingw32- CROSS_TOOL_BIN_PREFIX ?= $(CROSS_TOOL_DIR)/usr/bin/i686-w64-mingw32-
PROJECT_LDFLAGS += -L$(MINGW_SYS_ROOT)/lib PROJECT_LDFLAGS += -L$(TC_SYS_ROOT)/lib
PROJECT_CFLAGS += -I$(MINGW_SYS_ROOT)/include PROJECT_CFLAGS += -I$(TC_SYS_ROOT)/include
PROJECT_CPPFLAGS += -I$(MINGW_SYS_ROOT)/include PROJECT_CPPFLAGS += -I$(TC_SYS_ROOT)/include
else else
CROSS_TOOL_DIR ?= /opt/cross-tools CROSS_TOOL_DIR ?= /opt/cross-tools
CROSS_TOOL_BIN_PREFIX ?= $(CROSS_TOOL_DIR)/bin/i686-pc-mingw32- CROSS_TOOL_BIN_PREFIX ?= $(CROSS_TOOL_DIR)/bin/i686-pc-mingw32-
@ -521,10 +521,10 @@ BUILD_LIBDIR = $(TOPDIR)/lib
LOCAL_LIBS += $(CONTRIB_LIBS) $(PLUGIN) LOCAL_LIBS += $(CONTRIB_LIBS) $(PLUGIN)
ifeq ($(TARGET),mingw) ifeq ($(TARGET),mingw)
ifeq ($(MINGW_SYS_ROOT),) ifeq ($(TC_SYS_ROOT),)
CONTRIB_LIBS_PATH += $(CROSS_TOOL_DIR)/bin CONTRIB_LIBS_PATH += $(CROSS_TOOL_DIR)/bin
else else
CONTRIB_LIBS_PATH += $(MINGW_SYS_ROOT)/lib CONTRIB_LIBS_PATH += $(TC_SYS_ROOT)/lib
endif endif
endif endif

2
make/platform.mk
View file

@ -94,7 +94,7 @@ ifneq ($(TARGET_TUPLE),$(OS_TUPLE))
FLAVOUR_PATH_PREFIX ?= win32/ FLAVOUR_PATH_PREFIX ?= win32/
FLAVOUR_PATH_SUFFIX ?= /win32 FLAVOUR_PATH_SUFFIX ?= /win32
ifneq ($(wildcard /usr/bin/i686-w64-mingw32-gcc),) 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 endif
else else
FLAVOUR_PREFIX ?= $(TARGET_TRIPLET)- FLAVOUR_PREFIX ?= $(TARGET_TRIPLET)-