Output deprecated warning for --rezflags and permanently disable it.
Remove WXCONFIG_POSTLINK_COMMAND that existed only for it. Make the explanation more explanatory. This is not an invitation for stray options and script helpers to do a little 'open mike', its a holding ground for nasty things we still need to fix. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36293 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
a815cb29f2
commit
a55d039a23
@ -3921,9 +3921,6 @@ if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = 1; then
|
||||
WXCONFIG_RESFLAGS="-d __DARWIN__ -t APPL \$libdir/$WX_RESOURCES_MACOSX_ASCII"
|
||||
fi
|
||||
|
||||
dnl this one for deprecated --rezflags.
|
||||
WXCONFIG_POSTLINK_COMMAND="$RESCOMP $WXCONFIG_RESFLAGS -o"
|
||||
|
||||
else
|
||||
dnl default value is to (silently) do nothing in the makefile
|
||||
MACSETFILE="@true"
|
||||
@ -3938,8 +3935,6 @@ else
|
||||
POSTLINK_COMMAND="@true"
|
||||
fi
|
||||
|
||||
dnl this one for deprecated --rezflags.
|
||||
WXCONFIG_POSTLINK_COMMAND="$POSTLINK_COMMAND"
|
||||
fi
|
||||
|
||||
|
||||
@ -7327,7 +7322,6 @@ AC_SUBST(DEREZ)
|
||||
AC_SUBST(LIBWXMACRES)
|
||||
AC_SUBST(POSTLINK_COMMAND)
|
||||
AC_SUBST(MACSETFILE)
|
||||
AC_SUBST(WXCONFIG_POSTLINK_COMMAND)
|
||||
|
||||
dnl other tools
|
||||
AC_SUBST(GCC)
|
||||
|
31
wx-config.in
31
wx-config.in
@ -886,8 +886,14 @@ bindir="@bindir@"
|
||||
[ -z "$output_option_ld" ] || echo "@EXE_LINKER@"
|
||||
[ -z "$flag_option_selected_config" ] || echo "$this_config"
|
||||
|
||||
# --rezflags is deprecated (2005/11/29)
|
||||
[ -z "$output_option_rezflags" ] || echo "@WXCONFIG_POSTLINK_COMMAND@"
|
||||
|
||||
# --rezflags is deprecated and disabled (2005/11/29)
|
||||
if [ -n "$output_option_rezflags" ]; then
|
||||
echo "@true"
|
||||
decho "Warning: --rezflags, along with Mac OS classic resource building" \
|
||||
"is deprecated. You should remove this from your Makefile and" \
|
||||
"build .app bundles instead."
|
||||
fi
|
||||
|
||||
|
||||
# The rest are going to need a little more work.
|
||||
@ -1168,10 +1174,23 @@ if [ -n "$output_option_libs" ]; then
|
||||
fi
|
||||
|
||||
|
||||
# Here you will find all the machine or tool specific workarounds that
|
||||
# require knowlege not obtainable prior to passing this comment.
|
||||
# xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
|
||||
#
|
||||
# Beyond here reside only machine or tool specific workarounds
|
||||
# that require knowlege not obtainable prior to this comment.
|
||||
#
|
||||
# Please. Avoid addding things here, wx-config should avoid
|
||||
# hard coding tool specific details. Do not use things here
|
||||
# as an example of other things that should be here, These
|
||||
# shouldn't be here either. This is a place of last resort
|
||||
# for interim workarounds. I can but stress as strongly as
|
||||
# the censor will allow, there are only bad examples of things
|
||||
# that belong at this level of abstraction to follow. It is
|
||||
# a limbo for glitches awaiting the Next Design Repair. Ok.
|
||||
#
|
||||
# With that firmly in mind, our debut dilemma is:
|
||||
|
||||
# Resource compilers. A term that covers some pretty
|
||||
# Resource compilers. An elusive term that covers some pretty
|
||||
# dissimilar concepts on various platforms. The good news is,
|
||||
# each platform has only one definition of 'resource', compiled
|
||||
# or not, and so we can abstract that neatly to return a platform
|
||||
@ -1215,6 +1234,8 @@ if [ -n "$output_option_rescomp" ]; then
|
||||
|
||||
fi
|
||||
|
||||
#
|
||||
# xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
|
||||
|
||||
# And so that's it, we're done. Have a nice build.
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user