| Peter Foley | ec6af41 | 2012-11-29 20:50:15 -0500 | [diff] [blame] | 1 | --- build/xmlsec1-1.2.14/win32/Makefile.msvc.old 2010-10-20 00:49:04.671875000 +0200 |
| 2 | +++ build/xmlsec1-1.2.14/win32/Makefile.msvc 2010-10-20 00:49:23.406250000 +0200 |
| 3 | @@ -351,7 +351,11 @@ |
| 4 | !if "$(DEBUG)" == "1" |
| 5 | LDFLAGS = $(LDFLAGS) /DEBUG |
| 6 | !else |
| 7 | -LDFLAGS = $(LDFLAGS) /OPT:NOWIN98 |
| 8 | +!if "$(_NMAKE_VER)" >= "10.00.30319.01" |
| 9 | +LDFLAGS = $(LDFLAGS) |
| 10 | +!else |
| 11 | +LDFLAGS = $(LDFLAGS) /OPT:NOWIN98 |
| 12 | +!endif |
| 13 | !endif |
| 14 | |
| 15 | SOLIBS = $(LIBS) libxml2.lib |
| 16 | --- build/xmlsec/win32/Makefile.msvc.old 2012-11-30 11:09:23.130479800 -0500 |
| 17 | +++ build/xmlsec/win32/Makefile.msvc 2012-11-30 11:11:06.037550700 -0500 |
| 18 | @@ -301,6 +301,7 @@ |
| 19 | CFLAGS = $(CFLAGS) /D "HAVE_STDIO_H" /D "HAVE_STDLIB_H" |
| 20 | CFLAGS = $(CFLAGS) /D "HAVE_STRING_H" /D "HAVE_CTYPE_H" |
| 21 | CFLAGS = $(CFLAGS) /D "HAVE_MALLOC_H" /D "HAVE_MEMORY_H" |
| Peter Foley | b9d6c7a | 2013-02-05 17:19:11 -0500 | [diff] [blame] | 22 | +CFLAGS = $(CFLAGS) $(SOLARINC) -I$(WORKDIR)\UnpackedTarball\xml2\include |
| Peter Foley | ec6af41 | 2012-11-29 20:50:15 -0500 | [diff] [blame] | 23 | |
| 24 | # Optimisation and debug symbols. |
| 25 | !if "$(DEBUG)" == "1" |