Skip to content

Commit 32c5bd1

Browse files
committed
fix meson build for source subtree
1 parent bbd8388 commit 32c5bd1

File tree

3 files changed

+26
-23
lines changed

3 files changed

+26
-23
lines changed

Resources/meson.build

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
# User frontend
2+
source_inc_dirs += [include_directories('.')]
23
if host_machine.system() == 'linux'
34
desktop_file = files('cccp.desktop')
45
icon_file = files('cccp.xpm')

Source/meson.build

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
2+
pch = meson.current_source_dir()/'System/StandardIncludes.h'
3+
sources = []
4+
source_libs = []
5+
source_inc_dirs += [include_directories(
6+
'.',
7+
'Activities',
8+
'Entities',
9+
'GUI',
10+
'GUI/Wrappers',
11+
'Lua',
12+
'Managers',
13+
'Menus',
14+
'System')]
15+
16+
subdir('Activities')
17+
subdir('Entities')
18+
subdir('GUI')
19+
subdir('Lua')
20+
subdir('Managers')
21+
subdir('Menus')
22+
subdir('System')

meson.build

Lines changed: 3 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -194,34 +194,14 @@ tracy_dep = dependency('tracy')
194194
deps += [allegro_dep, loadpng_dep, raknet_dep, boost_dep, tracy_dep]
195195

196196
#### Sources Setup ####
197-
pch = meson.current_source_dir()/'System/StandardIncludes.h'
198-
sources = []
199-
source_libs = []
200-
source_inc_dirs = include_directories(
201-
'.',
202-
'Activities',
203-
'Entities',
204-
'GUI',
205-
'GUI/Wrappers',
206-
'Lua',
207-
'Managers',
208-
'Menus',
209-
'Resources',
210-
'System')
211-
212-
subdir('Activities')
213-
subdir('Entities')
214-
subdir('GUI')
215-
subdir('Lua')
216-
subdir('Managers')
217-
subdir('Menus')
218-
subdir('System')
197+
source_inc_dirs = []
198+
subdir('Source')
219199
subdir('Resources')
220200

221201

222202
#### Target Definitions ####
223203
cccpelf = executable(
224-
elfname, ['Main.cpp', sources], include_directories:[source_inc_dirs, external_inc_dirs], cpp_pch:pch, # Sources options
204+
elfname, ['Source/Main.cpp', sources], include_directories:[source_inc_dirs, external_inc_dirs], cpp_pch:pch, # Sources options
225205
link_with:[external_libs, source_libs], objects:[external_objects], dependencies:deps, # Link options
226206
cpp_args:[extra_args, preprocessor_flags], link_args:[link_args], build_rpath:build_rpath, # Compiler setup
227207
name_suffix:suffix, # Executable name options

0 commit comments

Comments
 (0)