diff options
author | Jay Berkenbilt <ejb@ql.org> | 2010-08-09 00:13:24 +0200 |
---|---|---|
committer | Jay Berkenbilt <ejb@ql.org> | 2010-08-09 00:13:24 +0200 |
commit | bc91aa29453b6bbb822f2bfb39bae88b1db41a31 (patch) | |
tree | 2de97b429dd01b16f1523422896228070d99e030 /make/msvc.mk | |
parent | a4963e8b52e358e0dfff258d9eb6f19b4c77cb8e (diff) | |
download | qpdf-bc91aa29453b6bbb822f2bfb39bae88b1db41a31.tar.zst |
tweak shared library creation
git-svn-id: svn+q:///qpdf/trunk@1007 71b93d88-0707-0410-a8cf-f5a4172ac649
Diffstat (limited to 'make/msvc.mk')
-rw-r--r-- | make/msvc.mk | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/make/msvc.mk b/make/msvc.mk index 481566c0..700d2aa8 100644 --- a/make/msvc.mk +++ b/make/msvc.mk @@ -65,16 +65,16 @@ endef # 1 2 3 4 5 6 7 # Usage: $(call makelib,objs,library,ldflags,libs,current,revision,age) define makelib - major=$$(( $(5) - $(7))); \ - cl /nologo /O2 /Zi /Gy /EHsc /MD /LD /Fe$(basename $(2))$(major).dll \ + 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))$(major).dll.manifest ]; then \ - mt.exe -nologo -manifest $(basename $(2))$(major).dll.manifest \ - -outputresource:$(basename $(2))$(major).dll\;2; \ - fi - mv $(basename $(2))$(major).lib $(2) + $(foreach L,$(subst -l,,$(4)),$(L).lib) && \ + 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))$${major}.lib $(2) endef # 1 2 3 4 |