janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-24 14:50:38 +01:00
Code Activity

defs.mk: Support USE_GLIB

Browse source 
Inherit glib CFLAGS and LDFLAGS from proj.mk, where no ARCH variable
is present to do it right.
This commit is contained in:
Jan Lindemann 2007-08-16 22:11:14 +00:00 • committed by Jan Lindemann
commit add8b43cc5
1 changed files with 20 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

20
make/defs.mk
View file

@ -70,6 +70,7 @@ LD_LIB_PATH += $(MODDIR)/lib
PROJECT ?= $(notdir $(shell cd $(TOPDIR); pwd)) PROJECT ?= $(notdir $(shell cd $(TOPDIR); pwd))
LIBNAME ?= $(PROJECT) LIBNAME ?= $(PROJECT)
LIBTYPE ?= shared
TARGET ?= Linux TARGET ?= Linux
@ -479,6 +480,25 @@ ifeq ($(STRIP_SYMBOLS),true)
STRIP_DONE ?= strip.done STRIP_DONE ?= strip.done
endif 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)
PROJECT_LDFLAGS += $(shell PKG_CONFIG_PATH=/opt/gnome/lib/pkgconfig pkg-config --libs glib-2.0)
else
ifeq ($(ARCH),x86_64)
PROJECT_CFLAGS += $(shell export PKG_CONFIG_PATH=/opt/gnome/lib64/pkgconfig; pkg-config --cflags glib-2.0)
PROJECT_CPPFLAGS += $(shell export PKG_CONFIG_PATH=/opt/gnome/lib64/pkgconfig; pkg-config --cflags glib-2.0)
PROJECT_LDFLAGS += $(shell export PKG_CONFIG_PATH=/opt/gnome/lib64/pkgconfig; pkg-config --libs glib-2.0)
endif
endif
PROJECT_LDFLAGS += -ldl -lpthread
else
PROJECT_LDFLAGS += -lglib-2.0
endif
endif
#export PROJECT PROJECT_CFLAGS PROJECT_CPPFLAGS PROJECT_LDFLAGS USE_TIMER #export PROJECT PROJECT_CFLAGS PROJECT_CPPFLAGS PROJECT_LDFLAGS USE_TIMER