# Buildsheet autogenerated by ravenadm tool -- Do not edit. NAMEBASE= wxWidgets VERSION= 3.2.4 KEYWORDS= x11_toolkits VARIANTS= standard SDESC[standard]= GUI toolkit with GTK+ bindings HOMEPAGE= https://www.wxwidgets.org/ CONTACT= nobody DOWNLOAD_GROUPS= main SITES[main]= https://github.com/wxWidgets/wxWidgets/releases/download/v3.2.4/ DISTFILE[1]= wxWidgets-3.2.4.tar.bz2:main DF_INDEX= 1 SPKGS[standard]= complete primary nls dev OPTIONS_AVAILABLE= none OPTIONS_STANDARD= none BUILD_DEPENDS= harfbuzz:dev:standard libmspack:dev:standard dbus:dev:standard libGLU:dev:standard BUILDRUN_DEPENDS= libmspack:primary:standard libGLU:primary:standard USES= cpe gmake png jpeg tiff zlib execinfo expat iconv pkgconfig gettext GNOME_COMPONENTS= gtk3 XORG_COMPONENTS= x11 sm xxf86vm xinerama CPE_PRODUCT= wxwidgets CPE_VENDOR= wxwidgets FPC_EQUIVALENT= x11-toolkits/wxgtk32 MUST_CONFIGURE= gnu CONFIGURE_ARGS= --with-libpng=sys --with-libjpeg=sys --with-libtiff=sys --with-zlib=sys --with-expat=sys --with-opengl --with-libmspack --enable-backtrace --enable-graphics_ctx --enable-compat28 --enable-compat30 --with-gtk=3 CONFIGURE_ENV= X11BASE="{{LOCALBASE}}" ac_cv_header_sys_inotify_h=no SOVERSION= 0.2.2 VAR_OPSYS[freebsd]= CONFIGURE_ARGS=--enable-precomp-headers=no post-install: ${RM} -r ${STAGEDIR}${PREFIX}/share/locale/zh [FILE:448:descriptions/desc.primary] wxWidgets is a C++ library that lets developers create applications for Windows, Mac OS X, Linux and other platforms with a single code base. It has popular language bindings for Python, Perl, Ruby and many other languages, and unlike other cross-platform toolkits, wxWidgets gives applications a truly native look and feel because it uses the platform's native API rather than emulating the GUI. It's also extensive, free, open-source and mature. [FILE:102:distinfo] 0640e1ab716db5af2ecb7389dbef6138d7679261fbff730d23845ba838ca133e 27505949 wxWidgets-3.2.4.tar.bz2 [FILE:1208:manifests/plist.primary] bin/ wx-config wxrc-gtk3u-3.2 lib/ libwx_baseu-3.2.so.%%SOMAJOR%% libwx_baseu-3.2.so.%%SOVERSION%% libwx_baseu_net-3.2.so.%%SOMAJOR%% libwx_baseu_net-3.2.so.%%SOVERSION%% libwx_baseu_xml-3.2.so.%%SOMAJOR%% libwx_baseu_xml-3.2.so.%%SOVERSION%% libwx_gtk3u_adv-3.2.so.%%SOMAJOR%% libwx_gtk3u_adv-3.2.so.%%SOVERSION%% libwx_gtk3u_aui-3.2.so.%%SOMAJOR%% libwx_gtk3u_aui-3.2.so.%%SOVERSION%% libwx_gtk3u_core-3.2.so.%%SOMAJOR%% libwx_gtk3u_core-3.2.so.%%SOVERSION%% libwx_gtk3u_gl-3.2.so.%%SOMAJOR%% libwx_gtk3u_gl-3.2.so.%%SOVERSION%% libwx_gtk3u_html-3.2.so.%%SOMAJOR%% libwx_gtk3u_html-3.2.so.%%SOVERSION%% libwx_gtk3u_propgrid-3.2.so.%%SOMAJOR%% libwx_gtk3u_propgrid-3.2.so.%%SOVERSION%% libwx_gtk3u_qa-3.2.so.%%SOMAJOR%% libwx_gtk3u_qa-3.2.so.%%SOVERSION%% libwx_gtk3u_ribbon-3.2.so.%%SOMAJOR%% libwx_gtk3u_ribbon-3.2.so.%%SOVERSION%% libwx_gtk3u_richtext-3.2.so.%%SOMAJOR%% libwx_gtk3u_richtext-3.2.so.%%SOVERSION%% libwx_gtk3u_stc-3.2.so.%%SOMAJOR%% libwx_gtk3u_stc-3.2.so.%%SOVERSION%% libwx_gtk3u_xrc-3.2.so.%%SOMAJOR%% libwx_gtk3u_xrc-3.2.so.%%SOVERSION%% lib/wx/config/gtk3-unicode-3.2 share/bakefile/presets/ wx.bkl wx_presets.py wx_unix.bkl wx_win32.bkl wx_xrc.bkl [FILE:867:manifests/plist.nls] share/locale/ca/LC_MESSAGES/wxstd-3.2.mo share/locale/cs/LC_MESSAGES/wxstd-3.2.mo share/locale/da/LC_MESSAGES/wxstd-3.2.mo share/locale/de/LC_MESSAGES/wxstd-3.2.mo share/locale/el/LC_MESSAGES/wxstd-3.2.mo share/locale/es/LC_MESSAGES/wxstd-3.2.mo share/locale/fi/LC_MESSAGES/wxstd-3.2.mo share/locale/fr/LC_MESSAGES/wxstd-3.2.mo share/locale/hu/LC_MESSAGES/wxstd-3.2.mo share/locale/id/LC_MESSAGES/wxstd-3.2.mo share/locale/it/LC_MESSAGES/wxstd-3.2.mo share/locale/ja/LC_MESSAGES/wxstd-3.2.mo share/locale/nl/LC_MESSAGES/wxstd-3.2.mo share/locale/pl/LC_MESSAGES/wxstd-3.2.mo share/locale/ru/LC_MESSAGES/wxstd-3.2.mo share/locale/sl/LC_MESSAGES/wxstd-3.2.mo share/locale/sv/LC_MESSAGES/wxstd-3.2.mo share/locale/tr/LC_MESSAGES/wxstd-3.2.mo share/locale/uk/LC_MESSAGES/wxstd-3.2.mo share/locale/zh_CN/LC_MESSAGES/wxstd-3.2.mo share/locale/zh_TW/LC_MESSAGES/wxstd-3.2.mo [FILE:9577:manifests/plist.dev] include/wx-3.2/wx/ aboutdlg.h accel.h access.h activityindicator.h addremovectrl.h affinematrix2d.h affinematrix2dbase.h afterstd.h anidecod.h animate.h animdecod.h any.h anybutton.h anystr.h app.h appprogress.h apptrait.h archive.h arrimpl.cpp arrstr.h artprov.h atomic.h bannerwindow.h base64.h beforestd.h bitmap.h bmpbndl.h bmpbuttn.h bmpcbox.h bookctrl.h brush.h buffer.h build.h busyinfo.h button.h calctrl.h caret.h chartype.h checkbox.h checkeddelete.h checklst.h chkconf.h choicdlg.h choice.h choicebk.h clipbrd.h clntdata.h clrpicker.h cmdargs.h cmdline.h cmdproc.h cmndata.h collheaderctrl.h collpane.h colordlg.h colour.h colourdata.h combo.h combobox.h commandlinkbutton.h compiler.h compositewin.h confbase.h config.h containr.h control.h convauto.h cpp.h creddlg.h crt.h cshelp.h ctrlsub.h cursor.h custombgwin.h dataobj.h dataview.h datectrl.h dateevt.h datetime.h datetimectrl.h datstrm.h dc.h dcbuffer.h dcclient.h dcgraph.h dcmemory.h dcmirror.h dcprint.h dcps.h dcscreen.h dcsvg.h dde.h debug.h debugrpt.h defs.h dialog.h dialup.h dir.h dirctrl.h dirdlg.h display.h dlimpexp.h dlist.h dnd.h docmdi.h docview.h dragimag.h dvrenderers.h dynarray.h dynlib.h dynload.h editlbox.h effects.h encconv.h encinfo.h event.h eventfilter.h evtloop.h evtloopsrc.h except.h fdrepdlg.h features.h ffile.h file.h fileconf.h filectrl.h filedlg.h filedlgcustomize.h filefn.h filehistory.h filename.h filepicker.h filesys.h flags.h fmappriv.h font.h fontdata.h fontdlg.h fontenc.h fontenum.h fontmap.h fontpicker.h fontutil.h frame.h fs_arc.h fs_filter.h fs_inet.h fs_mem.h fs_zip.h fswatcher.h gauge.h gbsizer.h gdicmn.h gdiobj.h geometry.h gifdecod.h glcanvas.h graphics.h grid.h hash.h hashmap.h hashset.h headercol.h headerctrl.h help.h helpbase.h helphtml.h helpwin.h htmllbox.h hyperlink.h icon.h iconbndl.h iconloc.h imagbmp.h image.h imaggif.h imagiff.h imagjpeg.h imaglist.h imagpcx.h imagpng.h imagpnm.h imagtga.h imagtiff.h imagxpm.h infobar.h init.h intl.h iosfwrap.h ioswrap.h ipc.h ipcbase.h itemattr.h itemid.h joystick.h kbdstate.h language.h layout.h laywin.h link.h list.h listbase.h listbook.h listbox.h listctrl.h listimpl.cpp localedefs.h log.h longlong.h lzmastream.h math.h matrix.h mdi.h mediactrl.h memconf.h memory.h memtext.h menu.h menuitem.h metafile.h mimetype.h minifram.h modalhook.h module.h mousemanager.h mousestate.h msgdlg.h msgout.h msgqueue.h mstream.h nativewin.h nonownedwnd.h notebook.h notifmsg.h numdlg.h numformatter.h object.h odcombo.h overlay.h ownerdrw.h palette.h panel.h paper.h pen.h peninfobase.h persist.h pickerbase.h platform.h platinfo.h popupwin.h position.h power.h preferences.h print.h printdlg.h prntbase.h process.h progdlg.h propdlg.h ptr_scpd.h ptr_shrd.h quantize.h radiobox.h radiobut.h range.h rawbmp.h rearrangectrl.h recguard.h regex.h region.h renderer.h richmsgdlg.h richtooltip.h rtti.h sashwin.h sckaddr.h sckipc.h sckstrm.h scopedarray.h scopedptr.h scopeguard.h scrolbar.h scrolwin.h secretstore.h selstore.h settings.h sharedptr.h simplebook.h sizer.h slider.h snglinst.h socket.h sound.h spinbutt.h spinctrl.h splash.h splitter.h srchctrl.h sstream.h stack.h stackwalk.h statbmp.h statbox.h statline.h stattext.h statusbr.h stdpaths.h stdstream.h stockitem.h stopwatch.h strconv.h stream.h string.h stringimpl.h stringops.h strvararg.h sysopt.h systhemectrl.h tarstrm.h taskbar.h taskbarbutton.h tbarbase.h testing.h textbuf.h textcompleter.h textctrl.h textdlg.h textentry.h textfile.h textwrapper.h tglbtn.h thread.h thrimpl.cpp time.h timectrl.h timer.h tipdlg.h tipwin.h tls.h tokenzr.h toolbar.h toolbook.h tooltip.h toplevel.h tracker.h translation.h treebase.h treebook.h treectrl.h treelist.h txtstrm.h typeinfo.h types.h uiaction.h uilocale.h unichar.h uri.h url.h ustring.h utils.h valgen.h validate.h valnum.h valtext.h variant.h vector.h version.h versioninfo.h vidmode.h vlbox.h vms_x_fix.h volume.h vscroll.h weakref.h webrequest.h webview.h webviewarchivehandler.h webviewfshandler.h wfstream.h window.h windowid.h windowptr.h withimages.h wizard.h wrapsizer.h wupdlock.h wx.h wxchar.h wxcrt.h wxcrtbase.h wxcrtvararg.h wxhtml.h wxprec.h xlocale.h xpmdecod.h xpmhand.h xti.h xti2.h xtictor.h xtihandler.h xtiprop.h xtistrm.h xtitypes.h xtixml.h zipstrm.h zstream.h include/wx-3.2/wx/aui/ aui.h auibar.h auibook.h dockart.h floatpane.h framemanager.h tabart.h tabmdi.h include/wx-3.2/wx/generic/ aboutdlgg.h accel.h activityindicator.h animate.h bmpcbox.h busyinfo.h buttonbar.h calctrlg.h caret.h choicdgg.h collheaderctrl.h combo.h creddlgg.h custombgwin.h dataview.h datectrl.h dcpsg.h dirctrlg.h dragimgg.h dvrenderer.h dvrenderers.h fdrepdlg.h filectrlg.h filepickerg.h fswatcher.h grid.h gridctrl.h grideditors.h gridsel.h headerctrlg.h helpext.h hyperlink.h icon.h imaglist.h infobar.h laywin.h listctrl.h logg.h msgdlgg.h notebook.h notifmsg.h numdlgg.h paletteg.h panelg.h printps.h prntdlgg.h progdlgg.h propdlg.h richmsgdlgg.h sashwin.h scrolwin.h spinctlg.h splash.h splitter.h srchctlg.h statbmpg.h stattextg.h statusbr.h textdlgg.h timectrl.h treectlg.h wizard.h include/wx-3.2/wx/gtk/ accel.h activityindicator.h animate.h anybutton.h app.h assertdlg_gtk.h bitmap.h bmpbuttn.h bmpcbox.h brush.h button.h calctrl.h checkbox.h checklst.h chkconf.h choice.h clipbrd.h clrpicker.h collpane.h colordlg.h colour.h combobox.h control.h cursor.h dataform.h dataobj.h dataobj2.h dataview.h dialog.h dirdlg.h dnd.h dvrenderer.h dvrenderers.h evtloop.h evtloopsrc.h filectrl.h filedlg.h filehistory.h filepicker.h font.h fontdlg.h fontpicker.h frame.h gauge.h glcanvas.h hyperlink.h infobar.h listbox.h mdi.h menu.h menuitem.h mimetype.h minifram.h msgdlg.h nonownedwnd.h notebook.h pen.h popupwin.h print.h radiobox.h radiobut.h region.h scrolbar.h scrolwin.h slider.h spinbutt.h spinctrl.h srchctrl.h statbmp.h statbox.h statline.h stattext.h taskbar.h textctrl.h textentry.h tglbtn.h toolbar.h tooltip.h toplevel.h webview_webkit.h webviewhistoryitem_webkit.h window.h include/wx-3.2/wx/gtk/gnome/gvfs.h include/wx-3.2/wx/html/ forcelnk.h helpctrl.h helpdata.h helpdlg.h helpfrm.h helpwnd.h htmlcell.h htmldefs.h htmlfilt.h htmlpars.h htmlproc.h htmltag.h htmlwin.h htmprint.h m_templ.h styleparams.h winpars.h include/wx-3.2/wx/meta/ convertible.h if.h implicitconversion.h int2type.h movable.h pod.h removeref.h include/wx-3.2/wx/persist/ bookctrl.h dataview.h splitter.h toplevel.h treebook.h window.h include/wx-3.2/wx/propgrid/ advprops.h editors.h manager.h property.h propgrid.h propgriddefs.h propgridiface.h propgridpagestate.h props.h include/wx-3.2/wx/protocol/ file.h ftp.h http.h log.h protocol.h include/wx-3.2/wx/ribbon/ art.h art_internal.h bar.h buttonbar.h control.h gallery.h page.h panel.h toolbar.h include/wx-3.2/wx/richtext/ richtextbackgroundpage.h richtextborderspage.h richtextbuffer.h richtextbulletspage.h richtextctrl.h richtextdialogpage.h richtextfontpage.h richtextformatdlg.h richtexthtml.h richtextimagedlg.h richtextindentspage.h richtextliststylepage.h richtextmarginspage.h richtextprint.h richtextsizepage.h richtextstyledlg.h richtextstylepage.h richtextstyles.h richtextsymboldlg.h richtexttabspage.h richtextuicustomization.h richtextxml.h include/wx-3.2/wx/stc/stc.h include/wx-3.2/wx/unix/ app.h apptbase.h apptrait.h chkconf.h evtloop.h evtloopsrc.h fontutil.h fswatcher_inotify.h fswatcher_kqueue.h glegl.h glx11.h joystick.h mimetype.h pipe.h sound.h stackwalk.h stdpaths.h taskbarx11.h tls.h utilsx11.h include/wx-3.2/wx/xml/xml.h include/wx-3.2/wx/xrc/ xh_activityindicator.h xh_all.h xh_animatctrl.h xh_aui.h xh_auitoolb.h xh_bannerwindow.h xh_bmp.h xh_bmpbt.h xh_bmpcbox.h xh_bookctrlbase.h xh_bttn.h xh_cald.h xh_chckb.h xh_chckl.h xh_choic.h xh_choicbk.h xh_clrpicker.h xh_cmdlinkbn.h xh_collpane.h xh_combo.h xh_comboctrl.h xh_dataview.h xh_datectrl.h xh_dirpicker.h xh_dlg.h xh_editlbox.h xh_filectrl.h xh_filepicker.h xh_fontpicker.h xh_frame.h xh_gauge.h xh_gdctl.h xh_grid.h xh_html.h xh_htmllbox.h xh_hyperlink.h xh_infobar.h xh_listb.h xh_listbk.h xh_listc.h xh_mdi.h xh_menu.h xh_notbk.h xh_odcombo.h xh_panel.h xh_propdlg.h xh_radbt.h xh_radbx.h xh_ribbon.h xh_richtext.h xh_scrol.h xh_scwin.h xh_simplebook.h xh_sizer.h xh_slidr.h xh_spin.h xh_split.h xh_srchctrl.h xh_statbar.h xh_stbmp.h xh_stbox.h xh_stlin.h xh_sttxt.h xh_styledtextctrl.h xh_text.h xh_tglbtn.h xh_timectrl.h xh_toolb.h xh_toolbk.h xh_tree.h xh_treebk.h xh_unkwn.h xh_wizrd.h xmlres.h xmlreshandler.h lib/ libwx_baseu-3.2.so libwx_baseu_net-3.2.so libwx_baseu_xml-3.2.so libwx_gtk3u_adv-3.2.so libwx_gtk3u_aui-3.2.so libwx_gtk3u_core-3.2.so libwx_gtk3u_gl-3.2.so libwx_gtk3u_html-3.2.so libwx_gtk3u_propgrid-3.2.so libwx_gtk3u_qa-3.2.so libwx_gtk3u_ribbon-3.2.so libwx_gtk3u_richtext-3.2.so libwx_gtk3u_stc-3.2.so libwx_gtk3u_xrc-3.2.so lib/wx/include/gtk3-unicode-3.2/wx/setup.h share/aclocal/wxwin.m4 [FILE:1706:patches/patch-configure] --- configure.orig 2023-11-08 22:53:55 UTC +++ configure @@ -4010,7 +4010,7 @@ case "${host}" in DEFAULT_DEFAULT_wxUSE_GTK=1 ;; - *-*-freebsd*) + *-*-dragonfly*|*-*-freebsd*|*-*-midnight*) USE_BSD=1 USE_FREEBSD=1 $as_echo "#define __FREEBSD__ 1" >>confdefs.h @@ -25296,6 +25296,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu SEARCH_INCLUDE="\ + $X11BASE/include \ /usr/local/include \ /usr/local/X11/include \ /usr/local/include/X11 \ @@ -36455,9 +36456,6 @@ $as_echo "$as_me: WARNING: BeOS threads THREAD_OPTS="-pthreads $THREAD_OPTS" fi ;; - *-*-freebsd*) - THREAD_OPTS="-kthread lthread $THREAD_OPTS c_r" - ;; *-*-darwin* | *-*-cygwin* ) THREAD_OPTS="" ;; @@ -37753,6 +37751,8 @@ else fi fi +OPTIMISE_CFLAGS= + if test "x$wxUSE_REPRODUCIBLE_BUILD" = "xyes"; then $as_echo "#define wxUSE_REPRODUCIBLE_BUILD 1" >>confdefs.h @@ -44227,6 +44227,7 @@ fi ;; powerpc-apple-macos* | \ + *-*-dragonfly* | *-*-midnight* | \ *-*-freebsd* | *-*-openbsd* | *-*-haiku* | *-*-netbsd* | *-*-gnu* | *-*-k*bsd*-gnu | \ *-*-mirbsd* | \ *-*-sunos4* | \ @@ -44268,6 +44269,7 @@ fi case "${BAKEFILE_HOST}" in *-*-linux* | *-*-freebsd* | *-*-openbsd* | *-*-haiku* | *-*-netbsd* | \ + *-*-dragonfly* | *-*-midnight* | *-*-solaris2* | \ *-*-k*bsd*-gnu | *-*-mirbsd* | *-*-gnu* ) if test "x$SUNCXX" = "xyes"; then SONAME_FLAG="-h " [FILE:1585:patches/patch-fix-no-wayland-build] From b8dc0eeb2fb6c49ae0ac9cbc86bd20c0bf3bdee7 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 30 Nov 2023 03:02:13 +0100 Subject: [PATCH] Fix wxGLCanvasEGL compilation when using X11 without Wayland gs_alreadySetSwapInterval variable is used for both X11 and Wayland and so shouldn't be defined only inside GDK_WINDOWING_WAYLAND check. Simply remove the check to fix the problem. Also add an explanatory comment. Closes #24076. --- src/unix/glegl.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) --- src/unix/glegl.cpp.orig +++ src/unix/glegl.cpp @@ -43,8 +43,9 @@ static const char* TRACE_EGL = "glegl"; -#ifdef GDK_WINDOWING_WAYLAND - +// We can't add a member variable to wxGLCanvasEGL in 3.2 branch, so emulate it +// by encoding the corresponding boolean value via the presence of "this" +// pointer in the given hash set. #include "wx/hashset.h" namespace @@ -58,8 +59,6 @@ wxGLCanvasSet gs_alreadySetSwapInterval; } // anonymous namespace -#endif // GDK_WINDOWING_WAYLAND - // ---------------------------------------------------------------------------- // wxGLContextAttrs: OpenGL rendering context attributes // ---------------------------------------------------------------------------- @@ -633,9 +632,9 @@ wxGLCanvasEGL::~wxGLCanvasEGL() DestroyWaylandSubsurface(); g_clear_pointer(&m_wlEGLWindow, wl_egl_window_destroy); g_clear_pointer(&m_wlSurface, wl_surface_destroy); +#endif gs_alreadySetSwapInterval.erase(this); -#endif } void wxGLCanvasEGL::CreateWaylandSubsurface() [FILE:417:patches/patch-setup.h.in] --- setup.h.in.orig 2023-11-08 22:53:55 UTC +++ setup.h.in @@ -789,17 +789,14 @@ /* * Define if your compiler has std::tr1::unordered_map */ -#undef HAVE_TR1_UNORDERED_MAP /* * Define if your compiler has std::tr1::unordered_set */ -#undef HAVE_TR1_UNORDERED_SET /* * Define if your compiler has */ -#undef HAVE_TR1_TYPE_TRAITS /* * Define if your compiler has [FILE:453:patches/patch-src_common_translation.cpp] --- src/common/translation.cpp.orig 2023-11-08 22:53:55 UTC +++ src/common/translation.cpp @@ -1409,7 +1409,7 @@ bool wxTranslations::AddStdCatalog() if ( AddAvailableCatalog("wxstd-" wxSTRINGIZE(wxMAJOR_VERSION) "." wxSTRINGIZE(wxMINOR_VERSION)) ) return true; - if ( AddCatalog(wxS("wxstd")) ) + if ( AddCatalog(wxS("wxstd") wxSTRINGIZE(wxMAJOR_VERSION) wxSTRINGIZE(wxMINOR_VERSION)) ) return true; return false; [FILE:223:patches/patch-src_stc_scintilla_src_Editor.cxx] --- src/stc/scintilla/src/Editor.cxx.orig 2023-11-08 22:53:55 UTC +++ src/stc/scintilla/src/Editor.cxx @@ -18,6 +18,7 @@ #include #include #include +#include #include "Platform.h" [FILE:1190:patches/patch-utils_wxrc_Makefile.in] --- utils/wxrc/Makefile.in.orig 2023-11-08 22:53:55 UTC +++ utils/wxrc/Makefile.in @@ -30,6 +30,7 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ +TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_XML = @EXTRALIBS_XML@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ @@ -118,11 +119,7 @@ distclean: clean @COND_USE_XML_1@install_wxrc: $(__wxrc___depname) @COND_USE_XML_1@ $(INSTALL_DIR) $(DESTDIR)$(bindir) -@COND_USE_XML_1@ $(INSTALL_PROGRAM) wxrc$(EXEEXT) $(DESTDIR)$(bindir) -@COND_USE_XML_1@ rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE)$(WX_FLAVOUR)$(EXEEXT) -@COND_USE_XML_1@ $(INSTALL_PROGRAM) wxrc$(EXEEXT) $(DESTDIR)$(bindir) -@COND_USE_XML_1@ mv -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE)$(WX_FLAVOUR)$(EXEEXT) -@COND_USE_XML_1@ (cd $(DESTDIR)$(bindir) && $(LN_S) wxrc-$(WX_RELEASE)$(WX_FLAVOUR)$(EXEEXT) wxrc$(EXEEXT)) +@COND_USE_XML_1@ $(INSTALL_PROGRAM) wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(TOOLCHAIN_NAME)$(EXEEXT) @COND_USE_XML_1@uninstall_wxrc: @COND_USE_XML_1@ rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT)