From 9032d3bee5e8ac439bcd902f7eab07d85c22a023 Mon Sep 17 00:00:00 2001 From: Mike Wey Date: Thu, 24 Oct 2013 22:29:56 +0200 Subject: Use the correct version flag for gdc and ldc. --- GNUmakefile | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/GNUmakefile b/GNUmakefile index c1625e8..d6946c6 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -23,13 +23,22 @@ ifeq ("$(DC)","gdc") DCFLAGS=-O2 LINKERFLAG=-Xlinker UNITTESTFLAG=-funittest + VERSIONFLAG=-fversion= DDOCFLAGS=-fsyntax-only -c -fdoc -fdoc-file=$@ DDOCINC=-fdoc-inc= output=-o $@ +else ifeq ("$(DC)","ldc2") + DCFLAGS=-O + LINKERFLAG=-L + UNITTESTFLAG=-unittest + VERSIONFLAG=-d-version= + DDOCFLAGS=-o- -Df$@ + output=-of$@ else DCFLAGS=-O LINKERFLAG=-L UNITTESTFLAG=-unittest + VERSIONFLAG=-version= DDOCFLAGS=-o- -Df$@ output=-of$@ endif @@ -50,15 +59,15 @@ HDRISUPPORT = $(findstring HDRI,$(shell convert --version | grep HDRI)) WRAPEDVERSION = $(subst 0x,,$(subst ;,,$(lastword $(shell grep "enum\ MagickLibVersion\ " dmagick/c/magickVersion.d)))) ifneq ("$(QUANTUMDEPTH)","Q16") - VERSIONS+= -version=$(subst Q,Quantum,$(QUANTUMDEPTH)) + VERSIONS+= $(VERSIONFLAG)$(subst Q,Quantum,$(QUANTUMDEPTH)) endif ifneq ("$(MAGICKVERSION)","$(WRAPEDVERSION)") - VERSIONS+= -version=MagickCore_$(MAGICKVERSION) + VERSIONS+= $(VERSIONFLAG)MagickCore_$(MAGICKVERSION) endif ifeq ("$(HDRISUPPORT)","HDRI") - VERSIONS+= -version=MagickCore_HDRI + VERSIONS+= $(VERSIONFLAG)MagickCore_HDRI endif ifdef VERSIONS -- cgit v1.2.3