# HG changeset patch # User Matti Hamalainen # Date 1683619168 -10800 # Node ID 0562e7b181b147a16547b9ff796b6ee3a7f3de58 # Parent 2b5d4b6884dc695d6cdc821a61613ae2e1efcfd7 Rename Makefile variable QT5_* to QT_*. diff -r 2b5d4b6884dc -r 0562e7b181b1 Makefile --- a/Makefile Tue May 09 10:56:57 2023 +0300 +++ b/Makefile Tue May 09 10:59:28 2023 +0300 @@ -6,8 +6,8 @@ # Miscellaneous -QT5_MODULES = Core Gui Widgets Sql PrintSupport -QT5_PREFIX = +QT_MODULES = Core Gui Widgets Sql PrintSupport +QT_PREFIX = BINTOOL_PREFIX = PREFIX = /usr/local @@ -17,17 +17,17 @@ # Compiler flags and linker flags ifeq ($(USE_QTHTTP),yes) -QT5_MODULES += Network +QT_MODULES += Network DEFINES += -DUSE_QTHTTP endif DEFINES += -INCPATH = -I. $(shell pkg-config --cflags $(addprefix Qt5,$(QT5_MODULES))) +INCPATH = -I. $(shell pkg-config --cflags $(addprefix Qt5,$(QT_MODULES))) CFLAGS += -pipe -D_REENTRANT -fPIC CXXFLAGS += -pipe -D_REENTRANT -fPIC LDFLAGS += -Wl,-O1 -APP_LIBS += $(shell pkg-config --libs $(addprefix Qt5,$(QT5_MODULES))) +APP_LIBS += $(shell pkg-config --libs $(addprefix Qt5,$(QT_MODULES))) APP_DEP_LIBS = APP_DEPS = diff -r 2b5d4b6884dc -r 0562e7b181b1 Makefile.cross-mingw --- a/Makefile.cross-mingw Tue May 09 10:56:57 2023 +0300 +++ b/Makefile.cross-mingw Tue May 09 10:59:28 2023 +0300 @@ -2,9 +2,9 @@ ### For win32 version cross-compilation with MinGW suite @ Linux ### # Miscellaneous -QT5_MODULES = Core Gui Widgets Sql PrintSupport -QT5_PREFIX ?= /misc/packages/qt5-src -QT5_BASE ?= $(QT5_PREFIX)/qtbase +QT_MODULES = Core Gui Widgets Sql PrintSupport +QT_PREFIX ?= /misc/packages/qt5-src +QT_BASE ?= $(QT5_PREFIX)/qtbase USE_QTHTTP ?= yes @@ -29,35 +29,35 @@ # Compiler flags and linker flags DEFINES = -DUNICODE -DQT_NEEDS_QMAIN ifeq ($(USE_QTHTTP),yes) -QT5_MODULES += Network +QT_MODULES += Network DEFINES += -DUSE_QTHTTP endif INCPATH = -I. \ - -I$(QT5_BASE)/include \ - $(addprefix -I$(QT5_BASE)/include/Qt,$(QT5_MODULES)) \ - -I$(QT5_MULTIMEDIA)/include \ - -I$(QT5_BASE)/mkspecs/win32-g++ + -I$(QT_BASE)/include \ + $(addprefix -I$(QT_BASE)/include/Qt,$(QT5_MODULES)) \ + -I$(QT_MULTIMEDIA)/include \ + -I$(QT_BASE)/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$(QT5_BASE)/lib \ - $(QT5_BASE)/lib/libqtmain.a \ - $(addsuffix .a,$(addprefix $(QT5_BASE)/lib/libQt5,$(QT5_MODULES))) + -L$(QT_BASE)/lib \ + $(QT_BASE)/lib/libqtmain.a \ + $(addsuffix .a,$(addprefix $(QT_BASE)/lib/libQt5,$(QT5_MODULES))) APP_DEP_LIBS = $(OBJPATH)winres.o APP_DEPS = # Qt tools -QT_RCC = $(QT5_BASE)/bin/rcc +QT_RCC = $(QT_BASE)/bin/rcc -QT_MOC = $(QT5_BASE)/bin/moc +QT_MOC = $(QT_BASE)/bin/moc QT_MOC_FLAGS = --include moc_predefs.h QT_MOC_RULES = moc_predefs.h -QT_UIC = $(QT5_BASE)/bin/uic +QT_UIC = $(QT_BASE)/bin/uic QT_UIC_FLAGS = CLEAN_TARGETS += moc_predefs.h src/winres.rc