From 891ace0538327b0e40aaf1f360b235dc8509fec3 Mon Sep 17 00:00:00 2001 From: David Elliott Date: Fri, 25 Nov 2005 04:51:08 +0000 Subject: [PATCH] Separate RESCOMP into WINDRES (for Win32) and REZ (for Mac OS). Don't check for windres as bakefile.m4 now does it properly. Rename MACRESCOMP to POSTLINK_COMMAND. Rename MACRESWXCONFIG to WXCONFIG_POSTLINK_COMMAND. Use newest bakefile.m4 (with similar changes). Add --rezflags option back to wx-config so existing user Makefiles don't break. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36247 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- build/aclocal/bakefile.m4 | 14 ++++---------- build/bakefiles/wx.bkl | 2 +- configure.in | 30 +++++++++++++++--------------- wx-config.in | 3 +++ 4 files changed, 23 insertions(+), 26 deletions(-) diff --git a/build/aclocal/bakefile.m4 b/build/aclocal/bakefile.m4 index 7808e65f07..375adfaf82 100644 --- a/build/aclocal/bakefile.m4 +++ b/build/aclocal/bakefile.m4 @@ -611,26 +611,20 @@ dnl --------------------------------------------------------------------------- AC_DEFUN([AC_BAKEFILE_RES_COMPILERS], [ - RESCOMP= - SETFILE= - case ${BAKEFILE_HOST} in *-*-cygwin* | *-*-mingw32* ) dnl Check for win32 resources compiler: - if test "$build" != "$host" ; then - RESCOMP=$host_alias-windres - else - AC_CHECK_PROG(RESCOMP, windres, windres, windres) - fi + AC_CHECK_TOOL(WINDRES, windres) ;; *-*-darwin* | powerpc-apple-macos* ) - AC_CHECK_PROG(RESCOMP, Rez, Rez, /Developer/Tools/Rez) + AC_CHECK_PROG(REZ, Rez, Rez, /Developer/Tools/Rez) AC_CHECK_PROG(SETFILE, SetFile, SetFile, /Developer/Tools/SetFile) ;; esac - AC_SUBST(RESCOMP) + AC_SUBST(WINDRES) + AC_SUBST(REZ) AC_SUBST(SETFILE) ]) diff --git a/build/bakefiles/wx.bkl b/build/bakefiles/wx.bkl index 113906f331..2eb036a770 100644 --- a/build/bakefiles/wx.bkl +++ b/build/bakefiles/wx.bkl @@ -150,7 +150,7 @@ all $(MACOS_R) - $(RESCOMP) -d __UNIX__ -useDF $(top_srcdir)/src/cocoa/dummy.r -o $(MACOS_RSRC) + $(REZ) -d __UNIX__ -useDF $(top_srcdir)/src/cocoa/dummy.r -o $(MACOS_RSRC) $(DEREZ) $(MACOS_RSRC) -useDF >$(MACOS_R) $(MACOS_RSRC) $(MACOS_R) diff --git a/configure.in b/configure.in index 2c73b16585..a0694b70f9 100644 --- a/configure.in +++ b/configure.in @@ -1447,11 +1447,11 @@ AC_CHECK_TOOL(STRIP, strip, true) dnl Win32 tools if test "$wxUSE_WINE" = "yes"; then - AC_CHECK_TOOL(RESCOMP, wrc) + AC_CHECK_TOOL(WINDRES, wrc) else case "${host}" in *-*-cygwin* | *-*-mingw32* ) - AC_CHECK_TOOL(RESCOMP, windres) + dnl Bakefile CVS (as of 2005-11-24) now detects windres properly AC_CHECK_TOOL(DLLTOOL, dlltool) ;; esac @@ -3896,7 +3896,7 @@ if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = 1; then dnl add the resources target for wxMac LIBWXMACRES="\$(top_builddir)lib/${WX_RESOURCES_MACOSX_ASCII}" - AC_CHECK_PROG(RESCOMP, Rez, Rez, /Developer/Tools/Rez) + AC_CHECK_PROG(REZ, Rez, Rez, /Developer/Tools/Rez) AC_CHECK_PROG(DEREZ, DeRez, DeRez, /Developer/Tools/DeRez) AC_CHECK_PROG(SETFILE, SetFile, SetFile, /Developer/Tools/SetFile) @@ -3905,25 +3905,24 @@ if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = 1; then dnl resources are bundled both with shared library and applications dnl since the carb resource *must* be included in the application if test "$wxUSE_MAC" = 1; then - MACRESCOMP="\$(RESCOMP) -d __DARWIN__ -t APPL Carbon.r -o" + POSTLINK_COMMAND="\$(REZ) -d __DARWIN__ -t APPL Carbon.r -o" dnl this command is used to implement `wx-config --rezflags` and it is dnl eval'd there so escape any metacharacters inside - MACRESWXCONFIG="${RESCOMP} -d __DARWIN__ -t APPL Carbon.r -o" + WXCONFIG_POSTLINK_COMMAND="${REZ} -d __DARWIN__ -t APPL Carbon.r -o" else - MACRESCOMP="echo -n | \$(RESCOMP) -d __DARWIN__ -t APPL ${LIBWXMACRES} -o" - MACRESWXCONFIG="echo -n \\\| ${RESCOMP} -d __DARWIN__ -t APPL \\\${exec_prefix}/lib/${WX_RESOURCES_MACOSX_ASCII} -o" + POSTLINK_COMMAND="echo -n | \$(REZ) -d __DARWIN__ -t APPL ${LIBWXMACRES} -o" + WXCONFIG_POSTLINK_COMMAND="echo -n \\\| ${REZ} -d __DARWIN__ -t APPL \\\${exec_prefix}/lib/${WX_RESOURCES_MACOSX_ASCII} -o" fi else dnl default value is to (silently) do nothing in the makefile MACSETFILE="@true" - MACRESWXCONFIG="@true" + WXCONFIG_POSTLINK_COMMAND="@true" - dnl confusingly, wxOS2 also uses MACRESCOMP in its post-link step if test "$wxUSE_PM" = 1; then - MACRESCOMP="emxbind -ep" + POSTLINK_COMMAND="emxbind -ep" else - MACRESCOMP="@true" + POSTLINK_COMMAND="@true" fi fi @@ -7190,7 +7189,7 @@ fi dnl TOOLCHAIN_DEFS should be used for both wx and client code WXCONFIG_CPPFLAGS="$WXCONFIG_CPPFLAGS $TOOLCHAIN_DEFS" -WXCONFIG_RESCOMP="$RESCOMP $WXCONFIG_RESFLAGS" +WXCONFIG_RESCOMP="$WINDRES $WXCONFIG_RESFLAGS" dnl for convenience, sort the samples in alphabetical order dnl @@ -7266,7 +7265,8 @@ AC_SUBST(DMALLOC_LIBS) AC_SUBST(WX_VERSION_TAG) dnl additional resurces settings -AC_SUBST(RESCOMP) +AC_SUBST(WINDRES) +AC_SUBST(REZ) AC_SUBST(RESFLAGS) AC_SUBST(RESPROGRAMOBJ) AC_SUBST(WX_RESOURCES_MACOSX_ASCII) @@ -7275,9 +7275,9 @@ AC_SUBST(WX_RESOURCES_MACOSX_DATA) dnl additional for Mac OS X AC_SUBST(DEREZ) AC_SUBST(LIBWXMACRES) -AC_SUBST(MACRESCOMP) +AC_SUBST(POSTLINK_COMMAND) AC_SUBST(MACSETFILE) -AC_SUBST(MACRESWXCONFIG) +AC_SUBST(WXCONFIG_POSTLINK_COMMAND) dnl other tools AC_SUBST(GCC) diff --git a/wx-config.in b/wx-config.in index 2633c436fe..071f09e9bf 100755 --- a/wx-config.in +++ b/wx-config.in @@ -132,6 +132,7 @@ wxconfig_output_options="prefix exec_prefix basename cppflags cflags cxxflags rescomp + rezflags libs linkdeps cc cxx ld @@ -880,6 +881,8 @@ bindir="@bindir@" [ -z "$output_option_version" ] || echo "@WX_VERSION@" [ -z "$output_option_version_full" ] || echo "@WX_SUBVERSION@" [ -z "$output_option_basename" ] || echo "@WX_LIBRARY_BASENAME_GUI@" +# --rezflags is deprecated +[ -z "$output_option_rezflags" ] || echo "@WXCONFIG_POSTLINK_COMMAND@" [ -z "$output_option_rescomp" ] || echo "@WXCONFIG_RESCOMP@" [ -z "$output_option_cc" ] || echo "@CC@" [ -z "$output_option_cxx" ] || echo "@CXX@" -- 2.45.2