From b1c7450f7360648fb0be0dbe87f375cebe83d508 Mon Sep 17 00:00:00 2001 From: Enrico Forestieri Date: Sun, 27 Mar 2011 23:47:58 +0000 Subject: [PATCH] Fix make check git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38088 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/support/Makefile.am | 6 +++--- src/support/tests/check_convert.cpp | 6 ++++++ src/support/tests/check_filetools.cpp | 6 ++++++ src/support/tests/check_lstrings.cpp | 6 ++++++ 4 files changed, 21 insertions(+), 3 deletions(-) diff --git a/src/support/Makefile.am b/src/support/Makefile.am index 453ef26bdf..f0819cf146 100644 --- a/src/support/Makefile.am +++ b/src/support/Makefile.am @@ -149,19 +149,19 @@ check_PROGRAMS = \ check_filetools \ 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_SOURCES = \ tests/check_convert.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_SOURCES = \ tests/check_filetools.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_SOURCES = \ tests/check_lstrings.cpp \ diff --git a/src/support/tests/check_convert.cpp b/src/support/tests/check_convert.cpp index b6fd166827..30ea647250 100644 --- a/src/support/tests/check_convert.cpp +++ b/src/support/tests/check_convert.cpp @@ -11,6 +11,12 @@ using namespace std; 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); } } diff --git a/src/support/tests/check_filetools.cpp b/src/support/tests/check_filetools.cpp index 07fcc759aa..7da548abd7 100644 --- a/src/support/tests/check_filetools.cpp +++ b/src/support/tests/check_filetools.cpp @@ -11,6 +11,12 @@ using namespace lyx::support; using namespace std; 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); } } diff --git a/src/support/tests/check_lstrings.cpp b/src/support/tests/check_lstrings.cpp index 90bf967885..8a4aea84fd 100644 --- a/src/support/tests/check_lstrings.cpp +++ b/src/support/tests/check_lstrings.cpp @@ -11,6 +11,12 @@ using namespace lyx; using namespace std; 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); } } -- 2.39.2