Revert "Remove last vestiges of Carbon-related tools from the makefile"
This reverts commit 2a3721bf98 because it
requires further changes in bakefile itself to really work under Mac, where
the build would be broken as soon as configure would be regenerated (which was
forgotten by that commit due to another error, and so the two errors finally
cancelled out).
This commit is contained in:
Vadim Zeitlin
parent
a0d1a6fa83
commit
545bec0bac
5 changed files with 79 additions and 2 deletions
18
Makefile.in
18
Makefile.in
|
|
@ -20,6 +20,7 @@ SO_SUFFIX_MODULE = @SO_SUFFIX_MODULE@
|
|||
DLLIMP_SUFFIX = @DLLIMP_SUFFIX@
|
||||
LN_S = @LN_S@
|
||||
WINDRES = @WINDRES@
|
||||
REZ = @REZ@
|
||||
PIC_FLAG = @PIC_FLAG@
|
||||
SONAME_FLAG = @SONAME_FLAG@
|
||||
STRIP = @STRIP@
|
||||
|
|
@ -51,9 +52,11 @@ LDFLAGS = @LDFLAGS@
|
|||
VENDOR = @VENDOR@
|
||||
WX_FLAVOUR = @WX_FLAVOUR@
|
||||
WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@
|
||||
DEREZ = @DEREZ@
|
||||
TOOLKIT = @TOOLKIT@
|
||||
TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@
|
||||
TOOLKIT_VERSION = @TOOLKIT_VERSION@
|
||||
TOOLCHAIN_NAME = @TOOLCHAIN_NAME@
|
||||
TOOLCHAIN_FULLNAME = @TOOLCHAIN_FULLNAME@
|
||||
EXTRALIBS = @EXTRALIBS@
|
||||
EXTRALIBS_XML = @EXTRALIBS_XML@
|
||||
|
|
@ -13268,6 +13271,8 @@ COND_USE_WEBVIEW_WEBKIT2_1___webkit2_ext___depname = \
|
|||
@COND_USE_XRC_1@__clean_wxrc___depname = clean-wxrc
|
||||
@COND_USE_XRC_1@__install_wxrc___depname = install-wxrc
|
||||
@COND_TOOLKIT_MSW@RCDEFS_H = msw/rcdefs.h
|
||||
@COND_TOOLKIT_COCOA@__cocoa_res___depname = lib/libwx_$(TOOLCHAIN_NAME).1.r
|
||||
@COND_TOOLKIT_COCOA@__cocoa_res_install___depname = cocoa-res-install
|
||||
@COND_SHARED_0@____SHARED =
|
||||
@COND_SHARED_1@____SHARED = $(PIC_FLAG)
|
||||
@COND_PLATFORM_MACOSX_1@__PLATFORM_SRC_OBJECTS = monodll_unix_apptraits.o
|
||||
|
|
@ -13923,9 +13928,9 @@ COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
|
|||
|
||||
### Targets: ###
|
||||
|
||||
all: $(__wxregex___depname) $(__wxzlib___depname) $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(__wxexpat___depname) $(__wxscintilla___depname) $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__mediadll___depname) $(__medialib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__webviewdll___depname) $(__webviewlib___depname) $(__qadll___depname) $(__qalib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__auidll___depname) $(__auilib___depname) $(__ribbondll___depname) $(__ribbonlib___depname) $(__propgriddll___depname) $(__propgridlib___depname) $(__richtextdll___depname) $(__richtextlib___depname) $(__stcdll___depname) $(__stclib___depname) $(__gldll___depname) $(__gllib___depname) $(__sound_sdl___depname) $(__webkit2_ext___depname) $(__wxrc___depname)
|
||||
all: $(__wxregex___depname) $(__wxzlib___depname) $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(__wxexpat___depname) $(__wxscintilla___depname) $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__mediadll___depname) $(__medialib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__webviewdll___depname) $(__webviewlib___depname) $(__qadll___depname) $(__qalib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__auidll___depname) $(__auilib___depname) $(__ribbondll___depname) $(__ribbonlib___depname) $(__propgriddll___depname) $(__propgridlib___depname) $(__richtextdll___depname) $(__richtextlib___depname) $(__stcdll___depname) $(__stclib___depname) $(__gldll___depname) $(__gllib___depname) $(__sound_sdl___depname) $(__webkit2_ext___depname) $(__wxrc___depname) $(__cocoa_res___depname)
|
||||
|
||||
install: $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxexpat___depname) $(__install_wxscintilla___depname) $(__install_monodll___depname) $(__install_monolib___depname) $(__install_basedll___depname) $(__install_baselib___depname) $(__install_netdll___depname) $(__install_netlib___depname) $(__install_coredll___depname) $(__install_corelib___depname) $(__install_advdll___depname) $(__install_advlib___depname) $(__install_mediadll___depname) $(__install_medialib___depname) $(__install_htmldll___depname) $(__install_htmllib___depname) $(__install_webviewdll___depname) $(__install_webviewlib___depname) $(__install_qadll___depname) $(__install_qalib___depname) $(__install_xmldll___depname) $(__install_xmllib___depname) $(__install_xrcdll___depname) $(__install_xrclib___depname) $(__install_auidll___depname) $(__install_auilib___depname) $(__install_ribbondll___depname) $(__install_ribbonlib___depname) $(__install_propgriddll___depname) $(__install_propgridlib___depname) $(__install_richtextdll___depname) $(__install_richtextlib___depname) $(__install_stcdll___depname) $(__install_stclib___depname) $(__install_gldll___depname) $(__install_gllib___depname) $(__install_sound_sdl___depname) $(__install_webkit2_ext___depname) $(__install_wxrc___depname) install-wxconfig locale_install locale_msw_install
|
||||
install: $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxexpat___depname) $(__install_wxscintilla___depname) $(__install_monodll___depname) $(__install_monolib___depname) $(__install_basedll___depname) $(__install_baselib___depname) $(__install_netdll___depname) $(__install_netlib___depname) $(__install_coredll___depname) $(__install_corelib___depname) $(__install_advdll___depname) $(__install_advlib___depname) $(__install_mediadll___depname) $(__install_medialib___depname) $(__install_htmldll___depname) $(__install_htmllib___depname) $(__install_webviewdll___depname) $(__install_webviewlib___depname) $(__install_qadll___depname) $(__install_qalib___depname) $(__install_xmldll___depname) $(__install_xmllib___depname) $(__install_xrcdll___depname) $(__install_xrclib___depname) $(__install_auidll___depname) $(__install_auilib___depname) $(__install_ribbondll___depname) $(__install_ribbonlib___depname) $(__install_propgriddll___depname) $(__install_propgridlib___depname) $(__install_richtextdll___depname) $(__install_richtextlib___depname) $(__install_stcdll___depname) $(__install_stclib___depname) $(__install_gldll___depname) $(__install_gllib___depname) $(__install_sound_sdl___depname) $(__install_webkit2_ext___depname) $(__install_wxrc___depname) install-wxconfig locale_install locale_msw_install $(__cocoa_res_install___depname)
|
||||
$(INSTALL_DIR) $(DESTDIR)$(datadir)/aclocal
|
||||
(cd $(srcdir) ; $(INSTALL_DATA) wxwin.m4 $(DESTDIR)$(datadir)/aclocal)
|
||||
$(INSTALL_DIR) $(DESTDIR)$(datadir)/bakefile/presets
|
||||
|
|
@ -14073,6 +14078,7 @@ clean: $(__clean_wxrc___depname)
|
|||
rm -f $(DLLPREFIX_MODULE)sound_sdl$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(PLUGVERDELIM)$(PLUGIN_VERSION0)$(WXCOMPILER).$(SO_SUFFIX_MODULE)
|
||||
rm -f $(DLLPREFIX_MODULE)webkit2_ext$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(PLUGVERDELIM)$(PLUGIN_VERSION0)$(WXCOMPILER).$(SO_SUFFIX_MODULE)
|
||||
-(cd samples && $(MAKE) clean)
|
||||
rm -f lib/libwx_$(TOOLCHAIN_NAME).1.rsrc lib/libwx_$(TOOLCHAIN_NAME).1.r
|
||||
|
||||
distclean: clean
|
||||
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
|
||||
|
|
@ -14861,6 +14867,14 @@ locale_msw_uninstall:
|
|||
fi ; \
|
||||
done
|
||||
|
||||
@COND_TOOLKIT_COCOA@lib/libwx_$(TOOLCHAIN_NAME).1.r:
|
||||
@COND_TOOLKIT_COCOA@ $(REZ) -d __UNIX__ -useDF $(top_srcdir)/src/cocoa/dummy.r -o lib/libwx_$(TOOLCHAIN_NAME).1.rsrc
|
||||
@COND_TOOLKIT_COCOA@ $(DEREZ) lib/libwx_$(TOOLCHAIN_NAME).1.rsrc -useDF >lib/libwx_$(TOOLCHAIN_NAME).1.r
|
||||
|
||||
@COND_TOOLKIT_COCOA@cocoa-res-install: $(__cocoa_res___depname)
|
||||
@COND_TOOLKIT_COCOA@ $(INSTALL_DATA) lib/libwx_$(TOOLCHAIN_NAME).1.r $(libdir)
|
||||
@COND_TOOLKIT_COCOA@ $(INSTALL_DATA) lib/libwx_$(TOOLCHAIN_NAME).1.rsrc $(libdir)
|
||||
|
||||
wxregex_regcomp.o: $(srcdir)/src/regex/regcomp.c
|
||||
$(CCC) -c -o $@ $(WXREGEX_CFLAGS) $(srcdir)/src/regex/regcomp.c
|
||||
|
||||
|
|
|
|||
|
|
@ -598,9 +598,16 @@ AC_DEFUN([AC_BAKEFILE_RES_COMPILERS],
|
|||
dnl Check for win32 resources compiler:
|
||||
AC_CHECK_TOOL(WINDRES, windres)
|
||||
;;
|
||||
|
||||
*-*-darwin* | powerpc-apple-macos* )
|
||||
AC_CHECK_PROG(REZ, Rez, Rez, /Developer/Tools/Rez)
|
||||
AC_CHECK_PROG(SETFILE, SetFile, SetFile, /Developer/Tools/SetFile)
|
||||
;;
|
||||
esac
|
||||
|
||||
AC_SUBST(WINDRES)
|
||||
AC_SUBST(REZ)
|
||||
AC_SUBST(SETFILE)
|
||||
])
|
||||
|
||||
dnl ---------------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -397,6 +397,7 @@ to run the tests, include CppUnit library here.
|
|||
<!-- ================================================================== -->
|
||||
|
||||
<if cond="FORMAT=='autoconf'">
|
||||
<option name="DEREZ"/>
|
||||
<option name="TOOLKIT"/>
|
||||
<option name="TOOLKIT_LOWERCASE"/>
|
||||
<option name="TOOLKIT_VERSION"/>
|
||||
|
|
|
|||
|
|
@ -152,6 +152,27 @@
|
|||
</gettext-catalogs>
|
||||
|
||||
|
||||
<!-- Mac OS X resources: -->
|
||||
<set var="MACOS_R">lib/libwx_$(TOOLCHAIN_NAME).$(WXSOVERSION[0]).r</set>
|
||||
<set var="MACOS_RSRC">lib/libwx_$(TOOLCHAIN_NAME).$(WXSOVERSION[0]).rsrc</set>
|
||||
<action id="cocoa-res" cond="TOOLKIT=='COCOA'">
|
||||
<dependency-of>all</dependency-of>
|
||||
<set var="__targetname">$(MACOS_R)</set>
|
||||
<command>
|
||||
$(REZ) -d __UNIX__ -useDF $(top_srcdir)/src/cocoa/dummy.r -o $(MACOS_RSRC)
|
||||
$(DEREZ) $(MACOS_RSRC) -useDF >$(MACOS_R)
|
||||
</command>
|
||||
<clean-files>$(MACOS_RSRC) $(MACOS_R)</clean-files>
|
||||
</action>
|
||||
<action id="cocoa-res-install" cond="TOOLKIT=='COCOA'">
|
||||
<dependency-of>install</dependency-of>
|
||||
<depends>cocoa-res</depends>
|
||||
<command>
|
||||
$(INSTALL_DATA) $(MACOS_R) $(LIBDIR)
|
||||
$(INSTALL_DATA) $(MACOS_RSRC) $(LIBDIR)
|
||||
</command>
|
||||
</action>
|
||||
|
||||
</if>
|
||||
|
||||
|
||||
|
|
|
|||
34
configure.in
34
configure.in
|
|
@ -7977,6 +7977,31 @@ if test "$wxUSE_MSW" = 1 ; then
|
|||
RESCOMP="$WINDRES"
|
||||
fi
|
||||
|
||||
if test "$wxUSE_MAC" = 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_release_number}.r"
|
||||
WX_RESOURCES_MACOSX_DATA="libwx_${TOOLCHAIN_NAME}.${wx_release_number}.rsrc"
|
||||
|
||||
dnl add the resources target for wxMac
|
||||
LIBWXMACRES="\$(wx_top_builddir)/lib/${WX_RESOURCES_MACOSX_ASCII}"
|
||||
|
||||
AC_CHECK_PROG(DEREZ, DeRez, DeRez, /Developer/Tools/DeRez)
|
||||
|
||||
MACSETFILE="\$(SETFILE)"
|
||||
|
||||
dnl resources are bundled both with shared library and applications
|
||||
dnl since the carb resource *must* be included in the application
|
||||
POSTLINK_COMMAND="cat /dev/null | \$(REZ) -d __DARWIN__ -t APPL ${LIBWXMACRES}"
|
||||
RESCOMP="cat /dev/null \| $REZ"
|
||||
WXCONFIG_RESFLAGS="-d __DARWIN__ -t APPL \$libdir/$WX_RESOURCES_MACOSX_ASCII"
|
||||
|
||||
else
|
||||
dnl default value is to (silently) do nothing in the makefile
|
||||
MACSETFILE="@true"
|
||||
POSTLINK_COMMAND="@true"
|
||||
fi
|
||||
|
||||
fi
|
||||
dnl wxUSE_GUI = 1
|
||||
|
||||
|
|
@ -8130,6 +8155,15 @@ AC_SUBST(WX_VERSION_TAG)
|
|||
dnl additional resurces settings
|
||||
AC_SUBST(RESCOMP)
|
||||
AC_SUBST(WINDRES)
|
||||
AC_SUBST(REZ)
|
||||
AC_SUBST(WX_RESOURCES_MACOSX_ASCII)
|
||||
AC_SUBST(WX_RESOURCES_MACOSX_DATA)
|
||||
|
||||
dnl additional for Mac OS X
|
||||
AC_SUBST(DEREZ)
|
||||
AC_SUBST(LIBWXMACRES)
|
||||
AC_SUBST(POSTLINK_COMMAND)
|
||||
AC_SUBST(MACSETFILE)
|
||||
|
||||
dnl other tools
|
||||
AC_SUBST(GCC)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue