diff --git a/meson.build b/meson.build index 29faf19..dce5f6e 100644 --- a/meson.build +++ b/meson.build @@ -57,39 +57,8 @@ conf.set('FUNC_POINTER_SIZE', func_ptr_size) conf.set('WRENPP_NAME', meson.project_name()) conf.set('WRENPP_WITH_SSE42', get_option('wrenpp_with_sse42')) -project_config_file = configure_file( - input: 'src/pvt_config.h.in', - output: 'pvt_config.h', - configuration: conf -) - subdir('include') - -wrenpp = library(meson.project_name(), - project_config_file, - 'src/vm.cpp', - 'src/configuration.cpp', - 'src/def_configuration.cpp', - 'src/dynafunc_maker.cpp', - 'src/dynafunc_' + arch + '_' + os + '.S', - 'src/handle.cpp', - 'src/vm_fun.cpp', - 'src/callback_manager.cpp', - 'src/class_manager.cpp', - 'src/wren_class_name_from_type.cpp', - 'src/crc32.cpp', - 'src/module_and_name.cpp', - dependencies: [wren_dep], - include_directories: public_incl, - install: (not meson.is_subproject() or get_option('default_library')=='shared'), - c_args: compiler_opts, - cpp_args: compiler_opts, -) -wrenpp_dep = declare_dependency( - link_with: wrenpp, - include_directories: public_incl, - compile_args: compiler_opts, -) +subdir('src') if get_option('build_examples') subdir('examples') diff --git a/src/meson.build b/src/meson.build new file mode 100644 index 0000000..2f9d2b0 --- /dev/null +++ b/src/meson.build @@ -0,0 +1,32 @@ +project_config_file = configure_file( + input: 'pvt_config.h.in', + output: 'pvt_config.h', + configuration: conf +) + +wrenpp = library(meson.project_name(), + project_config_file, + 'vm.cpp', + 'configuration.cpp', + 'def_configuration.cpp', + 'dynafunc_maker.cpp', + 'dynafunc_' + arch + '_' + os + '.S', + 'handle.cpp', + 'vm_fun.cpp', + 'callback_manager.cpp', + 'class_manager.cpp', + 'wren_class_name_from_type.cpp', + 'crc32.cpp', + 'module_and_name.cpp', + dependencies: [wren_dep], + include_directories: public_incl, + install: (not meson.is_subproject() or get_option('default_library')=='shared'), + c_args: compiler_opts, + cpp_args: compiler_opts, +) + +wrenpp_dep = declare_dependency( + link_with: wrenpp, + include_directories: public_incl, + compile_args: compiler_opts, +)