This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch Pilot-Pirx-nss
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 19fbda1556df26898dd14361ea684a0869f4c00c
Author: Matthias Seidel <msei...@apache.org>
AuthorDate: Sun Jan 21 22:58:15 2024 +0100
Build nss with OS_TARGET=WINNT
---
main/nss/makefile.mk | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/main/nss/makefile.mk b/main/nss/makefile.mk
index 9c3705d72a..fdf9c162da 100644
--- a/main/nss/makefile.mk
+++ b/main/nss/makefile.mk
@@ -99,7 +99,7 @@ nss_LIBS+=$(MINGW_SHARED_LIBSTDCPP)
BUILD_DIR=nss
-BUILD_ACTION= NSS_DISABLE_GTESTS=1 NS_USE_GCC=1 CC="$(nss_CC)"
CXX="$(nss_CXX)" OS_LIBS="$(nss_LIBS)" OS_TARGET=WIN95 _WIN32_IE=0x500
PATH="$(PATH)" DEFINES=-D_WIN32_IE=0x500 $(GNUMAKE) nss_build_all
+BUILD_ACTION= NSS_DISABLE_GTESTS=1 NS_USE_GCC=1 CC="$(nss_CC)"
CXX="$(nss_CXX)" OS_LIBS="$(nss_LIBS)" OS_TARGET=WINNT _WIN32_IE=0x500
PATH="$(PATH)" DEFINES=-D_WIN32_IE=0x500 $(GNUMAKE) nss_build_all
OUT2LIB= \
dist$/*.OBJ$/lib$/libnspr4.a \
@@ -122,8 +122,8 @@ moz_build:=$(shell cygpath -p $(MOZILLABUILD))
# Using WINNT will cause at least that nspr4.dll, plc4.dll, plds4.dll
# become libnspr4.dll, libplc4.dll, libplds4.dll
# WINNT causes the use of Microsoft fibers (specific to Windows NT and Windows
2000).
-#OS_TARGET= WINNT
-OS_TARGET=WIN95
+OS_TARGET=WINNT
+#OS_TARGET=WIN95
.EXPORT : OS_TARGET
# make use of stlport headerfiles
@@ -135,12 +135,12 @@ BUILD_ACTION=
PATH="$(PATH):$(moz_build)/msys/bin:$(moz_build)/bin:$(moz_build)/
-c "cd $(NSS_BUILD_DIR) && make nss_build_all NSS_DISABLE_GTESTS=1"
OUT2LIB= \
- dist$/*.OBJ$/lib$/nspr4.lib \
+ dist$/*.OBJ$/lib$/libnspr4.lib \
dist$/*.OBJ$/lib$/nss3.lib \
dist$/*.OBJ$/lib$/nssdbm3.lib \
dist$/*.OBJ$/lib$/nssutil3.lib \
- dist$/*.OBJ$/lib$/plc4.lib \
- dist$/*.OBJ$/lib$/plds4.lib \
+ dist$/*.OBJ$/lib$/libplc4.lib \
+ dist$/*.OBJ$/lib$/libplds4.lib \
dist$/*.OBJ$/lib$/smime3.lib \
dist$/*.OBJ$/lib$/softokn3.lib \
dist$/*.OBJ$/lib$/sqlite3.lib \
