Checking in various WinCE porting tools and support libraries.WINCE_20020710_BRANCH

This should make it such that just about anybody with the correct
instructions could come and build the WinCE branch.

6 files changed, 19 insertions, 3 deletions

diff --git a/config/WIN32.mk b/config/WIN32.mk
index a1855cbb..728760a9 100644
--- a/config/WIN32.mk
+++ b/config/WIN32.mk
@@ -125,6 +125,7 @@ endif
 
 DEFINES += -DWIN32
 
+
 #
 # On Win95, we use the TlsXXX() interface by default because that
 # allows us to load the NSPR DLL dynamically at run time.
diff --git a/config/rules.mk b/config/rules.mk
index c5cbb126..1e5692cb 100644
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -88,6 +88,17 @@ endif
 endif
 
 #
+# WinCE wants an extra include directory so that some shunt/native headers
+#  are provided by us.
+# We also want to link with something already there, the shunt lib, so
+#  make sure we have the search path.
+#
+ifeq (,$(filter-out WINCE,$(OS_TARGET)))
+INCLUDES += -I$(dist_prefix)/include
+LDFLAGS += -L$(dist_libdir)
+endif
+
+#
 # This makefile contains rules for building the following kinds of
 # libraries:
 # - LIBRARY: a static (archival) library
diff --git a/configure b/configure
index 3b72f945..7f59e71b 100755
--- a/configure
+++ b/configure
@@ -3791,7 +3791,7 @@ EOF
         fi
 
         if test "$OS_TARGET" = "WINCE"; then
-            DLL_LIBS="corelibc.lib coredll.lib winsock.lib wince_missing.lib"
+            DLL_LIBS="corelibc.lib coredll.lib winsock.lib $dist_libdir/moz_shunt_ppc2002.lib"
         fi
 
         if test -n "$MOZ_OPTIMIZE"; then
diff --git a/configure.in b/configure.in
index 5b39e3df..3fe101a5 100644
--- a/configure.in
+++ b/configure.in
@@ -1242,7 +1242,7 @@ case "$target" in
         fi
 
         if test "$OS_TARGET" = "WINCE"; then
-            DLL_LIBS="corelibc.lib coredll.lib winsock.lib wince_missing.lib"
+            DLL_LIBS="corelibc.lib coredll.lib winsock.lib $dist_libdir/moz_shunt_ppc2002.lib"
         fi
 
         if test -n "$MOZ_OPTIMIZE"; then
diff --git a/pr/include/md/_wince.cfg b/pr/include/md/_wince.cfg
index f6bfd503..6c5334aa 100644
--- a/pr/include/md/_wince.cfg
+++ b/pr/include/md/_wince.cfg
@@ -54,7 +54,7 @@
 #include <windows.h>
 #include <winnt.h>
 #include <stdlib.h>
-#include "wince_missing.h"
+#include "moz_shunt_ppc2002.h"
 
 #define PR_AF_INET6 (100) /* IPv6 not supported yet, use standard value. */
 
diff --git a/pr/src/Makefile.in b/pr/src/Makefile.in
index d98a13a6..4bcfdfcf 100644
--- a/pr/src/Makefile.in
+++ b/pr/src/Makefile.in
@@ -312,6 +312,10 @@ ECHO = echo
 INCLUDES = -I$(dist_includedir) -I$(topsrcdir)/pr/include -I$(topsrcdir)/pr/include/private
 TINC = $(OBJDIR)/_pr_bld.h
 
+ifeq ($(OS_TARGET),WINCE)
+INCLUDES += -I$(dist_prefix)/include
+endif
+
 ifeq ($(OS_TARGET),OS2)
 PROD = nspr$(MOD_MAJOR_VERSION).$(DLL_SUFFIX)
 else