Checking in various WinCE porting tools and support libraries. WINCE_20020710_BRANCH
authorblythe%netscape.com
Wed, 29 Jan 2003 02:41:40 +0000
branchWINCE_20020710_BRANCH
changeset 2679 68c6e40ddbe8d02d54800a4988f90d983b578aa5
parent 2615 73b85b61708625c34fe2b97762a08f0f4a559d60
push idunknown
push userunknown
push dateunknown
Checking in various WinCE porting tools and support libraries. This should make it such that just about anybody with the correct instructions could come and build the WinCE branch.
config/WIN32.mk
config/rules.mk
configure
configure.in
pr/include/md/_wince.cfg
pr/src/Makefile.in
--- a/config/WIN32.mk
+++ b/config/WIN32.mk
@@ -120,16 +120,17 @@ LDFLAGS = -DEBUG -DEBUGTYPE:CV
 ifdef PROFILE
 LDFLAGS += -PROFILE -MAP
 DLLFLAGS += -PROFILE -MAP
 endif
 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.
 # If you want to use static thread-local storage (TLS) for better
 # performance, build the NSPR library with USE_STATIC_TLS=1.
 #
 ifeq ($(USE_STATIC_TLS),1)
 DEFINES += -D_PR_USE_STATIC_TLS
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -83,16 +83,27 @@ CC=$(HOST_CC)
 CCC=$(HOST_CXX)
 CFLAGS=$(HOST_CFLAGS)
 CXXFLAGS=$(HOST_CXXFLAGS)
 endif
 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
 # - SHARED_LIBRARY: a shared (dynamic link) library
 # - IMPORT_LIBRARY: an import library, used only on Windows and OS/2
 #
 # The names of these libraries can be generated by simply specifying
 # LIBRARY_NAME and LIBRARY_VERSION.
--- a/configure
+++ b/configure
@@ -3786,17 +3786,17 @@ EOF
 #define _DEBUG 1
 EOF
 
         else
             DEFINES="$DEFINES -U_DEBUG"
         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
             if test "$OS_TARGET" = "WINCE"; then
                 CFLAGS="$CFLAGS -Zl -GR- -GX- -Gi- -Gm-"
                 _OPTIMIZE_FLAGS=-O1
             else
                 CFLAGS="$CFLAGS -MD"
--- a/configure.in
+++ b/configure.in
@@ -1237,17 +1237,17 @@ case "$target" in
 
         if test -n "$MOZ_DEBUG"; then
             AC_DEFINE(_DEBUG)
         else
             DEFINES="$DEFINES -U_DEBUG"
         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
             if test "$OS_TARGET" = "WINCE"; then
                 CFLAGS="$CFLAGS -Zl -GR- -GX- -Gi- -Gm-"
                 _OPTIMIZE_FLAGS=-O1
             else
                 CFLAGS="$CFLAGS -MD"
--- a/pr/include/md/_wince.cfg
+++ b/pr/include/md/_wince.cfg
@@ -49,17 +49,17 @@
 #endif
 
 /*
  * Some needed types herein.
  */
 #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. */
 
 #if defined(_M_IX86) || defined(_X86_)
 
 #define IS_LITTLE_ENDIAN 1
 #undef  IS_BIG_ENDIAN
 
--- a/pr/src/Makefile.in
+++ b/pr/src/Makefile.in
@@ -307,16 +307,20 @@ endif
 
 #
 # Version information generation (begin)
 #
 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
 PROD = $(notdir $(SHARED_LIBRARY))
 endif
 
 NOW = $(MOD_DEPTH)/config/$(OBJDIR)/now
 SH_DATE = $(shell date "+%Y-%m-%d %T")