Put WINDRES_CPU_DEFINE in RESFLAGS and not RESCOMP in configure.

WINDRES_CPU_DEFINE is just another resource compiler flag which should be part
of RESFLAGS instead of being added to RESCOMP definition itself. This is not
only more logical but also fixes the problem with matching RESCOMP against
"windres" or "wrc" in wx-config.

See #12356.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66234 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/configure b/configure
index fbd626ed31741cf0a9c75f2ed57d75be61107e8c..95434303102a7a0c6a926fca9a05ceb54dfe88b6 100755 (executable)
--- a/configure
+++ b/configure
@@ -29286,10 +29286,10 @@ fi
                         LIBS="$LIBS -lkernel32 -luser32"
     esac
 
                         LIBS="$LIBS -lkernel32 -luser32"
     esac
 

-        RESFLAGS="--include-dir \$(top_srcdir)/include --include-dir \$(top_srcdir)/\$(program_dir) --define __WIN32__ --define __WIN95__ --define __GNUWIN32__"
+        RESFLAGS="--include-dir \$(top_srcdir)/include --include-dir \$(top_srcdir)/\$(program_dir) --define __WIN32__ --define __WIN95__ --define __GNUWIN32__ $WINDRES_CPU_DEFINE"

     RESPROGRAMOBJ="\$(PROGRAM)_resources.o"
 
     RESPROGRAMOBJ="\$(PROGRAM)_resources.o"
 

-                WXCONFIG_RESFLAGS="--define __WIN32__ --define __WIN95__ --define __GNUWIN32__"
+                WXCONFIG_RESFLAGS="--define __WIN32__ --define __WIN95__ --define __GNUWIN32__ $WINDRES_CPU_DEFINE"

 
         WIN32INSTALL=win32install
 
 
         WIN32INSTALL=win32install
 


@@ -52165,7 +52165,7 @@ echo "$as_me: error: Required windres program not found" >&2;}
    { (exit 1); exit 1; }; }
     fi
 
    { (exit 1); exit 1; }; }
     fi
 

-    RESCOMP="$WINDRES $WINDRES_CPU_DEFINE"
+    RESCOMP="$WINDRES"

 fi
 
 if test "$wxUSE_MAC" = 1 -o "$wxUSE_OLD_COCOA" = 1; then
 fi
 
 if test "$wxUSE_MAC" = 1 -o "$wxUSE_OLD_COCOA" = 1; then

diff --git a/configure.in b/configure.in
index 9ef9a8d2d390221df74c7923d0ef2899865aaab7..bc4dae89b1d8b8567652309fbb59f0773ce0f388 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -2864,13 +2864,13 @@ if test "$USE_WIN32" = 1 ; then
     esac
 
     dnl This one is still used by some sample makefiles.
     esac
 
     dnl This one is still used by some sample makefiles.

-    RESFLAGS="--include-dir \$(top_srcdir)/include --include-dir \$(top_srcdir)/\$(program_dir) --define __WIN32__ --define __WIN95__ --define __GNUWIN32__"
+    RESFLAGS="--include-dir \$(top_srcdir)/include --include-dir \$(top_srcdir)/\$(program_dir) --define __WIN32__ --define __WIN95__ --define __GNUWIN32__ $WINDRES_CPU_DEFINE"

     RESPROGRAMOBJ="\$(PROGRAM)_resources.o"
 
     dnl This lot we export to wx-config.  It must add the relevant
     dnl include directories at the point when they can be known.
     dnl (but are these (still) required anyway?)
     RESPROGRAMOBJ="\$(PROGRAM)_resources.o"
 
     dnl This lot we export to wx-config.  It must add the relevant
     dnl include directories at the point when they can be known.
     dnl (but are these (still) required anyway?)

-    WXCONFIG_RESFLAGS="--define __WIN32__ --define __WIN95__ --define __GNUWIN32__"
+    WXCONFIG_RESFLAGS="--define __WIN32__ --define __WIN95__ --define __GNUWIN32__ $WINDRES_CPU_DEFINE"

 
     dnl install Win32-specific files in "make install"
     WIN32INSTALL=win32install
 
     dnl install Win32-specific files in "make install"
     WIN32INSTALL=win32install


@@ -8081,7 +8081,7 @@ if test "$wxUSE_MSW" = 1 ; then
         AC_MSG_ERROR([Required windres program not found])
     fi
 
         AC_MSG_ERROR([Required windres program not found])
     fi
 

-    RESCOMP="$WINDRES $WINDRES_CPU_DEFINE"
+    RESCOMP="$WINDRES"

 fi
 
 if test "$wxUSE_MAC" = 1 -o "$wxUSE_OLD_COCOA" = 1; then
 fi
 
 if test "$wxUSE_MAC" = 1 -o "$wxUSE_OLD_COCOA" = 1; then