Merge data/ into resources/

data/meson.build

@@ -1 +0,0 @@
-data_files += to_array.process('font.bz2', extra_args: 'compressed_font_data')

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
 
 

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

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')