Windows build fixes

This commit is contained in:
Jack Andersen 2019-07-27 15:18:09 -10:00
parent b0e4973c64
commit 1e35db90aa
2 changed files with 10 additions and 10 deletions

View File

@ -392,7 +392,7 @@ int main(int argc, const boo::SystemChar** argv)
} }
/* WAV out path */ /* WAV out path */
amuse::SystemString pathOut = fmt::format(fmt("{}-{}.wav"), *m_groupName, *m_songName); amuse::SystemString pathOut = fmt::format(fmt(_SYS_STR("{}-{}.wav")), *m_groupName, *m_songName);
Log.report(logvisor::Info, fmt(_SYS_STR("Writing to {}")), pathOut); Log.report(logvisor::Info, fmt(_SYS_STR("Writing to {}")), pathOut);
/* Build voice engine */ /* Build voice engine */

View File

@ -639,12 +639,12 @@ struct NameDB {
}; };
} // namespace amuse } // namespace amuse
FMT_CUSTOM_FORMATTER(amuse::ObjectId, fmt("{:04X}"), obj.id) FMT_CUSTOM_FORMATTER(amuse::ObjectId, "{:04X}", obj.id)
FMT_CUSTOM_FORMATTER(amuse::SoundMacroId, fmt("{:04X}"), obj.id) FMT_CUSTOM_FORMATTER(amuse::SoundMacroId, "{:04X}", obj.id)
FMT_CUSTOM_FORMATTER(amuse::SampleId, fmt("{:04X}"), obj.id) FMT_CUSTOM_FORMATTER(amuse::SampleId, "{:04X}", obj.id)
FMT_CUSTOM_FORMATTER(amuse::TableId, fmt("{:04X}"), obj.id) FMT_CUSTOM_FORMATTER(amuse::TableId, "{:04X}", obj.id)
FMT_CUSTOM_FORMATTER(amuse::KeymapId, fmt("{:04X}"), obj.id) FMT_CUSTOM_FORMATTER(amuse::KeymapId, "{:04X}", obj.id)
FMT_CUSTOM_FORMATTER(amuse::LayersId, fmt("{:04X}"), obj.id) FMT_CUSTOM_FORMATTER(amuse::LayersId, "{:04X}", obj.id)
FMT_CUSTOM_FORMATTER(amuse::SongId, fmt("{:04X}"), obj.id) FMT_CUSTOM_FORMATTER(amuse::SongId, "{:04X}", obj.id)
FMT_CUSTOM_FORMATTER(amuse::SFXId, fmt("{:04X}"), obj.id) FMT_CUSTOM_FORMATTER(amuse::SFXId, "{:04X}", obj.id)
FMT_CUSTOM_FORMATTER(amuse::GroupId, fmt("{:04X}"), obj.id) FMT_CUSTOM_FORMATTER(amuse::GroupId, "{:04X}", obj.id)