Commit b282fd818d7c1144cbc169445a799d0b9d46fa1a
1 parent
bc91aa29
further tweaking of dll creation to deal with msys shell issues
git-svn-id: svn+q:///qpdf/trunk@1008 71b93d88-0707-0410-a8cf-f5a4172ac649
Showing
2 changed files
with
10 additions
and
12 deletions
make/mingw.mk
| ... | ... | @@ -62,9 +62,8 @@ endef |
| 62 | 62 | # 1 2 3 4 5 6 7 |
| 63 | 63 | # Usage: $(call makelib,objs,library,ldflags,libs,current,revision,age) |
| 64 | 64 | define makelib |
| 65 | - major=$$(( $(5) - $(7) )); \ | |
| 66 | - dlltool -l $(2) -D $$(basename `echo $(2) | sed -e 's,/lib\(.*\).a,/\1,'`)$${major}.dll $(1) && \ | |
| 67 | - $(CXX) -shared -o `echo $(2) | sed -e 's,/lib\(.*\).a,/\1,'`$${major}.dll \ | |
| 65 | + dlltool -l $(2) -D $$(basename `echo $(2) | sed -e 's,/lib\(.*\).a,/\1,'`$(shell expr $(5) - $(7)).dll) $(1); \ | |
| 66 | + $(CXX) -shared -o `echo $(2) | sed -e 's,/lib\(.*\).a,/\1,'`$(shell expr $(5) - $(7)).dll \ | |
| 68 | 67 | $(1) $(3) $(4) |
| 69 | 68 | endef |
| 70 | 69 | ... | ... |
make/msvc.mk
| ... | ... | @@ -65,16 +65,15 @@ endef |
| 65 | 65 | # 1 2 3 4 5 6 7 |
| 66 | 66 | # Usage: $(call makelib,objs,library,ldflags,libs,current,revision,age) |
| 67 | 67 | define makelib |
| 68 | - major=$$(( $(5) - $(7) )); \ | |
| 69 | - cl /nologo /O2 /Zi /Gy /EHsc /MD /LD /Fe$(basename $(2))$${major}.dll \ | |
| 70 | - $(1) /link /incremental:no \ | |
| 68 | + cl /nologo /O2 /Zi /Gy /EHsc /MD /LD /Fe$(basename $(2))$(shell expr $(5) - $(7)).dll $(1) \ | |
| 69 | + /link /incremental:no \ | |
| 71 | 70 | $(foreach L,$(subst -L,,$(3)),/LIBPATH:$(L)) \ |
| 72 | - $(foreach L,$(subst -l,,$(4)),$(L).lib) && \ | |
| 73 | - if [ -f $(basename $(2))$${major}.dll.manifest ]; then \ | |
| 74 | - mt.exe -nologo -manifest $(basename $(2))$${major}.dll.manifest \ | |
| 75 | - -outputresource:$(basename $(2))$${major}.dll\;2; \ | |
| 76 | - fi && \ | |
| 77 | - mv $(basename $(2))$${major}.lib $(2) | |
| 71 | + $(foreach L,$(subst -l,,$(4)),$(L).lib) | |
| 72 | + if [ -f $(basename $(2))$(shell expr $(5) - $(7)).dll.manifest ]; then \ | |
| 73 | + mt.exe -nologo -manifest $(basename $(2))$(shell expr $(5) - $(7)).dll.manifest \ | |
| 74 | + -outputresource:$(basename $(2))$(shell expr $(5) - $(7)).dll\;2; \ | |
| 75 | + fi | |
| 76 | + mv $(basename $(2))$(shell expr $(5) - $(7)).lib $(2) | |
| 78 | 77 | endef |
| 79 | 78 | |
| 80 | 79 | # 1 2 3 4 | ... | ... |