janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-15 12:03:31 +01:00
Code Activity

defs.mk: Fix CONTRIB_LIBS_PATH

Browse source
This commit is contained in:
Jan Lindemann 2012-04-04 18:32:14 +00:00 • committed by Jan Lindemann
commit 875084f7b2
1 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

16
make/defs.mk
View file

@ -27,6 +27,9 @@ FLAVOUR_PREFIX ?= win32-
FLAVOUR_SUFFIX ?= -win32
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
endif
endif
# ----- executables
@ -149,11 +152,12 @@ BUILD_CPPFLAGS += -DVERSION=$(HEX_VERSION)
ifeq ($(TARGET),mingw)
ifneq ($(wildcard /usr/bin/i686-w64-mingw32-gcc),)
MINGW_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/usr/i686-w64-mingw32/sys-root/mingw/lib
PROJECT_CFLAGS += -L/usr/i686-w64-mingw32/sys-root/mingw/include
PROJECT_CPPFLAGS += -L/usr/i686-w64-mingw32/sys-root/mingw/include
PROJECT_LDFLAGS += -L$(MINGW_SYS_ROOT)/lib
PROJECT_CFLAGS += -L$(MINGW_SYS_ROOT)/include
PROJECT_CPPFLAGS += -L$(MINGW_SYS_ROOT)/include
else
CROSS_TOOL_DIR ?= /opt/cross-tools
CROSS_TOOL_BIN_PREFIX ?= $(CROSS_TOOL_DIR)/bin/i686-pc-mingw32-
@ -292,7 +296,11 @@ INSTALLED_DOC ?= $(addprefix $(INSTALL_DOCDIR)/,$(DOCS))
BUILD_LIBDIR = $(TOPDIR)/lib
LOCAL_LIBS += $(CONTRIB_LIBS) $(PLUGIN)
ifeq ($(TARGET),mingw)
CONTRIB_LIBS_PATH += $(CROSS_TOOL_DIR)/bin
ifeq ($(MINGW_SYS_ROOT),)
CONTRIB_LIBS_PATH += $(CROSS_TOOL_DIR)/bin
else
CONTRIB_LIBS_PATH += $(MINGW_SYS_ROOT)/lib
endif
endif
LIBTYPE ?= shared