diff options
| author | Bent Bisballe Nyeng <deva@aasimon.org> | 2018-03-21 20:46:24 +0100 |
|---|---|---|
| committer | Bent Bisballe Nyeng <deva@aasimon.org> | 2018-03-21 20:46:24 +0100 |
| commit | e21e14223b6d87b29221b29488d1b09895912527 (patch) | |
| tree | 99237cc38c806f6ca8f5460dfa9a721e0bfece1c | |
| parent | 81cdd02735b4cd43f5f45419624ba3d062241b57 (diff) | |
DGEdit is now officially a Qt5 project.
| -rw-r--r-- | configure.ac | 17 | ||||
| -rw-r--r-- | src/Makefile.am | 7 |
2 files changed, 13 insertions, 11 deletions
diff --git a/configure.ac b/configure.ac index b7bec5b..e67dad1 100644 --- a/configure.ac +++ b/configure.ac @@ -27,26 +27,27 @@ if test x$with_debug == xyes; then AC_MSG_WARN([*** Building with debug support!]) CXXFLAGS="$CXXFLAGS -Wall -Werror -g" HUGIN_PARM="" -fi +fi CXXFLAGS="$CXXFLAGS $HUGIN_PARM" dnl ====================== dnl Check for Qt dnl ====================== -PKG_CHECK_MODULES(QT, QtCore QtGui QtXml >= 4.5) -AC_CHECK_PROGS(QT_MOC, [moc4 moc-qt4 moc], []) -AC_CHECK_PROGS(QT_RCC, [rcc4 rcc-qt4 rcc], []) -AC_CHECK_PROGS(QT_UIC, [uic4 uic-qt4 uic], []) +PKG_CHECK_MODULES(QT, Qt5Widgets Qt5Core Qt5Gui Qt5Xml >= 5.0) +AC_CHECK_PROGS(QT_MOC, [moc5 moc-qt5 moc], []) +AC_CHECK_PROGS(QT_RCC, [rcc5 rcc-qt5 rcc], []) +AC_CHECK_PROGS(QT_UIC, [uic5 uic-qt5 uic], []) if (test "$QT_MOC" = ""); then - AC_MSG_ERROR([QT4 moc is required.]) + AC_MSG_ERROR([QT5 moc is required.]) fi if (test "$QT_RCC" = ""); then - AC_MSG_ERROR([QT4 rcc is required.]) + AC_MSG_ERROR([QT5 rcc is required.]) fi if (test "$QT_UIC" = ""); then - AC_MSG_ERROR([QT4 uic is required.]) + AC_MSG_ERROR([QT5 uic is required.]) fi +CXXFLAGS="$CXXFLAGS -fPIC" dnl ====================== dnl Check for libao diff --git a/src/Makefile.am b/src/Makefile.am index 734152c..b7fb48d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,7 +1,9 @@ +#export QT_SELECT=qt5 + bin_PROGRAMS = dgedit dgedit_LDADD = $(SNDFILE_LIBS) $(QT_LIBS) $(AO_LIBS) \ - $(shell ../tools/MocList o ) qrc_dgedit.o + $(shell ../tools/MocList o ) qrc_dgedit.o dgedit_CXXFLAGS = $(SNDFILE_CXXFLAGS) $(QT_CFLAGS) $(AO_CFLAGS) AM_CXXFLAGS = $(QT_CFLAGS) @@ -57,7 +59,7 @@ qrc_%.cc: %.qrc rcc $< > $@ %.moc.cc: %.h - $(QT_MOC) -o $@ $< + QT_SELECT=qt5 $(QT_MOC) -o $@ $< # # ui files not used in this project... @@ -70,4 +72,3 @@ qrc_%.cc: %.qrc # command for creating .res file from .rc on Win32 %.res: %.rc rc $< - |