anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 01:59:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

add frameworks to linker flags for Mac OS X

Browse Source
This commit is contained in:
Stephan Witt 2013-07-18 13:05:50 +02:00
parent a0c241cdcb
commit bb2a75b778
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Makefile.am
View File

@ -675,11 +675,13 @@ TESTS = \
check_PROGRAMS = \
check_layout
if INSTALL_MACOSX
ADD_FRAMEWORKS = -framework QtGui -framework QtCore -framework AppKit -framework ApplicationServices
endif
check_layout_CPPFLAGS = $(AM_CPPFLAGS) -DNO_LAYOUT_CSS
check_layout_LDADD = support/liblyxsupport.a $(LIBICONV) $(BOOST_LIBS) @LIBS@ $(QT4_CORE_LIBS) $(LIBSHLWAPI)
# need to allow multiple definitions of _() (see dummy_functions.cpp)
#check_layout_LDFLAGS = $(QT4_CORE_LDFLAGS) -Wl,--allow-multiple-definition
check_layout_LDFLAGS = $(QT4_CORE_LDFLAGS)
check_layout_LDFLAGS = $(QT4_CORE_LDFLAGS) $(ADD_FRAMEWORKS)
check_layout_SOURCES = \
insets/InsetLayout.cpp \
Color.cpp \

10
src/support/Makefile.am
View File

@ -155,22 +155,26 @@ check_PROGRAMS = \
check_filetools \
check_lstrings
if INSTALL_MACOSX
ADD_FRAMEWORKS = -framework QtGui -framework QtCore -framework AppKit -framework ApplicationServices
endif
check_convert_LDADD = liblyxsupport.a $(LIBICONV) $(BOOST_LIBS) $(QT4_CORE_LIBS) $(LIBSHLWAPI)
check_convert_LDFLAGS = $(QT4_LDFLAGS)
check_convert_LDFLAGS = $(QT4_LDFLAGS) $(ADD_FRAMEWORKS)
check_convert_SOURCES = \
tests/check_convert.cpp \
tests/dummy_functions.cpp \
tests/boost.cpp
check_filetools_LDADD = liblyxsupport.a $(LIBICONV) $(BOOST_LIBS) $(QT4_CORE_LIBS) $(LIBSHLWAPI)
check_filetools_LDFLAGS = $(QT4_CORE_LDFLAGS)
check_filetools_LDFLAGS = $(QT4_CORE_LDFLAGS) $(ADD_FRAMEWORKS)
check_filetools_SOURCES = \
tests/check_filetools.cpp \
tests/dummy_functions.cpp \
tests/boost.cpp
check_lstrings_LDADD = liblyxsupport.a $(LIBICONV) $(BOOST_LIBS) $(QT4_CORE_LIBS) $(LIBSHLWAPI)
check_lstrings_LDFLAGS = $(QT4_CORE_LDFLAGS)
check_lstrings_LDFLAGS = $(QT4_CORE_LDFLAGS) $(ADD_FRAMEWORKS)
check_lstrings_SOURCES = \
tests/check_lstrings.cpp \
tests/dummy_functions.cpp \