b=503123; add some additional defines/include paths to WinCE tools; r=dougt

build/wince/tools/Makefile

@@ -72,6 +72,7 @@ endif
 CFLAGS += \
   -DVC_PATH='"$(subst \,\\,$(VCINSTALLDIR))\\"' \
   -DWM_SDK_PATH='"$(subst \,\\,$(WINCE_SDK_DIR))\\"' \
+  -DOGLES_SDK_PATH='"$(subst \,\\,$(OGLES_SDK_DIR))\\"' \
   -DMOZCE_DEVENV='"$(MOZCE_DEVENV)"' \
   -DTOPSRCDIR='"$(TOPSRCDIR)"' \
   $(NULL)

build/wince/tools/arm-wince-gcc.c

@@ -25,6 +25,7 @@ main(int argc, char **argv)
 #ifdef MOZ_MEMORY
   args[i++] = "/DMOZ_MEMORY";
 #endif
+  args[i++] = "/I\"" ATL_INC "\"";
   args[i++] = "/DMOZCE_STATIC_BUILD";
   args[i++] = "/DUNICODE";
   args[i++] = "/D_UNICODE_";
@@ -38,6 +39,7 @@ main(int argc, char **argv)
 //  args[i++] = "/DPOCKETPC2003_UI_MODEL";
   args[i++] = "/D_WINDOWS";
   args[i++] = "/DNO_ERRNO";
+  args[i++] = "/D_CE_ALLOW_SINGLE_THREADED_OBJECTS_IN_MTA";
 
   args[i++] = "/GS-";                  // disable security checks
   args[i++] = "/GR-";                  // disable C++ RTTI

build/wince/tools/arm-wince-res.c

@@ -11,11 +11,11 @@ main(int argc, char **argv)
   int s = 0;
   args[i++] = RC_PATH;
   args[i++] = "/I\"" WCE_RC_INC "\"";
-  args[i++] = "/I\"" WM_SDK_INC  "\"";
+  args[i++] = "/I\"" WM_SDK_INC "\"";
 
   argpath_conv(&argv[1], &args[i]);
 
-  //  dumpargs(args);
+  //dumpargs(args);
 
   return run(args);
 }

build/wince/tools/linkargs.c

@@ -23,8 +23,13 @@ void checkLinkArgs(int* k, int* s, int* i, int* j, char** args, char** argv) {
 void addLinkArgs(int k, int s, int *i, int *j, char** args, char** argv) {
   args[(*i)++] = "/LIBPATH:\"" WCE_LIB "\"";
   args[(*i)++] = "/LIBPATH:\"" WCE_CRT "\"";
+  args[(*i)++] = "/LIBPATH:\"" ATL_LIB "\"";
+  args[(*i)++] = "/LIBPATH:\"" OGLES_SDK_LIB "\"";
   args[(*i)++] = "/NODEFAULTLIB";
 
+  args[(*i)++] = "/MAP";
+  args[(*i)++] = "/MAPINFO:EXPORTS";
+
 #ifdef HAVE_SHUNT   // simple test to see if we're in configure or not
   if(getenv("NO_SHUNT") == NULL) {
     args[(*i)++] = "/LIBPATH:\"" SHUNT_LIB "\"";

build/wince/tools/toolspath.c

@@ -199,8 +199,8 @@ DWORD run(char** args)
  _putenv("LIBPATH=");
  _putenv("CC=");
 
- _putenv("INCLUDE=" SHUNT_INC ";" WM_SDK_INC ";" WCE_INC);
- _putenv("LIB=" WCE_LIB ";" WCE_CRT);
+ _putenv("INCLUDE=" SHUNT_INC ";" WM_SDK_INC ";" OGLES_SDK_INC ";" WCE_INC);
+ _putenv("LIB=" WCE_LIB ";" OGLES_SDK_LIB ";" WCE_CRT);
 
  for (j=1; args[j]; j++)
  {

build/wince/tools/toolspath.h

@@ -5,6 +5,8 @@
 #include <stdio.h>
 #include <process.h>
 
+#define OGLES_SDK_INC  OGLES_SDK_PATH "inc"
+#define OGLES_SDK_LIB  OGLES_SDK_PATH "lib\\wince\\nvap\\release"
 #define WCE_BIN    VC_PATH "ce\\bin\\x86_arm\\"
 #define WCE_RC_BIN WIN_SDK_PATH  "bin\\"
 #define WCE_CRT    VC_PATH "ce\\lib\\armv4i"
@@ -12,6 +14,8 @@
 #define WCE_LIB    WM_SDK_PATH "Lib/Armv4i"
 #define WCE_RC_INC  VC_PATH "ce\\atlmfc\\include"
 #define WCE_INC  VC_PATH "ce\\include"
+#define ATL_INC  VC_PATH "ce\\atlmfc\\include"
+#define ATL_LIB  VC_PATH "ce\\atlmfc\\lib\\armv4i"
 
 #ifndef SHUNT_LIB
 #define SHUNT_LIB ""

config/autoconf.mk.in

@@ -620,8 +620,12 @@ MOZ_PHOENIX	= @MOZ_PHOENIX@
 MOZ_XULRUNNER	= @MOZ_XULRUNNER@
 WINCE		= @WINCE@
 WINCE_SDK_DIR   = @WINCE_SDK_DIR@
+OGLES_SDK_DIR   = @OGLES_SDK_DIR@
+
 WINCE_WINDOWS_MOBILE = @WINCE_WINDOWS_MOBILE@
 
+HAS_OGLES = @HAS_OGLES@
+
 MOZ_DISTRIBUTION_ID = @MOZ_DISTRIBUTION_ID@
 
 NS_OSSO 	= @NS_OSSO@

configure.in

@@ -242,6 +242,11 @@ case "$target" in
                         The path to the Windows CE SDK],
     WINCE_SDK_DIR=$withval)
 
+    MOZ_ARG_WITH_STRING(ogles-sdk,
+    [  --with-ogles-sdk=OGLES_SDK_DIR
+                        The path to the OGLES SDK],
+    OGLES_SDK_DIR=$withval)
+
     dnl Default to Windows Mobile components enabled
     WINCE_WINDOWS_MOBILE=1
 
@@ -268,7 +273,7 @@ case "$target" in
 
     _pwdw=`pwd -W`
     _pwd=`pwd`
-    make WINCE_SDK_DIR="$WINCE_SDK_DIR" TOPSRCDIR="$_topsrcdir" OBJDIR="$_pwdw" -C $srcdir/build/wince/tools
+    make OGLES_SDK_DIR="$OGLES_SDK_DIR" WINCE_SDK_DIR="$WINCE_SDK_DIR" TOPSRCDIR="$_topsrcdir" OBJDIR="$_pwdw" -C $srcdir/build/wince/tools
 
     CC="$_pwd/dist/sdk/bin/arm-wince-gcc"
     CXX="$_pwd/dist/sdk/bin/arm-wince-gcc"
@@ -7626,19 +7631,36 @@ if test "$MOZ_TREE_CAIRO"; then
     if test "$MOZ_WIDGET_TOOLKIT" = "windows"; then
         WIN32_SURFACE_FEATURE="#define CAIRO_HAS_WIN32_SURFACE 1"
         if test -z "$WINCE"; then
-           WIN32_FONT_FEATURE="#define CAIRO_HAS_WIN32_FONT 1"
-           DDRAW_SURFACE_FEATURE=
+            WIN32_FONT_FEATURE="#define CAIRO_HAS_WIN32_FONT 1"
         else
-           WIN32_FONT_FEATURE=
+            WIN32_FONT_FEATURE=
         fi
 
         AC_TRY_COMPILE([#include <ddraw.h>], [int foo = DDLOCK_WAITNOTBUSY;], HAS_DDRAW=1, HAS_DDRAW=)
         if test -z "$HAS_DDRAW"; then
-          AC_MSG_WARN([DirectDraw ddraw.h header not found or it's missing DDLOCK_WAITNOTBUSY, disabling DirectDraw surface.  If you have an older SDK (such as the CE5 SDK), try copying in ddraw.lib and ddraw.h from the WM6 SDK.])
-           DDRAW_SURFACE_FEATURE=
+            AC_MSG_WARN([DirectDraw ddraw.h header not found or it's missing DDLOCK_WAITNOTBUSY, disabling DirectDraw surface.  If you have an older SDK (such as the CE5 SDK), try copying in ddraw.lib and ddraw.h from the WM6 SDK.])
+            DDRAW_SURFACE_FEATURE=
         else
-          DDRAW_SURFACE_FEATURE="#define CAIRO_HAS_DDRAW_SURFACE 1"
+            DDRAW_SURFACE_FEATURE="#define CAIRO_HAS_DDRAW_SURFACE 1"
         fi
+
+        if test -z "$OGLES_SDK_DIR"; then
+            OGLES_SURFACE_FEATURE=
+        else
+            AC_TRY_COMPILE([
+              #include <EGL/egl.h>
+              #include <EGL/eglext.h>
+              #include <GLES2/gl2.h>
+              #include <GLES2/gl2ext.h>
+            ], [ EGLDisplay _cairo_ddraw_egl_dpy = EGL_NO_DISPLAY;], HAS_OGLES=1, HAS_OGLES=)
+            if test -z "$HAS_OGLES"; then
+              AC_MSG_WARN([OpenGL ES2 headers not found, disabling OpenGL acceleration surfaces.])
+              OGLES_SURFACE_FEATURE=
+            else
+              OGLES_SURFACE_FEATURE="#define CAIRO_DDRAW_USE_GL 1"
+            fi
+        fi
+
         PDF_SURFACE_FEATURE="#define CAIRO_HAS_PDF_SURFACE 1"
     fi
     if test "$MOZ_WIDGET_TOOLKIT" = "os2"; then
@@ -7659,6 +7681,7 @@ if test "$MOZ_TREE_CAIRO"; then
     fi
     AC_SUBST(MOZ_ENABLE_CAIRO_FT)
     AC_SUBST(CAIRO_FT_CFLAGS)
+    AC_SUBST(HAS_OGLES)
 
     if test "$MOZ_DEBUG"; then
       SANITY_CHECKING_FEATURE="#define CAIRO_DO_SANITY_CHECKING 1"
@@ -7678,6 +7701,7 @@ if test "$MOZ_TREE_CAIRO"; then
     AC_SUBST(XCB_SURFACE_FEATURE)
     AC_SUBST(WIN32_SURFACE_FEATURE)
     AC_SUBST(DDRAW_SURFACE_FEATURE)
+    AC_SUBST(OGLES_SURFACE_FEATURE)    
     AC_SUBST(OS2_SURFACE_FEATURE)
     AC_SUBST(BEOS_SURFACE_FEATURE)
     AC_SUBST(DIRECTFB_SURFACE_FEATURE)
@@ -8119,6 +8143,7 @@ AC_SUBST(MOZ_POST_PROGRAM_COMMAND)
 AC_SUBST(MOZ_TIMELINE)
 AC_SUBST(WINCE)
 AC_SUBST(WINCE_SDK_DIR)
+AC_SUBST(OGLES_SDK_DIR)
 
 AC_SUBST(MOZ_APP_NAME)
 AC_SUBST(MOZ_APP_DISPLAYNAME)