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
This commit is contained in:
parent
9cd03a43ce
commit
891ace0538
4 changed files with 23 additions and 26 deletions
|
|
@ -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@"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue