Bug 607544 - Remove DDRAW junk from configure, missed part; (Av1a) Missed cleanup, s/if/case/.
authorSerge Gautherie <sgautherie.bz@free.fr>
Sun, 17 Apr 2011 15:49:47 +0200
changeset 68213 5c5d9ed49e5e1a0ae50d5eb5bf349444a2817291
parent 68212 c551b62cf2e8b505b8d10cb719c8f1e02f266558
child 68214 233c1426514ff453feeb52e0721fc9ccd03bd618
push id19542
push usersgautherie.bz@free.fr
push dateSun, 17 Apr 2011 13:50:43 +0000
treeherdermozilla-central@5c5d9ed49e5e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs607544
milestone6.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 607544 - Remove DDRAW junk from configure, missed part; (Av1a) Missed cleanup, s/if/case/. r=ted.mielczarek.
build/wince/tools/Makefile
build/wince/tools/linkargs.c
build/wince/tools/toolspath.c
build/wince/tools/toolspath.h
config/autoconf.mk.in
configure.in
toolkit/library/Makefile.in
--- a/build/wince/tools/Makefile
+++ b/build/wince/tools/Makefile
@@ -67,17 +67,16 @@ endif
 
 ifeq ($(MOZ_MSVCVERSION),)
 $(error Environment variable MOZ_MSVCVERSION not set! Are you using MozillaBuild?)
 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)
 
 ifneq ($(WINDOWSSDKDIR),)
 CFLAGS += -DWIN_SDK_PATH='"$(subst \,\\,$(WINDOWSSDKDIR))"'
 else
 ifeq ($(SDKDIR),)
--- a/build/wince/tools/linkargs.c
+++ b/build/wince/tools/linkargs.c
@@ -19,17 +19,16 @@ void checkLinkArgs(int* k, int* s, int* 
 	*s = 1;
       }
 }
 
 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";
 
   if (getenv("LOCK_DLLS") != NULL) {
     // lock our dlls in memory
     args[(*i)++] = "/SECTION:.text,\!P";
--- a/build/wince/tools/toolspath.c
+++ b/build/wince/tools/toolspath.c
@@ -194,18 +194,18 @@ DWORD run(char** args)
  int i, j;
 
 
  // Clear any link env variable that might get us tangled up
  _putenv("LINK=");
  _putenv("LIBPATH=");
  _putenv("CC=");
 
- _putenv("INCLUDE=" SHUNT_INC ";" WM_SDK_INC ";" OGLES_SDK_INC ";" WCE_INC);
- _putenv("LIB=" WCE_LIB ";" OGLES_SDK_LIB ";" WCE_CRT);
+ _putenv("INCLUDE=" SHUNT_INC ";" WM_SDK_INC ";" WCE_INC);
+ _putenv("LIB=" WCE_LIB ";" WCE_CRT);
 
  i = strlen(args[0]);
  for (j=0; j<i; j++)
  {
    if (args[0][j] == '/')
      args[0][j] = '\\';
  }
 
--- a/build/wince/tools/toolspath.h
+++ b/build/wince/tools/toolspath.h
@@ -1,17 +1,15 @@
 #ifndef TOOLPATH_H
 #define TOOLPATH_H
 
 #include <windows.h>
 #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"
 #define WM_SDK_INC    WM_SDK_PATH "Include/Armv4i"
 #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"
--- a/config/autoconf.mk.in
+++ b/config/autoconf.mk.in
@@ -655,22 +655,19 @@ endif
 
 # Codesighs tools option, enables win32 mapfiles.
 MOZ_MAPINFO	= @MOZ_MAPINFO@
 
 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@
 
 MOZ_PLATFORM_MAEMO = @MOZ_PLATFORM_MAEMO@
 MOZ_PLATFORM_MAEMO_CFLAGS	= @MOZ_PLATFORM_MAEMO_CFLAGS@
 MOZ_PLATFORM_MAEMO_LIBS 	= @MOZ_PLATFORM_MAEMO_LIBS@
 MOZ_MAEMO_LIBLOCATION 	= @MOZ_MAEMO_LIBLOCATION@
 
 MOZ_ENABLE_LIBCONIC = @MOZ_ENABLE_LIBCONIC@
--- a/configure.in
+++ b/configure.in
@@ -361,37 +361,32 @@ dnl Do some special WinCE toolchain stuf
 case "$target" in
 *wince|*winmo)
 
     MOZ_ARG_WITH_STRING(wince-sdk,
     [  --with-wince-sdk=WINCE_SDK_DIR
                           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)
-
     AC_DEFINE(WINCE)
     
     export WINCE=1
 
     echo -----------------------------------------------------------------------------
     echo Building Windows CE Shunt Library and Tool Chain
     echo Using SDK in:
     echo $WINCE_SDK_DIR
 
     ac_exeext=.exe
 
     _pwd=`pwd -W`
     _topsrcdirwin=`cd \`dirname $0\`; pwd -W`
-    make OGLES_SDK_DIR="$OGLES_SDK_DIR" WINCE_SDK_DIR="$WINCE_SDK_DIR" \
-    TOPSRCDIR="$_topsrcdirwin" OBJDIR="$_pwd" target="$target" \
-    -C $srcdir/build/wince/tools
+    make WINCE_SDK_DIR="$WINCE_SDK_DIR" \
+         TOPSRCDIR="$_topsrcdirwin" OBJDIR="$_pwd" target="$target" \
+         -C $srcdir/build/wince/tools
 
     CC="$_pwd/dist/sdk/bin/$target-gcc.exe"
     CXX="$_pwd/dist/sdk/bin/$target-gcc.exe"
     CPP="$_pwd/dist/sdk/bin/$target-gcc.exe -E -nologo"
     CXXCPP="$_pwd/dist/sdk/bin/$target-gcc.exe -TP -E -nologo"
     LD="$_pwd/dist/sdk/bin/$target-link.exe"
     AR="$_pwd/dist/sdk/bin/$target-lib.exe"
     AS="$_pwd/dist/sdk/bin/$target-as.exe"
@@ -8599,25 +8594,26 @@ if test "$MOZ_TREE_CAIRO"; then
     if test "$MOZ_X11"; then
         XLIB_SURFACE_FEATURE="#define CAIRO_HAS_XLIB_SURFACE 1"
         XLIB_XRENDER_SURFACE_FEATURE="#define CAIRO_HAS_XLIB_XRENDER_SURFACE 1"
         PS_SURFACE_FEATURE="#define CAIRO_HAS_PS_SURFACE 1"
         FT_FONT_FEATURE="#define CAIRO_HAS_FT_FONT 1"
         MOZ_ENABLE_CAIRO_FT=1
         CAIRO_FT_CFLAGS="$FT2_CFLAGS"
     fi
-    if test "$MOZ_WIDGET_TOOLKIT" = "qt"; then
+    case "$MOZ_WIDGET_TOOLKIT" in
+      qt)
         QT_SURFACE_FEATURE="#define CAIRO_HAS_QT_SURFACE 1"
-    fi
-    if test "$MOZ_WIDGET_TOOLKIT" = "cocoa"; then
+        ;;
+      cocoa)
         QUARTZ_SURFACE_FEATURE="#define CAIRO_HAS_QUARTZ_SURFACE 1"
         QUARTZ_IMAGE_SURFACE_FEATURE="#define CAIRO_HAS_QUARTZ_IMAGE_SURFACE 1"
         QUARTZ_FONT_FEATURE="#define CAIRO_HAS_QUARTZ_FONT 1"
-    fi
-    if test "$MOZ_WIDGET_TOOLKIT" = "windows"; then
+        ;;
+      windows)
         WIN32_SURFACE_FEATURE="#define CAIRO_HAS_WIN32_SURFACE 1"
         if test -z "$WINCE"; then
             WIN32_FONT_FEATURE="#define CAIRO_HAS_WIN32_FONT 1"
             if test "$MOZ_WINSDK_TARGETVER" -ge "06010000"; then
                 WIN32_DWRITE_FONT_FEATURE="#define CAIRO_HAS_DWRITE_FONT 1"
                 WIN32_D2D_SURFACE_FEATURE="#define CAIRO_HAS_D2D_SURFACE 1"
                 MOZ_ENABLE_D2D_SURFACE=1
                 MOZ_ENABLE_DWRITE_FONT=1
@@ -8632,35 +8628,34 @@ if test "$MOZ_TREE_CAIRO"; then
         fi
 
         MOZ_CHECK_HEADER(d3d9.h, MOZ_ENABLE_D3D9_LAYER=1)
 
         dnl D3D10 Layers depend on D2D Surfaces.
         if test -n "$WIN32_D2D_SURFACE_FEATURE"; then
           MOZ_CHECK_HEADER(d3d10.h, MOZ_ENABLE_D3D10_LAYER=1)
         fi
-
-    fi
-    if test "$MOZ_WIDGET_TOOLKIT" = "os2"; then
+        ;;
+      os2)
         OS2_SURFACE_FEATURE="#define CAIRO_HAS_OS2_SURFACE 1"
         FT_FONT_FEATURE="#define CAIRO_HAS_FT_FONT 1"
         MOZ_ENABLE_CAIRO_FT=1
         CAIRO_FT_CFLAGS="-I${MZFTCFGFT2}/include"
         CAIRO_FT_LIBS="-L${MZFTCFGFT2}/lib -lmozft -lmzfntcfg"
-    fi
+        ;;
+    esac
     if test "$USE_FC_FREETYPE"; then
         FC_FONT_FEATURE="#define CAIRO_HAS_FC_FONT 1"
     fi
     AC_SUBST(MOZ_ENABLE_CAIRO_FT)
     AC_SUBST(MOZ_ENABLE_DWRITE_FONT)
     AC_SUBST(MOZ_ENABLE_D2D_SURFACE)
     AC_SUBST(MOZ_ENABLE_D3D9_LAYER)
     AC_SUBST(MOZ_ENABLE_D3D10_LAYER)
     AC_SUBST(CAIRO_FT_CFLAGS)
-    AC_SUBST(HAS_OGLES)
 
     if test "$MOZ_DEBUG"; then
       SANITY_CHECKING_FEATURE="#define CAIRO_DO_SANITY_CHECKING 1"
     else
       SANITY_CHECKING_FEATURE="#undef CAIRO_DO_SANITY_CHECKING"
     fi
 
     PNG_FUNCTIONS_FEATURE="#define CAIRO_HAS_PNG_FUNCTIONS 1"
@@ -9036,17 +9031,16 @@ AC_SUBST(XPCOM_STANDALONE_GLUE_LDOPTS)
 AC_SUBST(USE_DEPENDENT_LIBS)
 
 AC_SUBST(MOZ_BUILD_ROOT)
 AC_SUBST(MOZ_OS2_TOOLS)
 
 AC_SUBST(MOZ_POST_DSO_LIB_COMMAND)
 AC_SUBST(MOZ_POST_PROGRAM_COMMAND)
 AC_SUBST(MOZ_TIMELINE)
-AC_SUBST(OGLES_SDK_DIR)
 
 AC_SUBST(MOZ_APP_NAME)
 AC_SUBST(MOZ_APP_DISPLAYNAME)
 AC_DEFINE_UNQUOTED(MOZ_APP_UA_NAME, "$MOZ_APP_UA_NAME")
 AC_SUBST(MOZ_APP_UA_NAME)
 AC_DEFINE_UNQUOTED(MOZ_APP_UA_VERSION, "$MOZ_APP_VERSION")
 AC_SUBST(MOZ_APP_VERSION)
 AC_DEFINE_UNQUOTED(MOZ_UA_FIREFOX_VERSION, "$FIREFOX_VERSION")
--- a/toolkit/library/Makefile.in
+++ b/toolkit/library/Makefile.in
@@ -228,19 +228,16 @@ OS_LIBS += $(call EXPAND_LIBNAME,wininet
 endif
 endif # WINNT
 ifeq ($(OS_ARCH),WINCE)
 OS_LIBS += $(call EXPAND_LIBNAME, aygshell uuid ole32 oleaut32 Ws2 ddraw)
 OS_LIBS += $(call EXPAND_LIBNAME, ceosutil libcmt comsuppw)
 ifdef WINCE_WINDOWS_MOBILE
 OS_LIBS += $(call EXPAND_LIBNAME, cellcore)
 endif
-ifdef HAS_OGLES
-OS_LIBS += $(call EXPAND_LIBNAME, libGLESv2 libEGL)
-endif
 endif
 
 ifdef MOZ_JPROF
 EXTRA_DSO_LDOPTS += -ljprof
 endif
 
 ifdef MOZ_ENABLE_QT
 EXTRA_DSO_LDOPTS += $(MOZ_QT_LDFLAGS) $(XEXT_LIBS)