Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Put WINDRES_CPU_DEFINE in RESFLAGS and not RESCOMP in configure.

Browse Source 
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
This commit is contained in:
Vadim Zeitlin
2010-11-22 12:48:35 +00:00
parent 6cab632f32
commit ef5dbedecf
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
configure vendored
View File

@@ -29286,10 +29286,10 @@ fi
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"
WXCONFIG_RESFLAGS="--define __WIN32__ --define __WIN95__ --define __GNUWIN32__"
WXCONFIG_RESFLAGS="--define __WIN32__ --define __WIN95__ --define __GNUWIN32__ $WINDRES_CPU_DEFINE"
WIN32INSTALL=win32install
@@ -52165,7 +52165,7 @@ echo "$as_me: error: Required windres program not found" >&2;}
{ (exit 1); exit 1; }; }
fi
RESCOMP="$WINDRES $WINDRES_CPU_DEFINE"
RESCOMP="$WINDRES"
fi
if test "$wxUSE_MAC" = 1 -o "$wxUSE_OLD_COCOA" = 1; then

6
configure.in
View File

@@ -2864,13 +2864,13 @@ if test "$USE_WIN32" = 1 ; then
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?)
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
@@ -8081,7 +8081,7 @@ if test "$wxUSE_MSW" = 1 ; then
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