-------- Original-Nachricht -------- > Datum: Mon, 28 Mar 2011 00:58:38 +0200 > Von: Pavel Sanda <sa...@lyx.org> > An: lyx-devel@lists.lyx.org > Betreff: Re: r38038 - in lyx-devel/trunk/src: . client frontends/qt4 support > tex2lyx
> for...@lyx.org wrote: > > Author: forenr > > Date: Fri Mar 25 02:59:34 2011 > > New Revision: 38038 > > URL: http://www.lyx.org/trac/changeset/38038 > > > > Log: > > Infrastructure for choosing different icon sets. This currently works > > through the rc setting \icon_set. Preferences dialog will follow > shortly. > > ... > > > Modified: lyx-devel/trunk/src/support/filetools.cpp > > > ============================================================================== > > --- lyx-devel/trunk/src/support/filetools.cpp Fri Mar 25 02:54:55 > 2011 (r38037) > > +++ lyx-devel/trunk/src/support/filetools.cpp Fri Mar 25 02:59:34 > 2011 (r38038) > > @@ -21,6 +21,8 @@ > > > > #include <config.h> > > > > +#include "LyXRC.h" > > + > > #include "support/filetools.h" > > > > #include "support/debug.h" > > @@ -307,6 +309,21 @@ > > } > > > > > > +FileName const imageLibFileSearch(string & dir, string const & name, > > + string const & ext) > > +{ > > + if (!lyx::lyxrc.icon_set.empty()) { > > + string const imagedir = addPath(dir, lyx::lyxrc.icon_set); > > + FileName const fn = libFileSearch(imagedir, name, ext); > > + if (fn.exists()) { > > + dir = imagedir; > > + return fn; > > + } > > + } > > + return libFileSearch(dir, name, ext); > > +} > > + > > + > > string const libScriptSearch(string const & command_in, quote_style > style) > > { > > static string const token_scriptpath = "$$s/"; > > adding lyxrc.h into support will create link errs of "make check". > > make[5]: Entering directory `/lyx/releaser/src/support' > CXXLD check_convert > liblyxsupport.a(filetools.o): In function > `lyx::support::imageLibFileSearch(std::basic_string<char, > std::char_traits<char>, std::allocator<char> > >&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > const&)': > /lyx/releaser/src/support/filetools.cpp:315: undefined reference to > `lyx::lyxrc' > /lyx/releaser/src/support/filetools.cpp:316: undefined reference to > `lyx::lyxrc' > collect2: ld returned 1 exit status > make[5]: *** [check_convert] Error 1 > > pavel filetools.cpp is maybe the wrong place to use lyxrc because then tex2lyx also needs it. What about a function which could be a dummy in tex2lyx? Peter -- NEU: FreePhone - kostenlos mobil telefonieren und surfen! Jetzt informieren: http://www.gmx.net/de/go/freephone
