Mercurial > hg > syntilista
changeset 290:755fe3f8c08f
Minor build system cleanups in preparation for Qt6 support.
author | Matti Hamalainen <ccr@tnsp.org> |
---|---|
date | Tue, 09 May 2023 12:04:24 +0300 |
parents | 00a6cbdd3281 |
children | bc6767398eec |
files | Makefile Makefile.cross-mingw Makefile.gen |
diffstat | 3 files changed, 19 insertions(+), 21 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile Tue May 09 11:44:58 2023 +0300 +++ b/Makefile Tue May 09 12:04:24 2023 +0300 @@ -7,8 +7,7 @@ # Miscellaneous QT_VERSION_PREFIX = Qt5 -QT_MODULES = Core Gui Widgets Sql PrintSupport -QT_PREFIX = +QT_TOOL_PREFIX = /usr/lib/qt5/bin/ BINTOOL_PREFIX = PREFIX = /usr/local @@ -16,6 +15,8 @@ OBJPATH = obj/unix/ BINEXT = +QT_MODULES = Core Gui Widgets Sql PrintSupport + # Compiler flags and linker flags ifeq ($(USE_QTHTTP),yes) QT_MODULES += Network @@ -33,12 +34,8 @@ APP_DEPS = # Qt tools -QT_RCC = rcc - -QT_MOC = moc QT_MOC_FLAGS = - -QT_UIC = uic +QT_MOC_RULES = QT_UIC_FLAGS = include Makefile.gen
--- a/Makefile.cross-mingw Tue May 09 11:44:58 2023 +0300 +++ b/Makefile.cross-mingw Tue May 09 12:04:24 2023 +0300 @@ -2,9 +2,9 @@ ### For win32 version cross-compilation with MinGW suite @ Linux ### # Miscellaneous -QT_MODULES = Core Gui Widgets Sql PrintSupport -QT_PREFIX ?= /misc/packages/qt5-src -QT_BASE ?= $(QT5_PREFIX)/qtbase +QT_VERSION_PREFIX = Qt5 +QT_PREFIX ?= /misc/packages/qt5-src/qtbase +QT_TOOL_PREFIX = $(QT_PREFIX)/bin/ USE_QTHTTP ?= yes @@ -25,6 +25,7 @@ OBJPATH ?= ./obj/win32/ endif +QT_MODULES = Core Gui Widgets Sql PrintSupport # Compiler flags and linker flags DEFINES = -DUNICODE -DQT_NEEDS_QMAIN @@ -33,31 +34,26 @@ DEFINES += -DUSE_QTHTTP endif INCPATH = -I. \ - -I$(QT_BASE)/include \ - $(addprefix -I$(QT_BASE)/include/Qt,$(QT5_MODULES)) \ + -I$(QT_PREFIX)/include \ + $(addprefix -I$(QT_PREFIX)/include/Qt,$(QT_MODULES)) \ -I$(QT_MULTIMEDIA)/include \ - -I$(QT_BASE)/mkspecs/win32-g++ + -I$(QT_PREFIX)/mkspecs/win32-g++ CFLAGS += -pipe -fno-keep-inline-dllexport CXXFLAGS += -pipe -fno-keep-inline-dllexport -frtti -fexceptions -mthreads LDFLAGS += -Wl,-s -Wl,-subsystem,windows -mthreads APP_LIBS = -lglu32 -lopengl32 -lgdi32 -luser32 -lmingw32 \ - -L$(QT_BASE)/lib \ - $(QT_BASE)/lib/libqtmain.a \ - $(addsuffix .a,$(addprefix $(QT_BASE)/lib/libQt5,$(QT5_MODULES))) + -L$(QT_PREFIX)/lib \ + $(QT_PREFIX)/lib/libqtmain.a \ + $(addsuffix .a,$(addprefix $(QT_PREFIX)/lib/lib$(QT_VERSION_PREFIX),$(QT_MODULES))) APP_DEP_LIBS = $(OBJPATH)winres.o APP_DEPS = # Qt tools -QT_RCC = $(QT_BASE)/bin/rcc - -QT_MOC = $(QT_BASE)/bin/moc QT_MOC_FLAGS = --include moc_predefs.h QT_MOC_RULES = moc_predefs.h - -QT_UIC = $(QT_BASE)/bin/uic QT_UIC_FLAGS = CLEAN_TARGETS += moc_predefs.h src/winres.rc