Mercurial > hg > syntilista

changeset 299:3dc88d3814b3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename some Makefile variables.
author Matti Hamalainen <ccr@tnsp.org>
date Thu, 11 May 2023 13:07:05 +0300
parents 02d2dec01f0f
children 3cca82bced54
files Makefile Makefile.cross-mingw Makefile.gen
diffstat 3 files changed, 11 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Wed May 10 14:19:32 2023 +0300
+++ b/Makefile	Thu May 11 13:07:05 2023 +0300
@@ -25,10 +25,10 @@
 # Compiler flags and linker flags
 ifeq ($(USE_QTHTTP),yes)
 QT_MODULES += Network
-DEFINES += -DUSE_QTHTTP
+QT_FLAGS += -DUSE_QTHTTP
 endif
-DEFINES += 
-INCPATH = -I. $(shell pkg-config --cflags $(addprefix $(QT_VERSION_PREFIX),$(QT_MODULES)))
+QT_FLAGS += 
+QT_INCLUDES = -I. $(shell pkg-config --cflags $(addprefix $(QT_VERSION_PREFIX),$(QT_MODULES)))
 
 CFLAGS += -pipe -D_REENTRANT -fPIC
 CXXFLAGS += -pipe -D_REENTRANT -fPIC
--- a/Makefile.cross-mingw	Wed May 10 14:19:32 2023 +0300
+++ b/Makefile.cross-mingw	Thu May 11 13:07:05 2023 +0300
@@ -28,12 +28,12 @@
 QT_MODULES = Core Gui Widgets Sql PrintSupport
 
 # Compiler flags and linker flags
-DEFINES = -DUNICODE -DQT_NEEDS_QMAIN
+QT_FLAGS = -DUNICODE -DQT_NEEDS_QMAIN
 ifeq ($(USE_QTHTTP),yes)
 QT_MODULES += Network
-DEFINES += -DUSE_QTHTTP
+QT_FLAGS += -DUSE_QTHTTP
 endif
-INCPATH = -I. \
+QT_INCLUDES = -I. \
 	-I$(QT_PREFIX)/include \
 	$(addprefix -I$(QT_PREFIX)/include/Qt,$(QT_MODULES)) \
 	-I$(QT_MULTIMEDIA)/include \
--- a/Makefile.gen	Wed May 10 14:19:32 2023 +0300
+++ b/Makefile.gen	Thu May 11 13:07:05 2023 +0300
@@ -40,7 +40,7 @@
 ###
 ### Main targets and objects
 ###
-DEFINES += -DQT_DEPRECATED_WARNINGS -DQT_NO_DEBUG \
+QT_FLAGS += -DQT_DEPRECATED_WARNINGS -DQT_NO_DEBUG \
 	-DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_SQL_LIB \
 	-DQT_CORE_LIB
 
@@ -140,17 +140,17 @@
 	@$(call DO_CMD,CXX,$@,$(CXX) $(CXXFLAGS) -dM -E -o $@ $(OBJPATH)dummy.cpp)
 
 moc_%.cpp: %.h $(QT_MOC_RULES)
-	@$(call DO_CMD,$(QT_VERSION_PREFIX):MOC,$@ $<,$(QT_MOC) $(DEFINES) $(QT_MOC_FLAGS) $(INCPATH) $< -o $@)
+	@$(call DO_CMD,$(QT_VERSION_PREFIX):MOC,$@ $<,$(QT_MOC) $(QT_FLAGS) $(QT_MOC_FLAGS) $(QT_INCLUDES) $< -o $@)
 
 ui_%.h: %.ui
 	@$(call DO_CMD,$(QT_VERSION_PREFIX):UIC,$@ $<,$(QT_UIC) $(QT_UIC_FLAGS) $< -o $@)
 
 
 $(OBJPATH)%.o: src/%.cpp src/%.h
-	$(call COMPILE_CXX_OBJ, $(DEFINES) $(INCPATH))
+	$(call COMPILE_CXX_OBJ, $(QT_FLAGS) $(QT_INCLUDES))
 
 $(OBJPATH)%.o: src/%.cpp
-	$(call COMPILE_CXX_OBJ, $(DEFINES) $(INCPATH))
+	$(call COMPILE_CXX_OBJ, $(QT_FLAGS) $(QT_INCLUDES))
 
 
 ###
@@ -187,7 +187,7 @@
 	@$(call DO_CMD,$(QT_VERSION_PREFIX):RCC,$@ $<,$(QT_RCC) -name "Syntilista" $< -o $@)
 
 $(OBJPATH)main.o: src/main.cpp $(APP_HDRS) VERSION
-	$(call COMPILE_CXX_OBJ, $(DEFINES) $(INCPATH))
+	$(call COMPILE_CXX_OBJ, $(QT_FLAGS) $(QT_INCLUDES))
 
 $(APP_BIN): $(addprefix $(OBJPATH),$(APP_OBJS)) $(APP_DEP_LIBS) | $(APP_DEPS)
 	$(call LINK_CXX_BIN, $(APP_LIBS))