diff options
| author | Jay Berkenbilt <ejb@ql.org> | 2010-08-08 23:07:14 +0200 |
|---|---|---|
| committer | Jay Berkenbilt <ejb@ql.org> | 2010-08-08 23:07:14 +0200 |
| commit | c9e5fe6f43c651a16fd51d91abba6a061015ea24 (patch) | |
| tree | 9cad4f709a1f9a3fd4d5ab8e974dd41f8a9fcdd0 | |
| parent | cf172cf550f00fdadbff635ad6f8c4b00aa800fb (diff) | |
| download | qpdf-c9e5fe6f43c651a16fd51d91abba6a061015ea24.tar.zst | |
use revision - age on windows like on linux
git-svn-id: svn+q:///qpdf/trunk@1003 71b93d88-0707-0410-a8cf-f5a4172ac649
| -rw-r--r-- | make/mingw.mk | 5 | ||||
| -rw-r--r-- | make/msvc.mk | 13 |
2 files changed, 10 insertions, 8 deletions
diff --git a/make/mingw.mk b/make/mingw.mk index ac7fa4ca..2ecc578d 100644 --- a/make/mingw.mk +++ b/make/mingw.mk @@ -62,8 +62,9 @@ endef # 1 2 3 4 5 6 7 # Usage: $(call makelib,objs,library,ldflags,libs,current,revision,age) define makelib - dlltool -l $(2) -D $$(basename `echo $(2) | sed -e 's,/lib\(.*\).a,/\1,'`$(5).dll) $(1); \ - $(CXX) -shared -o `echo $(2) | sed -e 's,/lib\(.*\).a,/\1,'`$(5).dll \ + major=$$(( $(5) - $(7))); \ + dlltool -l $(2) -D $$(basename `echo $(2) | sed -e 's,/lib\(.*\).a,/\1,'`$(major).dll) $(1); \ + $(CXX) -shared -o `echo $(2) | sed -e 's,/lib\(.*\).a,/\1,'`$(major).dll \ $(1) $(3) $(4) endef diff --git a/make/msvc.mk b/make/msvc.mk index 98c441a1..481566c0 100644 --- a/make/msvc.mk +++ b/make/msvc.mk @@ -65,15 +65,16 @@ endef # 1 2 3 4 5 6 7 # Usage: $(call makelib,objs,library,ldflags,libs,current,revision,age) define makelib - cl /nologo /O2 /Zi /Gy /EHsc /MD /LD /Fe$(basename $(2))$(5).dll $(1) \ - /link /incremental:no \ + major=$$(( $(5) - $(7))); \ + cl /nologo /O2 /Zi /Gy /EHsc /MD /LD /Fe$(basename $(2))$(major).dll \ + $(1) /link /incremental:no \ $(foreach L,$(subst -L,,$(3)),/LIBPATH:$(L)) \ $(foreach L,$(subst -l,,$(4)),$(L).lib) - if [ -f $(basename $(2))$(5).dll.manifest ]; then \ - mt.exe -nologo -manifest $(basename $(2))$(5).dll.manifest \ - -outputresource:$(basename $(2))$(5).dll\;2; \ + if [ -f $(basename $(2))$(major).dll.manifest ]; then \ + mt.exe -nologo -manifest $(basename $(2))$(major).dll.manifest \ + -outputresource:$(basename $(2))$(major).dll\;2; \ fi - mv $(basename $(2))$(5).lib $(2) + mv $(basename $(2))$(major).lib $(2) endef # 1 2 3 4 |