First batch of changes merged back from Under. Fixes the router, adds magic_enum to FSM, and makes it easy to reset the world.
This commit is contained in:
parent
d583a28b9c
commit
110612c33a
11 changed files with 44 additions and 19 deletions
|
|
@ -76,13 +76,18 @@ sfml_system = subproject('sfml').get_variable('sfml_system_dep')
|
|||
sfml_window = subproject('sfml').get_variable('sfml_window_dep')
|
||||
lel_guecs = subproject('lel-guecs').get_variable('lel_guecs_dep')
|
||||
|
||||
# have to disable tests because this dude's using catch2 from the 1890s
|
||||
magic_enum_proj = subproject('magic_enum', default_options: {
|
||||
'test': false})
|
||||
magic_enum = magic_enum_proj.get_variable('magic_enum_dep')
|
||||
|
||||
inc_dirs = include_directories('src')
|
||||
|
||||
subdir('src')
|
||||
subdir('tests')
|
||||
|
||||
dependencies += [
|
||||
fmt, json, freetype2,
|
||||
fmt, json, freetype2, magic_enum,
|
||||
flac, ogg, vorbis, vorbisfile, vorbisenc,
|
||||
sfml_audio, sfml_graphics,
|
||||
sfml_network, sfml_system,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue