# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1684148810 -10800
# Node ID 52f0da8834694f75cd8bab01250f19084fe243e1
# Parent  2facccc60523e96be489f38aca402090eeea76c2
Remove Qt5 support, cleanups.

diff -r 2facccc60523 -r 52f0da883469 Makefile
--- a/Makefile	Mon May 15 14:04:33 2023 +0300
+++ b/Makefile	Mon May 15 14:06:50 2023 +0300
@@ -1,32 +1,22 @@
 ###
 ### Configuration settings for Linux and generic UNIX
-### See other Makefile.* files for more options.
+### See other Makefile.gen etc files for more options.
 ###
 
-# Miscellaneous
-ifneq ($(QT6),)
 QT_VERSION_PREFIX = Qt6
 QT_TOOL_PREFIX = /usr/lib/qt6/libexec/
-else
-QT_VERSION_PREFIX = Qt5
-QT_TOOL_PREFIX = /usr/lib/qt5/bin/
-endif
+
 BINTOOL_PREFIX =
-
-PREFIX = /usr/local
 BINPATH = ./
 OBJPATH = obj/unix/
 BINEXT =
 
-QT_MODULES = Core Gui Widgets Sql PrintSupport Network
+# Compiler flags and linker flags
+QT_INCLUDES = -I. \
+	$(shell pkg-config --cflags $(addprefix $(QT_VERSION_PREFIX),$(QT_MODULES)))
 
-# Compiler flags and linker flags
-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
-LDFLAGS += -Wl,-O1
+XCFLAGS += -D_REENTRANT -fPIC
+XLDFLAGS += -Wl,-O1
 
 APP_LIBS += $(shell pkg-config --libs $(addprefix $(QT_VERSION_PREFIX),$(QT_MODULES)))
 APP_DEP_LIBS = 
diff -r 2facccc60523 -r 52f0da883469 Makefile.cross-mingw
--- a/Makefile.cross-mingw	Mon May 15 14:04:33 2023 +0300
+++ b/Makefile.cross-mingw	Mon May 15 14:06:50 2023 +0300
@@ -1,12 +1,17 @@
 ###
 ### For win32 version cross-compilation with MinGW suite @ Linux
 ###
-# Miscellaneous
-QT_VERSION_PREFIX = Qt5
-QT_PREFIX ?= /misc/packages/qt5-src/qtbase
-QT_TOOL_PREFIX = $(QT_PREFIX)/bin/
+
+# Qt version dependant stuff
+QT_VERSION_PREFIX = Qt6
+QT_PREFIX ?= /misc/packages/qt6-build/qtbase
+QT_TOOL_PREFIX ?= /usr/lib/qt6/libexec/
 
-PREFIX =
+QT_INCLUDES = \
+	-I$(QT_PREFIX)/include \
+	$(addprefix -I$(QT_PREFIX)/include/Qt,$(QT_MODULES))
+
+PREFIX ?= win32/
 BINEXT = .exe
 
 
@@ -23,33 +28,25 @@
 OBJPATH ?= ./obj/win32/
 endif
 
-QT_MODULES = Core Gui Widgets Sql PrintSupport Network
 
 # Compiler flags and linker flags
-QT_FLAGS = -DUNICODE -DQT_NEEDS_QMAIN
-QT_INCLUDES = -I. \
-	-I$(QT_PREFIX)/include \
-	$(addprefix -I$(QT_PREFIX)/include/Qt,$(QT_MODULES)) \
-	-I$(QT_MULTIMEDIA)/include \
-	-I$(QT_PREFIX)/mkspecs/win32-g++
-
-CFLAGS += -pipe -fno-keep-inline-dllexport
-CXXFLAGS += -pipe -fno-keep-inline-dllexport -frtti -fexceptions -mthreads
+XCFLAGS += -fno-keep-inline-dllexport -Wno-attributes
+CXXFLAGS += -frtti -fexceptions -mthreads
 LDFLAGS += -Wl,-s -Wl,-subsystem,windows -mthreads
 
-APP_LIBS = -lglu32 -lopengl32 -lgdi32 -luser32 -lmingw32 \
+APP_LIBS += -lglu32 -lopengl32 -lgdi32 -luser32 -lmingw32 \
 	-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_MOC_FLAGS = --include moc_predefs.h
-QT_MOC_RULES = moc_predefs.h
+QT_MOC_FLAGS =
+QT_MOC_RULES =
 QT_UIC_FLAGS =
 
-CLEAN_TARGETS += moc_predefs.h src/winres.rc
+CLEAN_TARGETS += src/winres.rc
 
 include Makefile.gen
diff -r 2facccc60523 -r 52f0da883469 Makefile.gen
--- a/Makefile.gen	Mon May 15 14:04:33 2023 +0300
+++ b/Makefile.gen	Mon May 15 14:06:50 2023 +0300
@@ -1,18 +1,28 @@
+###
+### Generic
+###
+QT_MODULES = Core Gui Widgets Sql PrintSupport Network
+
+QT_FLAGS += -DQT_DEPRECATED_WARNINGS -DQT_NO_DEBUG -DUNICODE \
+	-DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB \
+	-DQT_SQL_LIB -DQT_PRINTSUPPORT_LIB -DQT_NETWORK_LIB
+
+
 ###
 ### Compiler flags
 ###
-CFLAGS += -W -Wall -Wextra
-CXXFLAGS += -W -Wall -Wextra -std=c++17
+XCFLAGS += -g -pipe -W -Wall -Wextra
 
 ifneq ($(ASAN),)
-XCFLAGS = -fsanitize=address
-LDFLAGS += -lasan
+XCFLAGS += -fsanitize=address
+XLDFLAGS += -lasan
 else
-XCFLAGS = -O2
+XCFLAGS += -O2
 endif
 
-CFLAGS += $(XCFLAGS)
-CXXFLAGS += $(XCFLAGS)
+CFLAGS += -std=c11 $(XCFLAGS)
+CXXFLAGS += -std=c++17 $(XCFLAGS)
+LDFLAGS += $(XLDFLAGS)
 
 
 ###
@@ -40,11 +50,6 @@
 ###
 ### Main targets and objects
 ###
-QT_FLAGS += -DQT_DEPRECATED_WARNINGS -DQT_NO_DEBUG \
-	-DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_SQL_LIB \
-	-DQT_CORE_LIB
-
-# Application stuff
 APP_IMG=img/
 APP_BIN=$(BINPATH)Syntilista$(BINEXT)