diff options
| author | Jay Berkenbilt <ejb@ql.org> | 2010-08-09 00:29:49 +0200 |
|---|---|---|
| committer | Jay Berkenbilt <ejb@ql.org> | 2010-08-09 00:29:49 +0200 |
| commit | b282fd818d7c1144cbc169445a799d0b9d46fa1a (patch) | |
| tree | 755e0709a71f5b17151066630fa698d322f26e85 /make | |
| parent | bc91aa29453b6bbb822f2bfb39bae88b1db41a31 (diff) | |
| download | qpdf-b282fd818d7c1144cbc169445a799d0b9d46fa1a.tar.zst | |
further tweaking of dll creation to deal with msys shell issues
git-svn-id: svn+q:///qpdf/trunk@1008 71b93d88-0707-0410-a8cf-f5a4172ac649
Diffstat (limited to 'make')
| -rw-r--r-- | make/mingw.mk | 5 | ||||
| -rw-r--r-- | make/msvc.mk | 17 |
2 files changed, 10 insertions, 12 deletions
diff --git a/make/mingw.mk b/make/mingw.mk index 9ee66aa0..e6d06f5f 100644 --- a/make/mingw.mk +++ b/make/mingw.mk @@ -62,9 +62,8 @@ endef # 1 2 3 4 5 6 7 # Usage: $(call makelib,objs,library,ldflags,libs,current,revision,age) define makelib - 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 \ + dlltool -l $(2) -D $$(basename `echo $(2) | sed -e 's,/lib\(.*\).a,/\1,'`$(shell expr $(5) - $(7)).dll) $(1); \ + $(CXX) -shared -o `echo $(2) | sed -e 's,/lib\(.*\).a,/\1,'`$(shell expr $(5) - $(7)).dll \ $(1) $(3) $(4) endef diff --git a/make/msvc.mk b/make/msvc.mk index 700d2aa8..875e5934 100644 --- a/make/msvc.mk +++ b/make/msvc.mk @@ -65,16 +65,15 @@ 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 \ - $(1) /link /incremental:no \ + cl /nologo /O2 /Zi /Gy /EHsc /MD /LD /Fe$(basename $(2))$(shell expr $(5) - $(7)).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))$(shell expr $(5) - $(7)).dll.manifest ]; then \ + mt.exe -nologo -manifest $(basename $(2))$(shell expr $(5) - $(7)).dll.manifest \ + -outputresource:$(basename $(2))$(shell expr $(5) - $(7)).dll\;2; \ + fi + mv $(basename $(2))$(shell expr $(5) - $(7)).lib $(2) endef # 1 2 3 4 |