use wx_release_number instead of WX_CURRENT in Mac .r and .rsrc file names
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30365 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
1d6560d796
commit
abb9aae7ac
4
configure
vendored
4
configure
vendored
@ -27793,8 +27793,8 @@ WX_LIBRARY_BASENAME_GUI="wx_${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_u
|
||||
|
||||
|
||||
if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = 1; then
|
||||
WX_RESOURCES_MACOSX_ASCII="libwx_${TOOLCHAIN_NAME}.${WX_CURRENT}.r"
|
||||
WX_RESOURCES_MACOSX_DATA="libwx_${TOOLCHAIN_NAME}.${WX_CURRENT}.rsrc"
|
||||
WX_RESOURCES_MACOSX_ASCII="libwx_${TOOLCHAIN_NAME}.${wx_release_number}.r"
|
||||
WX_RESOURCES_MACOSX_DATA="libwx_${TOOLCHAIN_NAME}.${wx_release_number}.rsrc"
|
||||
|
||||
LIBWXMACRES="\$(top_builddir)lib/${WX_RESOURCES_MACOSX_ASCII}"
|
||||
|
||||
|
@ -3395,8 +3395,8 @@ WX_LIBRARY_BASENAME_GUI="wx_${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_u
|
||||
if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = 1; then
|
||||
dnl base name of the resource file for wxMac must be the same
|
||||
dnl as library installation base name (-install_name)
|
||||
WX_RESOURCES_MACOSX_ASCII="libwx_${TOOLCHAIN_NAME}.${WX_CURRENT}.r"
|
||||
WX_RESOURCES_MACOSX_DATA="libwx_${TOOLCHAIN_NAME}.${WX_CURRENT}.rsrc"
|
||||
WX_RESOURCES_MACOSX_ASCII="libwx_${TOOLCHAIN_NAME}.${wx_release_number}.r"
|
||||
WX_RESOURCES_MACOSX_DATA="libwx_${TOOLCHAIN_NAME}.${wx_release_number}.rsrc"
|
||||
|
||||
dnl add the resources target for wxMac
|
||||
LIBWXMACRES="\$(top_builddir)lib/${WX_RESOURCES_MACOSX_ASCII}"
|
||||
|
Loading…
Reference in New Issue
Block a user