diff --git a/make/defs.mk b/make/defs.mk index d558c33f..991ba055 100644 --- a/make/defs.mk +++ b/make/defs.mk @@ -86,7 +86,6 @@ PCKG_DEPS_DIR = $(MODDIR)/make/deps.d PCKG_DEFS_DIR = $(MODDIR)/make/defs.d # ----- compilation options -USE_GFILTER ?= true TARGET ?= Linux OS ?= $(shell sh $(MOD_SCRIPT_DIR)/get_os.sh) ifeq ($(shell uname -m),x86_64) @@ -1450,16 +1449,9 @@ endif ifeq ($(USE_GLIB),true) ifneq ($(TARGET),mingw) - ifeq ($(ARCH),x86) - PROJECT_CFLAGS += $(shell PKG_CONFIG_PATH=/opt/gnome/lib/pkgconfig 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_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 + PROJECT_CFLAGS += $(shell pkg-config --cflags glib-2.0) + PROJECT_CPPFLAGS += $(shell pkg-config --cflags glib-2.0) + LIBFLAGS += $(shell pkg-config --libs glib-2.0) LIBFLAGS += -ldl -lpthread else ifneq ($(wildcard $(CROSS_TOOL_DIR)/include/glib-2.0),)