mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-26 11:16:55 +00:00
Fix make check
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38088 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
d4586ba28e
commit
b1c7450f73
@ -149,19 +149,19 @@ check_PROGRAMS = \
|
|||||||
check_filetools \
|
check_filetools \
|
||||||
check_lstrings
|
check_lstrings
|
||||||
|
|
||||||
check_convert_LDADD = liblyxsupport.a $(INTLLIBS) $(LIBICONV) $(BOOST_LIBS) $(QT4_CORE_LIBS)
|
check_convert_LDADD = liblyxsupport.a $(INTLLIBS) $(LIBICONV) $(BOOST_LIBS) $(QT4_CORE_LIBS) $(LIBSHLWAPI)
|
||||||
check_convert_LDFLAGS = $(QT4_LDFLAGS)
|
check_convert_LDFLAGS = $(QT4_LDFLAGS)
|
||||||
check_convert_SOURCES = \
|
check_convert_SOURCES = \
|
||||||
tests/check_convert.cpp \
|
tests/check_convert.cpp \
|
||||||
tests/boost.cpp
|
tests/boost.cpp
|
||||||
|
|
||||||
check_filetools_LDADD = liblyxsupport.a $(INTLLIBS) $(LIBICONV) $(BOOST_LIBS) $(QT4_CORE_LIBS)
|
check_filetools_LDADD = liblyxsupport.a $(INTLLIBS) $(LIBICONV) $(BOOST_LIBS) $(QT4_CORE_LIBS) $(LIBSHLWAPI)
|
||||||
check_filetools_LDFLAGS = $(QT4_CORE_LDFLAGS)
|
check_filetools_LDFLAGS = $(QT4_CORE_LDFLAGS)
|
||||||
check_filetools_SOURCES = \
|
check_filetools_SOURCES = \
|
||||||
tests/check_filetools.cpp \
|
tests/check_filetools.cpp \
|
||||||
tests/boost.cpp
|
tests/boost.cpp
|
||||||
|
|
||||||
check_lstrings_LDADD = liblyxsupport.a $(INTLLIBS) $(LIBICONV) $(BOOST_LIBS) $(QT4_CORE_LIBS)
|
check_lstrings_LDADD = liblyxsupport.a $(INTLLIBS) $(LIBICONV) $(BOOST_LIBS) $(QT4_CORE_LIBS) $(LIBSHLWAPI)
|
||||||
check_lstrings_LDFLAGS = $(QT4_CORE_LDFLAGS)
|
check_lstrings_LDFLAGS = $(QT4_CORE_LDFLAGS)
|
||||||
check_lstrings_SOURCES = \
|
check_lstrings_SOURCES = \
|
||||||
tests/check_lstrings.cpp \
|
tests/check_lstrings.cpp \
|
||||||
|
@ -11,6 +11,12 @@ using namespace std;
|
|||||||
|
|
||||||
|
|
||||||
namespace lyx {
|
namespace lyx {
|
||||||
|
// Dummy LyXRC support
|
||||||
|
struct LyXRC { string icon_set; } lyxrc;
|
||||||
|
|
||||||
|
// Keep the linker happy on Windows
|
||||||
|
void lyx_exit(int) {}
|
||||||
|
|
||||||
docstring const _(string const & s) { return from_ascii(s); }
|
docstring const _(string const & s) { return from_ascii(s); }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -11,6 +11,12 @@ using namespace lyx::support;
|
|||||||
using namespace std;
|
using namespace std;
|
||||||
|
|
||||||
namespace lyx {
|
namespace lyx {
|
||||||
|
// Dummy LyXRC support
|
||||||
|
struct LyXRC { string icon_set; } lyxrc;
|
||||||
|
|
||||||
|
// Keep the linker happy on Windows
|
||||||
|
void lyx_exit(int) {}
|
||||||
|
|
||||||
docstring const _(string const & s) { return from_ascii(s); }
|
docstring const _(string const & s) { return from_ascii(s); }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -11,6 +11,12 @@ using namespace lyx;
|
|||||||
using namespace std;
|
using namespace std;
|
||||||
|
|
||||||
namespace lyx {
|
namespace lyx {
|
||||||
|
// Dummy LyXRC support
|
||||||
|
struct LyXRC { string icon_set; } lyxrc;
|
||||||
|
|
||||||
|
// Keep the linker happy on Windows
|
||||||
|
void lyx_exit(int) {}
|
||||||
|
|
||||||
docstring const _(string const & s) { return from_ascii(s); }
|
docstring const _(string const & s) { return from_ascii(s); }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user