diff options
| -rw-r--r-- | berkeleydb/makefile.mk | 5 | ||||
| -rw-r--r-- | curl/makefile.mk | 5 | ||||
| -rw-r--r-- | graphite/graphite-2.3.1.patch | 2 | ||||
| -rw-r--r-- | nss/makefile.mk | 3 |
4 files changed, 2 insertions, 13 deletions
diff --git a/berkeleydb/makefile.mk b/berkeleydb/makefile.mk index dc5cbad417db..4cba974cecc2 100644 --- a/berkeleydb/makefile.mk +++ b/berkeleydb/makefile.mk @@ -135,7 +135,7 @@ db_LIBS= CFLAGS+=-D_GLIBCXX_DLL db_LIBS+=-lstdc++_s .ENDIF -db_LIBXSO_LIBS=$(LIBSTLPORT) $(db_LIBS) +db_LIBXSO_LIBS=$(db_LIBS) .IF "$(MINGW_SHARED_GCCLIB)"=="YES" db_LIBXSO_LIBS+=-lgcc_s .ENDIF @@ -156,9 +156,6 @@ OUT2INC= \ .ENDIF .ELSE -# make use of stlport headerfiles -EXT_USE_STLPORT=TRUE - BUILD_DIR= BUILD_ACTION=dmake diff --git a/curl/makefile.mk b/curl/makefile.mk index 8e95621896d7..73234469376f 100644 --- a/curl/makefile.mk +++ b/curl/makefile.mk @@ -112,8 +112,6 @@ BUILD_ACTION=make OUT2BIN=$(BUILD_DIR)$/.libs$/libcurl*.dll OUT2LIB=$(BUILD_DIR)$/.libs$/libcurl*.a .ELSE -# make use of stlport headerfiles -EXT_USE_STLPORT=TRUE .IF "$(CCNUMVER)" > "001399999999" EXCFLAGS="/EHa /Zc:wchar_t- /D "_CRT_SECURE_NO_DEPRECATE"" @@ -142,9 +140,6 @@ OUT2LIB=$(BUILD_DIR)$/libcurl.lib .ENDIF # "$(GUI)"=="WNT" .IF "$(GUI)"=="OS2" -# make use of stlport headerfiles -EXT_USE_STLPORT=TRUE - BUILD_DIR=.$/lib .IF "$(debug)"=="" BUILD_ACTION=make -f Makefile.os2 diff --git a/graphite/graphite-2.3.1.patch b/graphite/graphite-2.3.1.patch index 934eb8eaad49..c15edb785cdd 100644 --- a/graphite/graphite-2.3.1.patch +++ b/graphite/graphite-2.3.1.patch @@ -66,7 +66,7 @@ +### HDU: disabled building with the normal compile flags +###CPPFLAGS= /Zc:wchar_t- /nologo /W4 /GR /EHsc /I "./src/font" /I "./src/painter" /I "./src/segment" /I "./src/textsource" /I "./src/generic" /I "./include/graphite" /I "../wrappers/win32" /D "GR_NAMESPACE" /D "WIN32" /D "_WINDOWS" /D "_UNICODE" /D "UNICODE" /D "TRACING" /Fp"$(INTDIR)\graphite.pch" /Fd"$(INTDIR)\\" /FD /c +### HDU: because for full binary compatibility with the rest of OOo all compile flags must match exactly -+### which is especially true for template-heavy C++ code with non-default config (e.g. _STLP_DEBUG enabled) ++### which is especially true for template-heavy C++ code with non-default config (e.g. _DEBUG_RUNTIME enabled) +CPPFLAGS= $(CFLAGS4MSC) /nologo /W4 /I "./src/font" /I "./src/painter" /I "./src/segment" /I "./src/textsource" /I "./src/generic" /I "./include/graphite" /I "../wrappers/win32" /D "GR_NAMESPACE" /D "WIN32" /D "_WINDOWS" /D "_UNICODE" /D "UNICODE" /D "TRACING" /Fp"$(INTDIR)\graphite.pch" /FD /c + # /Wp62 diff --git a/nss/makefile.mk b/nss/makefile.mk index 67e01c5d2d44..61c52961c417 100644 --- a/nss/makefile.mk +++ b/nss/makefile.mk @@ -146,9 +146,6 @@ PATH!:=$(moz_build)/msys/bin:$(moz_build)/moztools/bin:$(PATH) OS_TARGET=WIN95 .EXPORT : OS_TARGET -# make use of stlport headerfiles -EXT_USE_STLPORT=TRUE - #To build nss one has to call "make nss_build_all" in #mozilla/security/nss NSS_BUILD_DIR= $(subst,\,/ $(PWD)/$(MISC)/build/$(TARFILE_ROOTDIR)/mozilla/security/nss) |