diff options
| author | Jay Berkenbilt <ejb@ql.org> | 2009-10-11 02:13:28 +0200 |
|---|---|---|
| committer | Jay Berkenbilt <ejb@ql.org> | 2009-10-11 02:13:28 +0200 |
| commit | 9e05a15d7b3ed099fcc605b782c1f0ca6326dde2 (patch) | |
| tree | 6a47263fe221ca0e81d8e4ca393832590caa05ca /make | |
| parent | 64a890db2bfa0e02cbb1458c7e52ed78f1c0b8b8 (diff) | |
| download | qpdf-9e05a15d7b3ed099fcc605b782c1f0ca6326dde2.tar.zst | |
windows fixes
git-svn-id: svn+q:///qpdf/trunk@775 71b93d88-0707-0410-a8cf-f5a4172ac649
Diffstat (limited to 'make')
| -rw-r--r-- | make/mingw.mk | 1 | ||||
| -rw-r--r-- | make/msvc.mk | 13 |
2 files changed, 6 insertions, 8 deletions
diff --git a/make/mingw.mk b/make/mingw.mk index 7ab66381..f0442c96 100644 --- a/make/mingw.mk +++ b/make/mingw.mk @@ -47,7 +47,6 @@ endef # 1 2 3 4 5 # Usage: $(call makelib,objs,library,current,revision,age) define makelib - echo `echo $(2) | sed -e 's,/lib\(.*\).a,/\1,'`$(3).dll dlltool -l $(2) -D $$(basename `echo $(2) | sed -e 's,/lib\(.*\).a,/\1,'`$(3).dll) $(1); \ $(CXX) -shared -o `echo $(2) | sed -e 's,/lib\(.*\).a,/\1,'`$(3).dll \ $(1) $(LDFLAGS) $(LIBS) diff --git a/make/msvc.mk b/make/msvc.mk index de77e0fe..b60abc03 100644 --- a/make/msvc.mk +++ b/make/msvc.mk @@ -28,7 +28,7 @@ endef define c_compile cl /nologo /Zi /Gy /EHsc /MD $(CPPFLAGS) $(CXXFLAGS) \ $(foreach I,$(2),-I$(I)) \ - /c $(1) /Fo$(call src_to_obj,$(1)) + /c $(1) /Fo$(call c_src_to_obj,$(1)) endef libcompile = $(compile) @@ -43,11 +43,10 @@ endef # 1 2 3 4 5 # Usage: $(call makelib,objs,library,current,revision,age) define makelib - dll= - cl /nologo /Zi /Gy /EHsc /MD /TP /GR /LD /Fe$(basename $(2))$(3).dll \ + cl /nologo /Zi /Gy /EHsc /MD /LD /Fe$(basename $(2))$(3).dll $(1) \ /link /incremental:no \ $(foreach L,$(subst -L,,$(LDFLAGS)),/LIBPATH:$(L)) \ - $(foreach L,$(subst -l,,$(LIBS)),$(L).lib) $(1) + $(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; \ @@ -57,10 +56,10 @@ endef # 1 2 # Usage: $(call makebin,objs,binary) define makebin - cl /nologo /Zi /Gy /EHsc /MD /TP /GR /OUT:$(2) \ - /link /incremental:no \ + cl /nologo /Zi /Gy /EHsc /MD $(1) \ + /link /incremental:no /OUT:$(2) \ $(foreach L,$(subst -L,,$(LDFLAGS)),/LIBPATH:$(L)) \ - $(foreach L,$(subst -l,,$(LIBS)),$(L).lib) $(1) + $(foreach L,$(subst -l,,$(LIBS)),$(L).lib) if [ -f $(2).manifest ]; then \ mt.exe -nologo -manifest $(2).manifest \ -outputresource:$(2)\;2; \ |