diff --git a/CHANGES b/CHANGES index 11cd2b6ad50dda6e72aa61caed04cd291e180715..e54290dc74edd00851a5087c6334c3935324615c 100644 --- a/CHANGES +++ b/CHANGES @@ -10,6 +10,8 @@ Documentation updates (thanks to all, especially Nina and David). The binary_grid Perl module has been marked as deprecated. +Lots of minor bug fixes, and kludges to allow MacOSX build + V2.1.5 Updates to the meson build to make it more efficient and work on more platforms. diff --git a/meson.build b/meson.build index 7e676a23e4f1aa2558258f5f2383b51e3361f618..e979e2f894aff03ef731792924f41d6d222c512f 100644 --- a/meson.build +++ b/meson.build @@ -672,17 +672,28 @@ run_command('meson/make_version_macros.pl') # data objects # # list and build them -message('Checking and building data objects') -data_objects_compilation = run_command('meson/data_object_list_and_build.sh') -if data_objects_compilation.returncode() != 0 - error('There was a problem building the data objects. Please check that you have objcopy installed, and try running meson/data_object_list_and_build.sh from the binary_c root directory manually to check for errors') -endif -data_objects = data_objects_compilation.stdout().strip().split(' ') +if os != 'darwin' + message('Checking and building data objects') + + data_objects_compilation = run_command('meson/data_object_list_and_build.sh') -if get_option('clean_data_objects') == true - run_command('meson/clean_data_objects.sh') + if data_objects_compilation.returncode() != 0 + error('There was a problem building the data objects. Please check that you have objcopy installed, and try running meson/data_object_list_and_build.sh from the binary_c root directory manually to check for errors') + endif + data_objects = data_objects_compilation.stdout().strip().split(' ') + + if get_option('clean_data_objects') == true + run_command('meson/clean_data_objects.sh') + endif +else + data_objects = [] endif +############################################################ +# data objects V2 +# + + ############################################################ # source files # diff --git a/tbse b/tbse index 54dd004ddf8016e45ff78c6fbbcd9dc7a9b6f147..0c302f085ca50aa9c5d94ade968c64fe3fe6fd0b 100755 --- a/tbse +++ b/tbse @@ -2069,7 +2069,6 @@ $WARMUP \ --sn_kick_dispersion_BH_NS $SN_KICK_DISPERSION_BH_NS \ --sn_kick_dispersion_IA_Hybrid_HeCOWD $SN_KICK_DISPERSION_IA_Hybrid_HeCOWD \ --sn_kick_dispersion_IA_Hybrid_HeCOWD_subluminous $SN_KICK_DISPERSION_IA_Hybrid_HeCOWD_subluminous \ -\ --sn_kick_companion_IA_He $SN_KICK_COMPANION_IA_He \ --sn_kick_companion_IA_ELD $SN_KICK_COMPANION_IA_ELD \ --sn_kick_companion_IA_CHAND $SN_KICK_COMPANION_IA_CHAND \