Bump build requirements for gcc on win32 to w32api 2.4 & windres 2.14.90 and add version checks.

Remove hacks used for previous versions Bug #203292 a=bryner Bug #219327 a=bryner
2025-02-23 10:54:33 +00:00 · 2003-09-18 19:27:39 +00:00 · 2003-09-18 19:27:39 +00:00 · 4ed4bcc52c
commit 4ed4bcc52c
parent 0c2d1422ff
5 changed files with 695 additions and 661 deletions
--- a/1233
+++ b/1233
--- a/configure.in
+++ b/configure.in
@ -89,6 +89,8 @@ PERL_VERSION=5.004
 LIBART_VERSION=2.3.4
 GTK2_VERSION=1.3.7
 MAKE_VERSION=3.78
+WINDRES_VERSION=2.14.90
+W32API_VERSION=2.4

 dnl Set various checks
 dnl ========================================================
@ -362,6 +364,41 @@ case "$target" in
        if test "$_MIDL_MAJOR_VERSION" != "5" -a "$_MIDL_FULL_VERSION" != "6.00.0347"; then
            AC_MSG_ERROR([Midl version $_MIDL_FULL_VERSION was found.  Midl version must be 5.x.x (VC6*) or 6.00.0347 (VC7).])
        fi
+    else
+        # Check w32api version
+        _W32API_MAJOR_VERSION=`echo $W32API_VERSION | $AWK -F\. '{ print $1 }'`
+        _W32API_MINOR_VERSION=`echo $W32API_VERSION | $AWK -F\. '{ print $2 }'`
+        AC_MSG_CHECKING([for w32api version >= $W32API_VERSION])
+        AC_TRY_COMPILE([#include <w32api.h>],
+            #if (__W32API_MAJOR_VERSION < $_W32API_MAJOR_VERSION) || \
+                (__W32API_MAJOR_VERSION == $_W32API_MAJOR_VERSION && \
+                 __W32API_MINOR_VERSION < $_W32API_MINOR_VERSION)
+                #error "test failed."
+            #endif
+            , [ res=yes ], [ res=no ])
+        AC_MSG_RESULT([$res])
+        if test "$res" != "yes"; then
+            AC_MSG_ERROR([w32api version $W32API_VERSION or higher required.])
+        fi
+        # Check windres version
+        AC_MSG_CHECKING([for windres version >= $WINDRES_VERSION])
+        _WINDRES_VERSION=`${WINDRES} --version 2>&1 | grep -i windres 2>/dev/null | $AWK '{ print $3 }'`
+        AC_MSG_RESULT([$_WINDRES_VERSION])
+        _WINDRES_MAJOR_VERSION=`echo $_WINDRES_VERSION | $AWK -F\. '{ print $1 }'`
+        _WINDRES_MINOR_VERSION=`echo $_WINDRES_VERSION | $AWK -F\. '{ print $2 }'`
+        _WINDRES_RELEASE_VERSION=`echo $_WINDRES_VERSION | $AWK -F\. '{ print $3 }'`
+        WINDRES_MAJOR_VERSION=`echo $WINDRES_VERSION | $AWK -F\. '{ print $1 }'`
+        WINDRES_MINOR_VERSION=`echo $WINDRES_VERSION | $AWK -F\. '{ print $2 }'`
+        WINDRES_RELEASE_VERSION=`echo $WINDRES_VERSION | $AWK -F\. '{ print $3 }'`
+        if test "$_WINDRES_MAJOR_VERSION" -lt "$WINDRES_MAJOR_VERSION" -o \
+                "$_WINDRES_MAJOR_VERSION" -eq "$WINDRES_MAJOR_VERSION" -a \
+                "$_WINDRES_MINOR_VERSION" -lt "$WINDRES_MINOR_VERSION" -o \
+                "$_WINDRES_MAJOR_VERSION" -eq "$WINDRES_MAJOR_VERSION" -a \
+                "$_WINDRES_MINOR_VERSION" -eq "$WINDRES_MINOR_VERSION" -a \
+                "$_WINDRES_RELEASE_VERSION" -lt "$WINDRES_RELEASE_VERSION"
+        then
+            AC_MSG_ERROR([windres version $WINDRES_VERSION or higher is required to build.])
+        fi
    fi # !GNU_CC
    ;;
 esac
--- a/gfx/src/windows/nsRenderingContextWin.cpp
+++ b/gfx/src/windows/nsRenderingContextWin.cpp
@ -2934,11 +2934,7 @@ nsRenderingContextWin::InitBidiInfo()
    const PRUnichar one     = 0x0031;

    int distanceArray[2];
-#ifdef __MINGW32__
-    UINT glyphArray[2];
-#else
    PRUnichar glyphArray[2];
-#endif
    PRUnichar outStr[] = {0, 0};

    GCP_RESULTSW gcpResult;
--- a/xpfe/bootstrap/splash.rc
+++ b/xpfe/bootstrap/splash.rc
@ -54,9 +54,7 @@ IDD_SPLASH DIALOGEX
 	FONT 8, "MS Sans Serif"
 	BEGIN
 		CONTROL
-#ifndef __MINGW32__
-            IDB_SPLASH,
-#endif
+			IDB_SPLASH,
 			IDB_SPLASH,
 			"Static",
 			SS_BITMAP,
--- a/xpinstall/wizard/windows/setuprsc/setuprsc.rc
+++ b/xpinstall/wizard/windows/setuprsc/setuprsc.rc
@ -63,11 +63,7 @@ BEGIN
    LTEXT           "",IDC_STATIC0,101,11,202,37,NOT WS_GROUP
    LTEXT           "",IDC_STATIC1,102,53,201,37,NOT WS_GROUP
    LTEXT           "",IDC_STATIC2,102,96,201,37,NOT WS_GROUP
-    CONTROL
-#ifndef __MINGW32__
-                    108,
-#endif
-                    IDC_STATIC,"Static",SS_BITMAP,11,11,83,162,
+    CONTROL         108,IDC_STATIC,"Static",SS_BITMAP,11,11,83,162,
                    WS_EX_CLIENTEDGE
    CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,11,179,295,1,
                    WS_EX_STATICEDGE
@ -100,11 +96,7 @@ BEGIN
    DEFPUSHBUTTON   "",IDWIZNEXT,188,186,53,14
    PUSHBUTTON      "",IDCANCEL,252,186,53,14
    LTEXT           "",IDC_STATIC_MSG0,101,11,204,17,NOT WS_GROUP
-    CONTROL
-#ifndef __MINGW32__
-                    108,
-#endif
-                    IDC_STATIC,"Static",SS_BITMAP,11,11,83,162,
+    CONTROL         108,IDC_STATIC,"Static",SS_BITMAP,11,11,83,162,
                    WS_EX_CLIENTEDGE
    CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,11,179,295,1,
                    WS_EX_STATICEDGE
@ -129,11 +121,7 @@ BEGIN
    GROUPBOX        "",IDC_STATIC,101,140,204,33
    LTEXT           "",IDC_DOWNLOAD_SIZE,105,160,92,8,NOT WS_GROUP
    LTEXT           "",IDC_SPACE_AVAILABLE,206,160,94,8,NOT WS_GROUP
-    CONTROL
-#ifndef __MINGW32__
-                    108,
-#endif
-                    IDC_STATIC,"Static",SS_BITMAP,11,11,83,162,
+    CONTROL         108,IDC_STATIC,"Static",SS_BITMAP,11,11,83,162,
                    WS_EX_CLIENTEDGE
    CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,11,179,295,1,
                    WS_EX_STATICEDGE
@ -161,11 +149,7 @@ BEGIN
    DEFPUSHBUTTON   "",IDWIZNEXT,188,186,53,14
    PUSHBUTTON      "",IDCANCEL,252,186,53,14
    LTEXT           "",IDC_MESSAGE0,101,11,204,17,NOT WS_GROUP
-    CONTROL
-#ifndef __MINGW32__
-                    108,
-#endif
-                    IDC_PICT0,"Static",SS_BITMAP,11,11,83,162,
+    CONTROL         108,IDC_PICT0,"Static",SS_BITMAP,11,11,83,162,
                    WS_EX_CLIENTEDGE
    CONTROL         "",IDC_STATIC0,"Static",SS_ETCHEDHORZ,11,179,295,1,
                    WS_EX_STATICEDGE
@ -186,11 +170,7 @@ BEGIN
    DEFPUSHBUTTON   "",IDWIZNEXT,188,186,53,14
    PUSHBUTTON      "",IDCANCEL,252,186,53,14
    LTEXT           "",IDC_MESSAGE0,101,11,204,33,NOT WS_GROUP
-    CONTROL
-#ifndef __MINGW32__
-                    108,
-#endif
-                    IDC_STATIC,"Static",SS_BITMAP,11,11,83,162,
+    CONTROL         108,IDC_STATIC,"Static",SS_BITMAP,11,11,83,162,
                    WS_EX_CLIENTEDGE
    CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,11,179,295,1,
                    WS_EX_STATICEDGE
@ -227,19 +207,11 @@ BEGIN
    LTEXT           "",IDC_MESSAGE0,101,14,204,18,NOT WS_GROUP
    LTEXT           "",IDC_MESSAGE1,101,50,204,20,NOT WS_GROUP
    LTEXT           "",IDC_MESSAGE2,101,127,204,18,NOT WS_GROUP
-    CONTROL
-#ifndef __MINGW32__
-                    108,
-#endif
-                    IDC_STATIC,"Static",SS_BITMAP,11,11,83,162,
+    CONTROL         108,IDC_STATIC,"Static",SS_BITMAP,11,11,83,162,
                    WS_EX_CLIENTEDGE
    CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,11,179,295,1,
                    WS_EX_STATICEDGE
-    CONTROL
-#ifndef __MINGW32__
-                    115,
-#endif
-                    IDC_STATIC,"Static",SS_BITMAP,102,76,20,20
+    CONTROL         115,IDC_STATIC,"Static",SS_BITMAP,102,76,20,20
 END

 DLG_BROWSE_DIR DIALOG DISCARDABLE  147, 23, 190, 143
@ -294,11 +266,7 @@ BEGIN
    CONTROL         "",IDC_STATUS3,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
                    WS_GROUP,12,98,286,8
    CONTROL         "",IDC_GAUGE_FILE,"GaugeFile",0x0,12,110,286,11
-    CONTROL
-#ifndef __MINGW32__
-                    114,
-#endif
-                    IDB_BITMAP_BANNER,"Static",SS_BITMAP,0,0,312,34
+    CONTROL         114,IDB_BITMAP_BANNER,"Static",SS_BITMAP,0,0,312,34
 END

 DLG_ADVANCED_SETTINGS DIALOG DISCARDABLE  51, 56, 315, 205
@ -318,11 +286,7 @@ BEGIN
                    9
    DEFPUSHBUTTON   "",IDWIZNEXT,188,186,53,14
    PUSHBUTTON      "",IDCANCEL,252,186,53,14
-    CONTROL
-#ifndef __MINGW32__
-                    108,
-#endif
-                    IDC_STATIC,"Static",SS_BITMAP,11,11,83,162,
+    CONTROL         108,IDC_STATIC,"Static",SS_BITMAP,11,11,83,162,
                    WS_EX_CLIENTEDGE
    CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,11,179,295,1,
                    WS_EX_STATICEDGE
@ -353,11 +317,7 @@ BEGIN
    GROUPBOX        "",IDC_STATIC,101,140,204,33
    LTEXT           "",IDC_DOWNLOAD_SIZE,105,160,92,8,NOT WS_GROUP
    LTEXT           "",IDC_SPACE_AVAILABLE,206,160,94,8,NOT WS_GROUP
-    CONTROL
-#ifndef __MINGW32__
-                    108,
-#endif
-                    IDC_STATIC,"Static",SS_BITMAP,11,11,83,162,
+    CONTROL         108,IDC_STATIC,"Static",SS_BITMAP,11,11,83,162,
                    WS_EX_CLIENTEDGE
    CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,11,179,295,1,
                    WS_EX_STATICEDGE
@ -398,11 +358,7 @@ BEGIN
    DEFPUSHBUTTON   "",IDWIZNEXT,188,186,53,14
    PUSHBUTTON      "",IDCANCEL,252,186,53,14
    LTEXT           "",IDC_MESSAGE0,100,20,204,33,NOT WS_GROUP
-    CONTROL
-#ifndef __MINGW32__
-                    108,
-#endif
-                    -1,"Static",SS_BITMAP,11,11,83,162,WS_EX_CLIENTEDGE
+    CONTROL         108,-1,"Static",SS_BITMAP,11,11,83,162,WS_EX_CLIENTEDGE
    CONTROL         "",-1,"Static",SS_ETCHEDHORZ,11,179,295,1,
                    WS_EX_STATICEDGE
 END
@ -428,11 +384,7 @@ BEGIN
                    SS_NOPREFIX | WS_GROUP,49,72,253,8
    CONTROL         "",IDC_GAUGE_FILE,"GaugeFile",0x0,9,114,271,11
    LTEXT           "",IDC_PERCENTAGE,283,115,20,8,SS_NOPREFIX
-    CONTROL
-#ifndef __MINGW32__
-                    114,
-#endif
-                    IDB_BITMAP_BANNER,"Static",SS_BITMAP,0,0,312,34
+    CONTROL         114,IDB_BITMAP_BANNER,"Static",SS_BITMAP,0,0,312,34
    LTEXT           "",IDC_STATIC4,9,91,37,8,SS_NOPREFIX
    CONTROL         "",IDC_STATUS_TO,"Static",SS_LEFTNOWORDWRAP | 
                    SS_NOPREFIX | WS_GROUP,49,91,253,8
@ -450,11 +402,7 @@ BEGIN
    EDITTEXT        IDC_CURRENT_SETTINGS,101,67,204,102,ES_MULTILINE | 
                    ES_OEMCONVERT | ES_READONLY | WS_VSCROLL | WS_HSCROLL
    LTEXT           "",IDC_MESSAGE0,101,11,204,52,NOT WS_GROUP
-    CONTROL
-#ifndef __MINGW32__
-                    108,
-#endif
-                    IDC_STATIC,"Static",SS_BITMAP,11,11,83,162,
+    CONTROL         108,IDC_STATIC,"Static",SS_BITMAP,11,11,83,162,
                    WS_EX_CLIENTEDGE
    CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,11,179,295,1,
                    WS_EX_STATICEDGE