janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-28 15:52:49 +01:00
Code Activity

defs.mk: Adapted to change in glib pck-config files (moved from /opt/gnome to /usr)

Browse source 
Signed-off-by: Jan Lindemann <jan@jannet.de>
This commit is contained in:
Jan Lindemann 2012-11-01 11:11:23 +00:00 • committed by Jan Lindemann
commit 3dace13b7e
1 changed files with 3 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

14
make/defs.mk
View file

@ -86,7 +86,6 @@ PCKG_DEPS_DIR = $(MODDIR)/make/deps.d
PCKG_DEFS_DIR = $(MODDIR)/make/defs.d PCKG_DEFS_DIR = $(MODDIR)/make/defs.d
# ----- compilation options # ----- compilation options
USE_GFILTER ?= true
TARGET ?= Linux TARGET ?= Linux
OS ?= $(shell sh $(MOD_SCRIPT_DIR)/get_os.sh) OS ?= $(shell sh $(MOD_SCRIPT_DIR)/get_os.sh)
ifeq ($(shell uname -m),x86_64) ifeq ($(shell uname -m),x86_64)
@ -1450,16 +1449,9 @@ endif
ifeq ($(USE_GLIB),true) ifeq ($(USE_GLIB),true)
ifneq ($(TARGET),mingw) ifneq ($(TARGET),mingw)
ifeq ($(ARCH),x86) PROJECT_CFLAGS += $(shell pkg-config --cflags glib-2.0)
PROJECT_CFLAGS += $(shell PKG_CONFIG_PATH=/opt/gnome/lib/pkgconfig pkg-config --cflags glib-2.0) PROJECT_CPPFLAGS += $(shell pkg-config --cflags glib-2.0)
PROJECT_CPPFLAGS += $(shell PKG_CONFIG_PATH=/opt/gnome/lib/pkgconfig pkg-config --cflags glib-2.0) LIBFLAGS += $(shell pkg-config --libs glib-2.0)
LIBFLAGS += $(shell PKG_CONFIG_PATH=/opt/gnome/lib/pkgconfig pkg-config --libs glib-2.0)
endif
ifeq ($(ARCH),x86_64)
PROJECT_CFLAGS += $(shell PKG_CONFIG_PATH=/opt/gnome/lib64/pkgconfig pkg-config --cflags glib-2.0)
PROJECT_CPPFLAGS += $(shell PKG_CONFIG_PATH=/opt/gnome/lib64/pkgconfig pkg-config --cflags glib-2.0)
LIBFLAGS += $(shell PKG_CONFIG_PATH=/opt/gnome/lib64/pkgconfig pkg-config --libs glib-2.0)
endif
LIBFLAGS += -ldl -lpthread LIBFLAGS += -ldl -lpthread
else else
ifneq ($(wildcard $(CROSS_TOOL_DIR)/include/glib-2.0),) ifneq ($(wildcard $(CROSS_TOOL_DIR)/include/glib-2.0),)