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

defs.mk: Fix compilation with ytools

Browse source 
- Add $(MODDIR)/include to CFLAGS if $(USE_YTOOLS) = true
  - Ignore F.* (as in dsp stuff) in version string
This commit is contained in:
Jan Lindemann 2007-06-30 11:18:14 +00:00 • committed by Jan Lindemann
commit 9b61381a61
1 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
make/defs.mk
View file

@ -10,7 +10,7 @@ CUSTOMER ?= No customer
VERSION ?= $(shell cat $(TOPDIR)/VERSION)
DIST_VERSION ?= $(shell sed -e "s/-dev//" $(TOPDIR)/VERSION)
HEX_VERSION = $(shell echo $(DIST_VERSION) | \
sed 's/-dev//; s/pre[^\.]*//; s/[\.-]/ /g' | xargs printf "0x%02x%02x%02x%02x")
sed 's/-dev//; s/pre[^\.]*//; s/F[^\.]//; s/[\.-]/ /g' | xargs printf "0x%02x%02x%02x%02x")
DEVELOPMENT ?= $(shell grep -q 'dev' $(TOPDIR)/VERSION && echo true)
USE_PROJECT_LIB ?= true
USE_YTOOLS ?= true
@ -296,6 +296,8 @@ ifeq ($(USE_PROJECT_LIB),true)
endif
ifeq ($(USE_YTOOLS),true)
CFLAGS += -I$(MODDIR)/include
CPPFLAGS += -I$(MODDIR)/include
PROJECTLIB_LDFLAGS += -lytools -L$(MODDIR)/lib
LD_LIB_PATH += $(MODDIR)/lib
endif