From fd360abe4dcaead30f0bb4befedfc273aaeecf29 Mon Sep 17 00:00:00 2001 From: "blythe%netscape.com" Date: Sat, 9 Feb 2002 00:27:59 +0000 Subject: [PATCH] can now link, woohoo git-svn-id: svn://10.0.0.236/branches/WINCE_NSPRPUB_RELEASE_4_2_BETA1@114102 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/nsprpub/config/WIN32.mk | 2 +- mozilla/nsprpub/configure | 4 ++-- mozilla/nsprpub/configure.in | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/mozilla/nsprpub/config/WIN32.mk b/mozilla/nsprpub/config/WIN32.mk index 8d385d3f0f7..d3b0ecd3cac 100644 --- a/mozilla/nsprpub/config/WIN32.mk +++ b/mozilla/nsprpub/config/WIN32.mk @@ -194,7 +194,7 @@ endif OBJDIR_NAME = $(OS_CONFIG)$(CPU_ARCH_TAG)$(OBJDIR_TAG).$(OBJDIR_SUFFIX) ifeq ($(OS_TARGET),WINCE) -OS_DLLFLAGS = -nologo -DLL -SUBSYSTEM:WINDOWSCE,3.00 -PDB:NONE -MACHINE:IX86 -ENTRY:_DllMainCRTStartup -STACK:0x10000,0x1000 +OS_DLLFLAGS = -nologo -DLL -SUBSYSTEM:WINDOWSCE,3.00 -MACHINE:IX86 -ENTRY:_DllMainCRTStartup -STACK:0x10000,0x1000 -NODEFAULTLIB:OLDNAMES.lib else OS_DLLFLAGS = -nologo -DLL -SUBSYSTEM:WINDOWS -PDB:NONE endif \ No newline at end of file diff --git a/mozilla/nsprpub/configure b/mozilla/nsprpub/configure index 22b1a3f550d..800d5ab27a6 100755 --- a/mozilla/nsprpub/configure +++ b/mozilla/nsprpub/configure @@ -3768,7 +3768,7 @@ EOF fi if test "$OS_TARGET" = "WINCE"; then - DLL_LIBS="coredll.lib winsock.lib" + DLL_LIBS="corelibc.lib coredll.lib winsock.lib" fi if test -n "$MOZ_OPTIMIZE"; then @@ -3890,7 +3890,7 @@ EOF fi if test "$OS_TARGET" = "WINCE"; then - OS_DLLFLAGS='-nologo -DLL -SUBSYSTEM:WINDOWSCE,3.00 -PDB:NONE -MACHINE:IX86 -ENTRY:_DllMainCRTStartup -STACK:0x10000,0x1000' + OS_DLLFLAGS='-nologo -DLL -SUBSYSTEM:WINDOWSCE,3.00 -MACHINE:IX86 -ENTRY:_DllMainCRTStartup -STACK:0x10000,0x1000 -NODEFAULTLIB:OLDNAMES.lib' else OS_DLLFLAGS='-nologo -DLL -SUBSYSTEM:WINDOWS -PDB:NONE' fi diff --git a/mozilla/nsprpub/configure.in b/mozilla/nsprpub/configure.in index da4dfa2e471..4c261f2234b 100644 --- a/mozilla/nsprpub/configure.in +++ b/mozilla/nsprpub/configure.in @@ -1216,7 +1216,7 @@ case "$target" in fi if test "$OS_TARGET" = "WINCE"; then - DLL_LIBS="coredll.lib winsock.lib" + DLL_LIBS="corelibc.lib coredll.lib winsock.lib" fi if test -n "$MOZ_OPTIMIZE"; then @@ -1294,7 +1294,7 @@ case "$target" in fi if test "$OS_TARGET" = "WINCE"; then - OS_DLLFLAGS='-nologo -DLL -SUBSYSTEM:WINDOWSCE,3.00 -PDB:NONE -MACHINE:IX86 -ENTRY:_DllMainCRTStartup -STACK:0x10000,0x1000' + OS_DLLFLAGS='-nologo -DLL -SUBSYSTEM:WINDOWSCE,3.00 -MACHINE:IX86 -ENTRY:_DllMainCRTStartup -STACK:0x10000,0x1000 -NODEFAULTLIB:OLDNAMES.lib' else OS_DLLFLAGS='-nologo -DLL -SUBSYSTEM:WINDOWS -PDB:NONE' fi