diff options
| author | Jay Berkenbilt <ejb@ql.org> | 2009-10-11 02:44:23 +0200 |
|---|---|---|
| committer | Jay Berkenbilt <ejb@ql.org> | 2009-10-11 02:44:23 +0200 |
| commit | 444fab8f879f3c012668fadce3f27baf0c9d8942 (patch) | |
| tree | 25347d6193ba64c0269ea5955879872c029801cf /make | |
| parent | 2b5ac676ed1cbde1092d41acf0775b1c8d9a2baf (diff) | |
| download | qpdf-444fab8f879f3c012668fadce3f27baf0c9d8942.tar.zst | |
more build fixes
git-svn-id: svn+q:///qpdf/trunk@777 71b93d88-0707-0410-a8cf-f5a4172ac649
Diffstat (limited to 'make')
| -rw-r--r-- | make/msvc.mk | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/make/msvc.mk b/make/msvc.mk index c5961c03..b60abc03 100644 --- a/make/msvc.mk +++ b/make/msvc.mk @@ -40,27 +40,26 @@ define makeslib lib /nologo /OUT:$(2) $(1) endef -# 1 2 3 4 5 6 7 -# Usage: $(call makelib,objs,library,ldflags,libs,current,revision,age) +# 1 2 3 4 5 +# Usage: $(call makelib,objs,library,current,revision,age) define makelib - cl /nologo /Zi /Gy /EHsc /MD /LD /Fe$(basename $(2))$(5).dll $(1) \ + cl /nologo /Zi /Gy /EHsc /MD /LD /Fe$(basename $(2))$(3).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; \ + $(foreach L,$(subst -L,,$(LDFLAGS)),/LIBPATH:$(L)) \ + $(foreach L,$(subst -l,,$(LIBS)),$(L).lib) + if [ -f $(basename $(2))$(3).dll.manifest ]; then \ + mt.exe -nologo -manifest $(basename $(2))$(3).dll.manifest \ + -outputresource:$(basename $(2))$(3).dll\;2; \ fi - mv $(2)$(5).lib $(2).lib endef -# 1 2 3 4 -# Usage: $(call makebin,objs,binary,ldflags,libs) +# 1 2 +# Usage: $(call makebin,objs,binary) define makebin cl /nologo /Zi /Gy /EHsc /MD $(1) \ /link /incremental:no /OUT:$(2) \ - $(foreach L,$(subst -L,,$(3)),/LIBPATH:$(L)) \ - $(foreach L,$(subst -l,,$(4)),$(L).lib) + $(foreach L,$(subst -L,,$(LDFLAGS)),/LIBPATH:$(L)) \ + $(foreach L,$(subst -l,,$(LIBS)),$(L).lib) if [ -f $(2).manifest ]; then \ mt.exe -nologo -manifest $(2).manifest \ -outputresource:$(2)\;2; \ |