mirror of
ssh://git.janware.com/srv/git/janware/proj/jw-pkg
synced 2026-01-15 12:03:31 +01:00
defs.mk: Support USE_GLIB
Inherit glib CFLAGS and LDFLAGS from proj.mk, where no ARCH variable is present to do it right.
This commit is contained in:
parent
2ed77378fa
commit
add8b43cc5
1 changed files with 20 additions and 0 deletions
20
make/defs.mk
20
make/defs.mk
|
|
@ -70,6 +70,7 @@ LD_LIB_PATH += $(MODDIR)/lib
|
|||
|
||||
PROJECT ?= $(notdir $(shell cd $(TOPDIR); pwd))
|
||||
LIBNAME ?= $(PROJECT)
|
||||
LIBTYPE ?= shared
|
||||
|
||||
TARGET ?= Linux
|
||||
|
||||
|
|
@ -479,6 +480,25 @@ ifeq ($(STRIP_SYMBOLS),true)
|
|||
STRIP_DONE ?= strip.done
|
||||
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
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue