Mercurial > octave-nkf
comparison libgui/src/module.mk @ 18503:554be77a60fb gui-release
build: Add FT2_CFLAGS to CPPFLAGS required for new Qt graphics.
* libgui/graphics/module.mk: Add FT2_CFLAGS to
graphics_libgui_graphics_la_CPPFLAGS.
* libgui/src/module.mk: Add FT2_CFLAGS to src_libgui_src_la_CPPFLAGS.
author | Rik <rik@octave.org> |
---|---|
date | Thu, 20 Feb 2014 14:08:14 -0800 |
parents | 2e7cad6f180c |
children | 086093fbdc1a |
comparison
equal
deleted
inserted
replaced
18501:523878f76518 | 18503:554be77a60fb |
---|---|
171 | 171 |
172 nodist_src_libgui_src_la_SOURCES = $(octave_gui_MOC) $(octave_gui_RC) | 172 nodist_src_libgui_src_la_SOURCES = $(octave_gui_MOC) $(octave_gui_RC) |
173 | 173 |
174 src_libgui_src_la_CPPFLAGS = \ | 174 src_libgui_src_la_CPPFLAGS = \ |
175 $(AM_CPPFLAGS) \ | 175 $(AM_CPPFLAGS) \ |
176 $(FT2_CFLAGS) \ | |
176 $(FONTCONFIG_CPPFLAGS) \ | 177 $(FONTCONFIG_CPPFLAGS) \ |
177 @OCTGUI_DLL_DEFS@ \ | 178 @OCTGUI_DLL_DEFS@ \ |
178 @QT_CPPFLAGS@ \ | 179 @QT_CPPFLAGS@ \ |
179 -I$(srcdir)/qterminal/libqterminal \ | 180 -I$(srcdir)/qterminal/libqterminal \ |
180 -Isrc -I$(srcdir)/src \ | 181 -Isrc -I$(srcdir)/src \ |