From d3ab2e231e6ef610497e4a5765f64b4f80da212c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tam=C3=A1s=20B=C3=A1lint=20Misius?= <lbphacker@gmail.com>
Date: Sun, 25 Dec 2022 11:03:29 +0100
Subject: [PATCH] Merge data/ into resources/

---
 data/meson.build                   |   1 -
 fonttool.py                        |   2 +-
 meson.build                        |   5 ++---
 {data => resources}/ToArray.cpp    |   0
 {data => resources}/font.bz2       | Bin
 resources/meson.build              |   1 +
 {data => src/gui/game}/IntroText.h |   0
 7 files changed, 4 insertions(+), 5 deletions(-)
 delete mode 100644 data/meson.build
 rename {data => resources}/ToArray.cpp (100%)
 rename {data => resources}/font.bz2 (100%)
 rename {data => src/gui/game}/IntroText.h (100%)

diff --git a/data/meson.build b/data/meson.build
deleted file mode 100644
index a089c85fb..000000000
--- a/data/meson.build
+++ /dev/null
@@ -1 +0,0 @@
-data_files += to_array.process('font.bz2', extra_args: 'compressed_font_data')
diff --git a/fonttool.py b/fonttool.py
index 09994e31d..460cae7ea 100755
--- a/fonttool.py
+++ b/fonttool.py
@@ -6,7 +6,7 @@ import re
 import argparse
 
 CP_MAX = 0x10FFFF
-FONT_CPP = "data/font.bz2"
+FONT_CPP = "resources/font.bz2"
 FONT_HEIGHT = 12
 
 
diff --git a/meson.build b/meson.build
index 610a7467b..513351ee2 100644
--- a/meson.build
+++ b/meson.build
@@ -19,7 +19,7 @@ if get_option('prepare')
 endif
 
 to_array = generator(
-	executable('toarray', sources: 'data/ToArray.cpp', native: true),
+	executable('toarray', sources: 'resources/ToArray.cpp', native: true),
 	output: [ '@PLAINNAME@.cpp', '@PLAINNAME@.h' ],
 	arguments: [ '@OUTPUT0@', '@OUTPUT1@', '@INPUT@', '@EXTRA_ARGS@' ]
 )
@@ -304,7 +304,7 @@ if host_platform == 'windows'
 	endif
 endif
 
-project_inc = include_directories([ 'src', 'data', 'resources' ])
+project_inc = include_directories([ 'src', 'resources' ])
 
 if host_platform == 'windows'
 	ident_platform = is_64bit ? 'WIN64' : 'WIN32'
@@ -356,7 +356,6 @@ endif
 data_files = []
 
 subdir('src')
-subdir('data')
 subdir('resources')
 
 powder_files += data_files
diff --git a/data/ToArray.cpp b/resources/ToArray.cpp
similarity index 100%
rename from data/ToArray.cpp
rename to resources/ToArray.cpp
diff --git a/data/font.bz2 b/resources/font.bz2
similarity index 100%
rename from data/font.bz2
rename to resources/font.bz2
diff --git a/resources/meson.build b/resources/meson.build
index 645ce3340..48dd45de3 100644
--- a/resources/meson.build
+++ b/resources/meson.build
@@ -87,3 +87,4 @@ endif
 
 data_files += to_array.process('save_local.png', extra_args: 'save_local_png')
 data_files += to_array.process('save_online.png', extra_args: 'save_online_png')
+data_files += to_array.process('font.bz2', extra_args: 'compressed_font_data')
diff --git a/data/IntroText.h b/src/gui/game/IntroText.h
similarity index 100%
rename from data/IntroText.h
rename to src/gui/game/IntroText.h