From 78c622a9a2957bbbd7d0368176d0e36b73dc6cc9 Mon Sep 17 00:00:00 2001
From: "dougt%meer.net" <dougt%meer.net>
Date: Thu, 23 Feb 2006 20:52:49 +0000
Subject: [PATCH] Updating configure.in to build the vs8 shunt project and
 wrapper tools.  Also making Windows CE use the static version of libIDL.
 Windows CE only

---
 configure.in                        | 11 +++--------
 xpcom/typelib/xpt/tools/Makefile.in |  4 +---
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/configure.in b/configure.in
index 87d064680bc..585a41c3754 100644
--- a/configure.in
+++ b/configure.in
@@ -201,14 +201,8 @@ case "$target" in
     echo -----------------------------------------------------------------------------
     echo Building Windows CE Shunt Library and Tool Chain
     echo -----------------------------------------------------------------------------
-    `$srcdir/build/cygwin-wrapper evc $srcdir/build/wince/shunt/build/shunt.vcw /MAKE ALL > shunt.out <<\EOF`
-    cat shunt.out
-    rm shunt.out
-    $srcdir/build/wince/tools/topsrcdir.h
 
-    `$srcdir/build/cygwin-wrapper evc $srcdir/build/wince/shunt/build/static/static.vcw /MAKE ALL > shunt.out <<\EOF`
-    cat shunt.out
-    rm shunt.out
+    `$srcdir/build/cygwin-wrapper devenv $srcdir/build/wince/shunt/build/vs8/mozce_shunt_static.vcproj /MAKE`
 
     echo -n "#define TOPSRCDIR \"" > $srcdir/build/wince/tools/topsrcdir.h
     `$srcdir/build/cygwin-wrapper echo -n $_topsrcdir >> $srcdir/build/wince/tools/topsrcdir.h`
@@ -1634,7 +1628,8 @@ case "$target" in
     XPCOM_FROZEN_LDOPTS='$(LIBXUL_DIST)/lib/xpcom.lib'
     ZIP=zip
     LIBIDL_CFLAGS="-I$MOZ_TOOLS_DIR/include ${GLIB_CFLAGS}"
-    LIBIDL_LIBS="$MOZ_TOOLS_DIR/lib/libidl-0.6.lib $MOZ_TOOLS_DIR/lib/glib-1.2.lib"
+    LIBIDL_LIBS="$MOZ_TOOLS_DIR/lib/libidl-0.6_s.lib $MOZ_TOOLS_DIR/lib/glib-1.2_s.lib"
+    STATIC_LIBIDL=1
 
     AC_DEFINE(HAVE_SNPRINTF)
     AC_DEFINE(_WINDOWS)
diff --git a/xpcom/typelib/xpt/tools/Makefile.in b/xpcom/typelib/xpt/tools/Makefile.in
index c2d95c570ac..68c9f9b609b 100644
--- a/xpcom/typelib/xpt/tools/Makefile.in
+++ b/xpcom/typelib/xpt/tools/Makefile.in
@@ -84,9 +84,7 @@ ifdef WINCE
 # Compile directly against the static lib, so we can use the tools
 # during the build without the shared library path being set.
 HOST_CFLAGS +=  -DEXPORT_XPT_API
-
-# Force MOZ_NO_DEBUG_RTL=1
-HOST_CFLAGS	+= /MD
+LDFLAGS += -NODEFAULTLIB:MSVCRT
 endif
 
 endif