diff --git a/src/libs/core/meson.build b/src/libs/core/meson.build index 9dd183fb..73478415 100644 --- a/src/libs/core/meson.build +++ b/src/libs/core/meson.build @@ -8,11 +8,10 @@ subdir('hash-library') subdir('helper') temp = core_lib.get('compile_args') -temp += '-DOOPETRIS_LIBRARY_CORE_TYPE='+ (get_option('default_library') == 'static' ? '1' : '0') +temp += '-DOOPETRIS_LIBRARY_CORE_TYPE=' + (get_option('default_library') == 'static' ? '1' : '0') core_lib += {'compile_args': temp} temp = 0 - liboopetris_core = library( 'oopetris_core', core_src_files, diff --git a/src/libs/recordings/meson.build b/src/libs/recordings/meson.build index e091b1b4..68a6444d 100644 --- a/src/libs/recordings/meson.build +++ b/src/libs/recordings/meson.build @@ -6,14 +6,13 @@ recordings_include_dir = include_dir / 'oopetris' / 'recordings' subdir('utility') temp = recordings_lib.get('compile_args') -temp += '-DOOPETRIS_LIBRARY_RECORDINGS_TYPE='+ (get_option('default_library') == 'static' ? '1' : '0') +temp += '-DOOPETRIS_LIBRARY_RECORDINGS_TYPE=' + (get_option('default_library') == 'static' ? '1' : '0') recordings_lib += {'compile_args': temp} temp = 0 - recordings_lib += { 'deps': [recordings_lib.get('deps'), liboopetris_core_dep], - 'inc_dirs': [recordings_lib.get('inc_dirs'), include_directories('.')] + 'inc_dirs': [recordings_lib.get('inc_dirs'), include_directories('.')], } liboopetris_recordings = library( diff --git a/src/meson.build b/src/meson.build index d4598074..75d0d473 100644 --- a/src/meson.build +++ b/src/meson.build @@ -23,9 +23,11 @@ if build_application graphics_lib += { 'deps': [graphics_lib.get('deps'), liboopetris_recordings_dep], 'inc_dirs': [graphics_lib.get('inc_dirs'), include_directories('.')], - 'compile_args' : [graphics_lib.get('compile_args'), - '-DOOPETRIS_LIBRARY_GRAPHICS_TYPE='+ - (get_option('default_library') == 'static' ? '1' : '0')] + 'compile_args': [ + graphics_lib.get('compile_args'), + '-DOOPETRIS_LIBRARY_GRAPHICS_TYPE=' + + (get_option('default_library') == 'static' ? '1' : '0'), + ], } liboopetris_graphics = library(