Merge branch fix-includes to develop.

.clang-format

@@ -62,6 +62,44 @@ SpaceBeforeParens: ControlStatements
 SpaceBeforeRangeBasedForLoopColon: true
 
 # other
-SortIncludes: true
 SortUsingDeclarations: false
 FixNamespaceComments: true
+
+# includes structure:
+#  optinal main include, may be local (use full path if possible)
+#  local includes (avoid if possible)
+#  includes from private libraries or impl includes from libraries (TODO: cleanup)
+#  includes from public libraries
+#  common includes (TODO: cleanup)
+#  third-party libraries
+#  qt/boost includes
+#  system includes
+#  std includes
+SortIncludes: true
+IncludeBlocks: Regroup
+IncludeIsMainRegex: '$'
+IncludeCategories:
+  # qt/boost
+  - Regex: '<(Qt|boost/).+>'
+    Priority: 6
+  # third-party includes
+  - Regex: '"3rdparty/.+"'
+    Priority: 5
+  # common includes
+  - Regex: '"(api_dynamic|byteorder|contract|error|error_tools|lazy|make_ptr|pointers|source_location|static_string|string_type|string_view|types)\.h"'
+    Priority: 4
+  # public libraries
+  - Regex: '"(analysis|async|binary(/compression)?|core|debug|devices|formats|io|l10n|math|module|parameters|platform(/(application|version))?|resource|sound|strings|time|tools)/[^/]+\.h"'
+    Priority: 3
+  # private libraries/impl includes
+  - Regex: '"(analysis|async|binary|core|debug|devices|formats|io|l10n|math|module|parameters|platform|resource|sound|strings|time|tools)/[^.]+\.h|zxtune.h"'
+    Priority: 2
+  # local includes or local libraries
+  - Regex: '".+\.h"'
+    Priority: 1
+  # std includes
+  - Regex: '<[_a-z0-9]+>'
+    Priority: 8
+  # system includes
+  - Regex: '<[/_a-z0-9]+\.h>'
+    Priority: 7

3rdparty/FLAC/Makefile

@@ -11,7 +11,7 @@ endif
 dirs.root := ../..
 include $(dirs.root)/make/default.mak 
 
-defines += FLAC__NO_ASM PACKAGE_VERSION=\"1.3.3\" FLAC__HAS_OGG=0 HAVE_LROUND
+defines += FLAC__NO_ASM PACKAGE_VERSION=\"1.3.3\" FLAC__HAS_OGG=0 HAVE_LROUND HAVE_STDINT_H
 defines.mingw = HAVE_FSEEKO
 defines.linux = HAVE_FSEEKO
 

3rdparty/gme/Makefile

@@ -36,4 +36,6 @@ source_files += $(addprefix gme/,Kss_Emu.cpp Kss_Core.cpp Kss_Cpu.cpp Kss_Scc_Ap
 source_files += $(addprefix gme/,Resampler.cpp Fir_Resampler.cpp Dual_Resampler.cpp \
                  )
 
+defines += HAVE_STDINT_H
+
 include $(dirs.root)/makefile.mak

3rdparty/mgba/Makefile

@@ -1,6 +1,5 @@
 library_name := mgba
 dirs.root := ../..
-include defines.mak
 
 source_files += $(addprefix arm/,arm decoder-arm decoder-thumb isa-arm isa-thumb) \
                 $(addprefix core/,cheats config core interface sync tile-cache timing) \
@@ -15,6 +14,8 @@ source_files += platform/portable/memory
 
 source_files := $(addprefix src/,$(addsuffix .c,$(source_files)))
 
+defines.linux += HAVE_LOCALTIME_R
+includes.dirs += $(dirs.root)/3rdparty/mgba/include $(dirs.root)/3rdparty/mgba/src
 includes.files += defines.h
 
 include $(dirs.root)/makefile.mak

3rdparty/vgm/Makefile

@@ -50,4 +50,6 @@ source_files := $(addsuffix .c,$(source_files))
 
 source_files += $(addprefix player/,playerbase.cpp s98player.cpp vgmplayer.cpp vgmplayer_cmdhandler.cpp helper.c dblk_compr.c)
 
+defines += HAVE_STDINT_H
+
 include $(dirs.root)/makefile.mak

apps/benchmark/android/benchmark/src/main/jni/main.cpp

@@ -8,15 +8,14 @@
  *
  **/
 
-// local includes
 #include "apps/benchmark/core/benchmark.h"
-// std includes
-#include <cmath>
-#include <sstream>
-// system includes
+
 #include <android/log.h>
 #include <jni.h>
 
+#include <cmath>
+#include <sstream>
+
 namespace
 {
   void Debug(const char* msg)

apps/benchmark/core/ay.cpp

@@ -8,13 +8,12 @@
  *
  **/
 
-// local includes
 #include "ay.h"
-// common includes
-#include <make_ptr.h>
-// library includes
-#include <sound/matrix_mixer.h>
-#include <time/timer.h>
+
+#include "sound/matrix_mixer.h"
+#include "time/timer.h"
+
+#include "make_ptr.h"
 
 namespace
 {

apps/benchmark/core/ay.h

@@ -10,9 +10,9 @@
 
 #pragma once
 
-// library includes
-#include <devices/aym/chip.h>
-#include <time/duration.h>
+#include "devices/aym/chip.h"
+
+#include "time/duration.h"
 
 namespace Benchmark::AY
 {

apps/benchmark/core/benchmark.cpp

@@ -8,17 +8,17 @@
  *
  **/
 
-// local includes
 #include "benchmark.h"
+
 #include "ay.h"
 #include "mixer.h"
 #include "z80.h"
-// common includes
-#include <contract.h>
-#include <make_ptr.h>
-// library includes
-#include <binary/dump.h>
-#include <strings/format.h>
+
+#include "binary/dump.h"
+#include "strings/format.h"
+
+#include "contract.h"
+#include "make_ptr.h"
 
 namespace Benchmark
 {

apps/benchmark/core/benchmark.h

@@ -13,7 +13,6 @@
 
 #pragma once
 
-// std includes
 #include <string>
 
 namespace Benchmark

apps/benchmark/core/mixer.cpp

@@ -8,11 +8,10 @@
  *
  **/
 
-// local includes
 #include "mixer.h"
-// library includes
-#include <sound/matrix_mixer.h>
-#include <time/timer.h>
+
+#include "sound/matrix_mixer.h"
+#include "time/timer.h"
 
 namespace Benchmark::Mixer
 {

apps/benchmark/core/mixer.h

@@ -10,8 +10,7 @@
 
 #pragma once
 
-// library includes
-#include <time/duration.h>
+#include "time/duration.h"
 
 namespace Benchmark::Mixer
 {

apps/benchmark/core/z80.cpp

@@ -8,12 +8,11 @@
  *
  **/
 
-// local includes
 #include "z80.h"
-// common includes
-#include <make_ptr.h>
-// library includes
-#include <time/timer.h>
+
+#include "time/timer.h"
+
+#include "make_ptr.h"
 
 namespace
 {

apps/benchmark/core/z80.h

@@ -10,9 +10,8 @@
 
 #pragma once
 
-// library includes
-#include <devices/z80.h>
-#include <time/duration.h>
+#include "devices/z80.h"
+#include "time/duration.h"
 
 namespace Benchmark::Z80
 {

apps/benchmark/main.cpp

@@ -9,6 +9,7 @@
  **/
 
 #include "core/benchmark.h"
+
 #include <iostream>
 
 namespace