From 523aadaeff4245a86c68729e280097114a9302c5 Mon Sep 17 00:00:00 2001
From: Vladimir Vukicevic <vladimir@pobox.com>
Date: Thu, 12 Feb 2009 18:26:01 -0800
Subject: [PATCH] b=477727; add WINCE_WINDOWS_MOBILE define and associated
 configure flag; r=ted

---
 config/autoconf.mk.in              |  3 ++-
 configure.in                       | 26 ++++++++++++++++++++++++--
 intl/build/Makefile.in             |  2 ++
 js/src/shell/Makefile.in           |  6 ++++++
 js/src/xpconnect/shell/Makefile.in |  6 ++++++
 toolkit/library/Makefile.in        |  7 +++++--
 xpcom/build/Makefile.in            |  4 ++++
 7 files changed, 49 insertions(+), 5 deletions(-)

diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in
index b9a8ccb989c..6f2af9ee9ee 100644
--- a/config/autoconf.mk.in
+++ b/config/autoconf.mk.in
@@ -622,7 +622,8 @@ MOZ_MAPINFO	= @MOZ_MAPINFO@
 MOZ_PHOENIX	= @MOZ_PHOENIX@
 MOZ_XULRUNNER	= @MOZ_XULRUNNER@
 WINCE		= @WINCE@
-WINCE_SDK_DIR      = @WINCE_SDK_DIR@
+WINCE_SDK_DIR   = @WINCE_SDK_DIR@
+WINCE_WINDOWS_MOBILE = @WINCE_WINDOWS_MOBILE@
 
 MOZ_DISTRIBUTION_ID = @MOZ_DISTRIBUTION_ID@
 
diff --git a/configure.in b/configure.in
index 261b853c99d..1c843efbb9f 100644
--- a/configure.in
+++ b/configure.in
@@ -235,9 +235,24 @@ case "$target" in
 
     MOZ_ARG_WITH_STRING(wince-sdk,
     [  --with-wince-sdk=WINCE_SDK_DIR
-                        The path to the windows mobile sdk],
+                        The path to the Windows CE SDK],
     WINCE_SDK_DIR=$withval)
 
+    dnl Default to Windows Mobile components enabled
+    WINCE_WINDOWS_MOBILE=1
+
+    MOZ_ARG_DISABLE_BOOL(windows-mobile-components,
+    [  --disable-windows-mobile-components
+         Disable Windows Mobile specific components from CE build],
+    WINCE_WINDOWS_MOBILE=,
+    WINCE_WINDOWS_MOBILE=1)
+
+    if test "$WINCE_WINDOWS_MOBILE"; then
+        AC_DEFINE(WINCE_WINDOWS_MOBILE)
+    fi
+
+    AC_SUBST(WINCE_WINDOWS_MOBILE)
+
     export WINCE=1
 
     echo -----------------------------------------------------------------------------
@@ -253,7 +268,8 @@ case "$target" in
 
     CC="$_pwd/dist/sdk/bin/arm-wince-gcc"
     CXX="$_pwd/dist/sdk/bin/arm-wince-gcc"
-    CPP="$_pwd/dist/sdk/bin/arm-wince-gcc"
+    CPP="$_pwd/dist/sdk/bin/arm-wince-gcc -E -nologo"
+    CXXCPP="$_pwd/dist/sdk/bin/arm-wince-gcc -TP -E -nologo"
     LD="$_pwd/dist/sdk/bin/arm-wince-link"
     AR="$_pwd/dist/sdk/bin/arm-wince-lib"
     AS="$_pwd/dist/sdk/bin/arm-wince-as"
@@ -2024,6 +2040,12 @@ case "$target" in
     MOZ_USER_DIR="Mozilla"
 
     MOZ_GFX_OPTIMIZE_MOBILE=1
+
+    # Sanity check for WINCE_WINDOWS_MOBILE
+    if test "$WINCE_WINDOWS_MOBILE"; then
+       AC_CHECK_HEADER(tpcshell.h, [],
+            AC_MSG_ERROR([Can't find tpcshell.h in your SDK; are you sure you don't need --disable-windos-mobile-components?]))
+    fi
 ;;
 
 
diff --git a/intl/build/Makefile.in b/intl/build/Makefile.in
index 436911004a2..6e7757900a8 100644
--- a/intl/build/Makefile.in
+++ b/intl/build/Makefile.in
@@ -109,5 +109,7 @@ EXTRA_DSO_LDOPTS += \
 endif
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
+ifndef WINCE
 OS_LIBS += $(call EXPAND_LIBNAME,usp10)
 endif
+endif
diff --git a/js/src/shell/Makefile.in b/js/src/shell/Makefile.in
index 4146363e870..a7d341aa68b 100644
--- a/js/src/shell/Makefile.in
+++ b/js/src/shell/Makefile.in
@@ -53,6 +53,12 @@ LIBS      = $(NSPR_LIBS) $(EDITLINE_LIBS) $(DEPTH)/$(LIB_PREFIX)js_static.$(LIB_
 
 LOCAL_INCLUDES += -I$(topsrcdir) -I..
 
+ifdef _MSC_VER
+ifdef WINCE
+WIN32_EXE_LDFLAGS += -ENTRY:mainACRTStartup
+endif
+endif
+
 include $(topsrcdir)/config/rules.mk
 
 ifdef MOZ_SHARK
diff --git a/js/src/xpconnect/shell/Makefile.in b/js/src/xpconnect/shell/Makefile.in
index b2cecdf1e75..10d74118ced 100644
--- a/js/src/xpconnect/shell/Makefile.in
+++ b/js/src/xpconnect/shell/Makefile.in
@@ -68,6 +68,12 @@ LIBS		= \
 
 NSDISTMODE = copy
 
+ifdef _MSC_VER
+ifdef WINCE
+WIN32_EXE_LDFLAGS += -ENTRY:mainACRTStartup
+endif
+endif
+
 include $(topsrcdir)/config/rules.mk
 
 DEFINES		+= -DJS_THREADSAFE
diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in
index afe8e83d982..47cecf10494 100644
--- a/toolkit/library/Makefile.in
+++ b/toolkit/library/Makefile.in
@@ -209,7 +209,7 @@ EXTRA_DSO_LDOPTS += \
 ifdef MOZ_SYDNEYAUDIO
 EXTRA_DSO_LDOPTS += \
 	-framework CoreAudio \
- 	-framework AudioToolbox \
+	-framework AudioToolbox \
 	-framework AudioUnit \
 	$(NULL)
 endif
@@ -262,7 +262,10 @@ EXTRA_DSO_LDOPTS += $(call EXPAND_LIBNAME,imagehlp)
 endif
 endif # WINNT
 ifeq ($(OS_ARCH),WINCE)
-EXTRA_DSO_LDOPTS += $(call EXPAND_LIBNAME, aygshell cellcore uuid ole32 oleaut32 Ws2)
+EXTRA_DSO_LDOPTS += $(call EXPAND_LIBNAME, aygshell uuid ole32 oleaut32 Ws2)
+ifdef WINCE_WINDOWS_MOBILE
+EXTRA_DSO_LDOPTS += $(call EXPAND_LIBNAME, cellcore)
+endif
 endif
 
 
diff --git a/xpcom/build/Makefile.in b/xpcom/build/Makefile.in
index e9634762ea6..31255e22440 100644
--- a/xpcom/build/Makefile.in
+++ b/xpcom/build/Makefile.in
@@ -192,5 +192,9 @@ EXTRA_DSO_LDOPTS += $(call EXPAND_LIBNAME,imagehlp)
 endif
 endif # WINNT
 
+ifeq ($(OS_ARCH),WINCE)
+EXTRA_DSO_LDOPTS += $(call EXPAND_LIBNAME,ole32)
+endif # WINCE
+
 export:: $(XPCOM_GLUE_SRC_CSRCS) $(XPCOM_GLUE_SRC_CPPSRCS) $(XPCOM_GLUENS_SRC_CPPSRCS)
 	$(INSTALL) $^ .