Commit 4f1ce188de3048b89c44e2ca77c6c28ceb7e0a97
1 parent
444fab8f
working msvc configuration
git-svn-id: svn+q:///qpdf/trunk@778 71b93d88-0707-0410-a8cf-f5a4172ac649
Showing
1 changed file
with
19 additions
and
12 deletions
make/msvc.mk
| @@ -13,6 +13,12 @@ define binname | @@ -13,6 +13,12 @@ define binname | ||
| 13 | $(1).exe | 13 | $(1).exe |
| 14 | endef | 14 | endef |
| 15 | 15 | ||
| 16 | +# --- Local Changes --- | ||
| 17 | + | ||
| 18 | +# Filter out -g | ||
| 19 | +CFLAGS := $(filter-out -g,$(CFLAGS)) | ||
| 20 | +CXXFLAGS := $(filter-out -g,$(CXXFLAGS)) | ||
| 21 | + | ||
| 16 | # --- Required rule definitions --- | 22 | # --- Required rule definitions --- |
| 17 | 23 | ||
| 18 | # 1 2 | 24 | # 1 2 |
| @@ -40,26 +46,27 @@ define makeslib | @@ -40,26 +46,27 @@ define makeslib | ||
| 40 | lib /nologo /OUT:$(2) $(1) | 46 | lib /nologo /OUT:$(2) $(1) |
| 41 | endef | 47 | endef |
| 42 | 48 | ||
| 43 | -# 1 2 3 4 5 | ||
| 44 | -# Usage: $(call makelib,objs,library,current,revision,age) | 49 | +# 1 2 3 4 5 6 7 |
| 50 | +# Usage: $(call makelib,objs,library,ldflags,libs,current,revision,age) | ||
| 45 | define makelib | 51 | define makelib |
| 46 | - cl /nologo /Zi /Gy /EHsc /MD /LD /Fe$(basename $(2))$(3).dll $(1) \ | 52 | + cl /nologo /Zi /Gy /EHsc /MD /LD /Fe$(basename $(2))$(5).dll $(1) \ |
| 47 | /link /incremental:no \ | 53 | /link /incremental:no \ |
| 48 | - $(foreach L,$(subst -L,,$(LDFLAGS)),/LIBPATH:$(L)) \ | ||
| 49 | - $(foreach L,$(subst -l,,$(LIBS)),$(L).lib) | ||
| 50 | - if [ -f $(basename $(2))$(3).dll.manifest ]; then \ | ||
| 51 | - mt.exe -nologo -manifest $(basename $(2))$(3).dll.manifest \ | ||
| 52 | - -outputresource:$(basename $(2))$(3).dll\;2; \ | 54 | + $(foreach L,$(subst -L,,$(3)),/LIBPATH:$(L)) \ |
| 55 | + $(foreach L,$(subst -l,,$(4)),$(L).lib) | ||
| 56 | + if [ -f $(basename $(2))$(5).dll.manifest ]; then \ | ||
| 57 | + mt.exe -nologo -manifest $(basename $(2))$(5).dll.manifest \ | ||
| 58 | + -outputresource:$(basename $(2))$(5).dll\;2; \ | ||
| 53 | fi | 59 | fi |
| 60 | + mv $(basename $(2))$(5).lib $(2) | ||
| 54 | endef | 61 | endef |
| 55 | 62 | ||
| 56 | -# 1 2 | ||
| 57 | -# Usage: $(call makebin,objs,binary) | 63 | +# 1 2 3 4 |
| 64 | +# Usage: $(call makebin,objs,binary,ldflags,libs) | ||
| 58 | define makebin | 65 | define makebin |
| 59 | cl /nologo /Zi /Gy /EHsc /MD $(1) \ | 66 | cl /nologo /Zi /Gy /EHsc /MD $(1) \ |
| 60 | /link /incremental:no /OUT:$(2) \ | 67 | /link /incremental:no /OUT:$(2) \ |
| 61 | - $(foreach L,$(subst -L,,$(LDFLAGS)),/LIBPATH:$(L)) \ | ||
| 62 | - $(foreach L,$(subst -l,,$(LIBS)),$(L).lib) | 68 | + $(foreach L,$(subst -L,,$(3)),/LIBPATH:$(L)) \ |
| 69 | + $(foreach L,$(subst -l,,$(4)),$(L).lib) | ||
| 63 | if [ -f $(2).manifest ]; then \ | 70 | if [ -f $(2).manifest ]; then \ |
| 64 | mt.exe -nologo -manifest $(2).manifest \ | 71 | mt.exe -nologo -manifest $(2).manifest \ |
| 65 | -outputresource:$(2)\;2; \ | 72 | -outputresource:$(2)\;2; \ |