Skip to content

Commit cb90e32

Browse files
committed
remove external meson data path.
always install data from /Data to prefix/data_install_dir/Data
1 parent fe3ff68 commit cb90e32

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

meson.build

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -247,9 +247,9 @@ base_exclude_files = [
247247
]
248248

249249
if get_option('install_data')
250-
install_subdir(get_option('cccpdatadir'),
251-
exclude_directories:['.git', '.github', 'Metagames.rte', 'Scenes.rte'],
250+
install_subdir('Data',
251+
exclude_directories:['.git', '.github'],
252252
exclude_files:base_exclude_files,
253-
install_dir:get_option('data_install_dir'),
253+
install_dir:get_option('data_install_dir')/'Data',
254254
strip_directory:true)
255255
endif

meson_options.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
option('debug_type', type: 'combo', choices: ['full','minimal','release'], value:'minimal', description: 'Enable certain Debug features, that might slow down the game')
2-
option('cccpdatadir', type:'string', value:'.', description: 'Path to the Cortex Command Data Repository')
32
option('data_install_dir', type:'string', value:'share/CortexCommand', description: 'Where to install the data files relative to prefix directory')
43
option('install_fmod', type:'boolean', value: true, description: 'Wether to install the fmod library.')
54
option('fmod_dir', type:'string', value:'lib/CortexCommand/', description: 'Where to install the fmod library relative to prefix directory.')

0 commit comments

Comments
 (0)