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

defs.mk.in: Do all -DVERSION_STR handling

Browse source 
Push -DVERSION_STR from main.mk and yapp.mk into defs.mk.in.
This commit is contained in:
Jan Lindemann 2012-05-02 17:55:14 +00:00 • committed by Jan Lindemann
commit adfdec7492
3 changed files with 3 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
make/defs.mk
View file

@ -147,8 +147,8 @@ SYSCFG_FILE ?= $(SYSCFG_DIR)/$(PROJECT)
endif
OPTS_PID_FILE ?= $(PIDDIR)/$(PROJECT).pid
BUILD_CFLAGS += -DVERSION=$(HEX_VERSION)
BUILD_CPPFLAGS += -DVERSION=$(HEX_VERSION)
BUILD_CFLAGS += -DVERSION=$(HEX_VERSION) -DVERSION_STR=\"$(VERSION)\"
BUILD_CPPFLAGS += -DVERSION=$(HEX_VERSION) -DVERSION_STR=\"$(VERSION)\"
ifeq ($(TARGET),mingw)
ifneq ($(wildcard /usr/bin/i686-w64-mingw32-gcc),)

3
make/main.mk
View file

@ -1,6 +1,5 @@
EXE = $(PROJECT)
LOCAL_CFLAGS += -DVERSION_STR=\"$(VERSION)\"
LOCAL_CPPFLAGS += -DVERSION_STR=\"$(VERSION)\"
ifneq ($(TARGET),mingw)
LOCAL_LDFLAGS += -rdynamic
endif

2
make/yapp.mk
View file

@ -2,8 +2,6 @@ LOCAL_CPP += main.cpp
YAPP_CLASS ?= $(firstword $(basename $(wildcard YApp*.h Y*.h *.h)))
YAPP_CLASS_H ?= $(firstword $(wildcard $(addsuffix /$(YAPP_CLASS).h,\
$(subst -I,,$(INCLUDE)))) $(YAPP_CLASS).h)
LOCAL_CFLAGS += -DVERSION_STR=\"$(VERSION)\"
LOCAL_CPPFLAGS += -DVERSION_STR=\"$(VERSION)\"
ifneq ($(TARGET),mingw)
LOCAL_LDFLAGS += -rdynamic