Mercurial > octave-nkf

comparison libgui/src/Makefile.am @ 15257:7ee62f559a73

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix compilation under Windows with GUI and LLVM enabled. * configure.ac (OCTGUI_DLL_DEFS): New substituted variabled. Define it to -DOCTGUI_DLL under MinGW and MSVC platforms. (QT_INCDIR, QT_LIBDIR): Replace backslash with forward slash characters. (OCTGUI_API): New config.h macro. * src/Makefile.am (MOC_CPPFLAGS): New variable. Define it to -DWIN32 when compiling Win32 terminal implementation. (moc-%.cc rule): Use it. (libqterminal_la_CPPFLAGS): New variable defined to -DWIN32 when compiling the win32 terminal implementation. (liboctgui_la_CPPFLAGS): Add @OCTGUI_DLL_DEFS@. * libgui/src/m-editor/file-editor-tab.cc (QApplication, QFileDialog, QTextStream): New includes. * libgui/src/m-editor/find-dialog.cc (find_dialog::search_next): Temporary fix for compilation with QScintilla < 2.6. * libgui/src/main-window.cc (QApplication, QLabel): New includes. * libgui/src/octave-gui.h (octave_start_gui): Decorate with OCTGUI_API.
author Michael Goffioul <michael.goffioul@gmail.com>
date Thu, 30 Aug 2012 15:52:44 +0100
parents 26115efd6592
children 648dabbb4c6b
comparison
equal deleted inserted replaced
15256:79baa37fde7a 15257:7ee62f559a73
23 QT_LIBDIR = @QT_LIBDIR@ 23 QT_LIBDIR = @QT_LIBDIR@
24 24
25 QT_LIBS = -lQtCore -lQtGui -lQtNetwork -lqscintilla2 25 QT_LIBS = -lQtCore -lQtGui -lQtNetwork -lqscintilla2
26 26
27 QT_LDFLAGS = -L$(QT_LIBDIR) 27 QT_LDFLAGS = -L$(QT_LIBDIR)
28
29 MOC_CPPFLAGS =
28 30
29 SRCDIRS = \ 31 SRCDIRS = \
30 m-editor \ 32 m-editor \
31 qtinfo \ 33 qtinfo \
32 octave-adapter \ 34 octave-adapter \
90 workspace-view.cc 92 workspace-view.cc
91 93
92 nodist_liboctgui_la_SOURCES = $(octave_gui_MOC) $(octave_gui_RC) 94 nodist_liboctgui_la_SOURCES = $(octave_gui_MOC) $(octave_gui_RC)
93 95
94 liboctgui_la_CPPFLAGS = \ 96 liboctgui_la_CPPFLAGS = \
97 @OCTGUI_DLL_DEFS@ \
95 -I$(QT_INCDIR) \ 98 -I$(QT_INCDIR) \
96 -I$(QT_INCDIR)/QtCore \ 99 -I$(QT_INCDIR)/QtCore \
97 -I$(QT_INCDIR)/QtGui \ 100 -I$(QT_INCDIR)/QtGui \
98 -I$(QT_INCDIR)/QtNetwork \ 101 -I$(QT_INCDIR)/QtNetwork \
99 -I$(srcdir)/../qterminal/libqterminal \ 102 -I$(srcdir)/../qterminal/libqterminal \
261 libqterminal_la_SOURCES = \ 264 libqterminal_la_SOURCES = \
262 ../qterminal/libqterminal/win32/QTerminalColors.cpp \ 265 ../qterminal/libqterminal/win32/QTerminalColors.cpp \
263 ../qterminal/libqterminal/win32/QWinTerminalImpl.cpp 266 ../qterminal/libqterminal/win32/QWinTerminalImpl.cpp
264 267
265 libqterminal_la_MOC += ../qterminal/libqterminal/win32/moc-QWinTerminalImpl.cc 268 libqterminal_la_MOC += ../qterminal/libqterminal/win32/moc-QWinTerminalImpl.cc
269 libqterminal_la_CPPFLAGS += -DUNICODE
270
271 # This flag is required to let MOC know about Q_OS_WIN32.
272 MOC_CPPFLAGS += -DWIN32
266 273
267 else 274 else
268 275
269 libqterminal_la_SOURCES = \ 276 libqterminal_la_SOURCES = \
270 ../qterminal/libqterminal/unix/BlockArray.cpp \ 277 ../qterminal/libqterminal/unix/BlockArray.cpp \
295 302
296 endif 303 endif
297 304
298 moc-%.cc: %.h 305 moc-%.cc: %.h
299 test -d $(@D) || mkdir -p $(@D) 306 test -d $(@D) || mkdir -p $(@D)
300 @MOC@ -o$@ $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liboctgui_la_CPPFLAGS) $< 307 @MOC@ -o$@ $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(MOC_CPPFLAGS) $(liboctgui_la_CPPFLAGS) $<
301 308
302 ui-%.h: %.ui 309 ui-%.h: %.ui
303 @UIC@ -o $@ $< 310 @UIC@ -o $@ $<
304 311
305 qrc-%.cc: %.qrc 312 qrc-%.cc: %.qrc