cd42e5f3e2
Hopefully this should fix up the most important external libraries. Change-Id: I744cb5a2ce7fafb10852059050cf24589d6ca400
24 lines
918 B
Diff
24 lines
918 B
Diff
--- build/libxslt-1.1.26/win32/Makefile.msvc.old 2010-10-20 01:02:55.359375000 +0200
|
|
+++ build/libxslt-1.1.26/win32/Makefile.msvc 2010-10-20 01:03:05.187500000 +0200
|
|
@@ -54,6 +54,7 @@
|
|
CFLAGS = /nologo /D "WIN32" /D "_WINDOWS" /D "_MBCS" /W3 $(CRUNTIME) /D "_REENTRANT"
|
|
CFLAGS = $(CFLAGS) /I$(BASEDIR) /I$(XSLT_SRCDIR) /I$(INCPREFIX)
|
|
CFLAGS = $(CFLAGS) /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE
|
|
+CFLAGS = $(CFLAGS) -arch:SSE $(SOLARINC) -I$(WORKDIR)\UnpackedTarball\xml2\include -I$(WORKDIR)/UnpackedTarball/icu/source/i18n -I$(WORKDIR)/UnpackedTarball/icu/source/common
|
|
|
|
# The linker and its options.
|
|
LD = link.exe
|
|
@@ -71,8 +71,12 @@
|
|
LDFLAGS = $(LDFLAGS) /DEBUG
|
|
!else
|
|
CFLAGS = $(CFLAGS) /D "NDEBUG" /O2
|
|
+!if "$(_NMAKE_VER)" >= "10.00.30319.01"
|
|
+LDFLAGS = $(LDFLAGS)
|
|
+!else
|
|
LDFLAGS = $(LDFLAGS) /OPT:NOWIN98
|
|
!endif
|
|
+!endif
|
|
|
|
# Libxslt object files.
|
|
XSLT_OBJS = $(XSLT_INTDIR)\attributes.obj\
|