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-dev.mk, defs.mk, run.mk: Fix mingw32 build

Browse source 
Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2016-11-09 14:03:37 +00:00
commit a7dc00db87
3 changed files with 14 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
make/defs-dev.mk
View file

@ -275,7 +275,11 @@ COMPILE_DEBUG_CODE ?= true
#COMPILE_DEBUG_LOG ?= true #COMPILE_DEBUG_LOG ?= true
USE_COMPILER_DEBUG_OPTS ?= true USE_COMPILER_DEBUG_OPTS ?= true
#USE_COMPILER_OPTIMIZATION_OPTS ?= true #USE_COMPILER_OPTIMIZATION_OPTS ?= true
ifeq ($(TARGET),mingw)
USE_STACK_PROTECTOR ?= false
else
USE_STACK_PROTECTOR ?= true USE_STACK_PROTECTOR ?= true
endif
#USE_STACK_CHECKER ?= true #USE_STACK_CHECKER ?= true
#USE_FUSE ?= true #USE_FUSE ?= true

9
make/defs.mk
View file

@ -113,13 +113,6 @@ MINOR_VERSION = $(shell echo $(MAJOR_MINOR_RELEASE) | cut -d. -f2)
RELEASE_VERSION = $(shell echo $(MAJOR_MINOR_RELEASE) | cut -d. -f3) RELEASE_VERSION = $(shell echo $(MAJOR_MINOR_RELEASE) | cut -d. -f3)
BUILD_NUMBER = $(shell echo $(DIST_VERSION) | cut -d- -f2) BUILD_NUMBER = $(shell echo $(DIST_VERSION) | cut -d- -f2)
CVS_RSH ?= /usr/bin/ssh CVS_RSH ?= /usr/bin/ssh
ifneq ($(EXE_BASENAME),)
ifneq ($(TARGET),mingw)
EXE ?= $(EXE_BASENAME)
else
EXE ?= $(EXE_BASENAME).exe
endif
endif
# ----- input dirs # ----- input dirs
YTOOLS_DIR = $(MODDIR) YTOOLS_DIR = $(MODDIR)
@ -170,8 +163,10 @@ USE_YTOOLS ?= true
USE_EXCEPTIONS_IN_C ?= true USE_EXCEPTIONS_IN_C ?= true
REENTRANT ?= true REENTRANT ?= true
ifneq ($(wildcard /usr/include/systemd/sd-daemon.h),) ifneq ($(wildcard /usr/include/systemd/sd-daemon.h),)
ifneq ($(TARGET),mingw)
USE_SYSTEMD ?= true USE_SYSTEMD ?= true
endif endif
endif
export REENTRANT export REENTRANT

9
make/run.mk
View file

@ -13,7 +13,14 @@ ifeq ($(EXE_BASENAME),)
endif endif
endif endif
EXE ?= $(EXE_BASENAME) ifneq ($(EXE_BASENAME),)
ifneq ($(TARGET),mingw)
EXE ?= $(EXE_BASENAME)
else
EXE ?= $(EXE_BASENAME).exe
endif
endif
EXE_PATH ?= ./$(EXE) EXE_PATH ?= ./$(EXE)
LOCAL_CFLAGS += -DEXE_NAME=\"$(EXE)\" LOCAL_CFLAGS += -DEXE_NAME=\"$(EXE)\"