diff options
author | Diegoisawesome <diego@domoreaweso.me> | 2018-09-06 03:45:50 -0500 |
---|---|---|
committer | Diegoisawesome <diego@domoreaweso.me> | 2018-09-06 03:45:50 -0500 |
commit | e0a83e3d72bb8157a412318734ac026850ca12d3 (patch) | |
tree | 180925ab26a3bd87e735bda16454eb977dd6e0b1 /tools/scaninc/c_file.cpp | |
parent | f8f7a8e300eb07935a535996b169682810380a92 (diff) |
Update scaninc and preproc with multi-file incbins
Diffstat (limited to 'tools/scaninc/c_file.cpp')
-rw-r--r-- | tools/scaninc/c_file.cpp | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/tools/scaninc/c_file.cpp b/tools/scaninc/c_file.cpp index f7acc833f..d470f959d 100644 --- a/tools/scaninc/c_file.cpp +++ b/tools/scaninc/c_file.cpp @@ -244,18 +244,27 @@ void CFile::CheckIncbin() m_pos++; - SkipWhitespace(); + while (true) + { + SkipWhitespace(); - std::string path = ReadPath(); + std::string path = ReadPath(); - SkipWhitespace(); + SkipWhitespace(); + + m_incbins.emplace(path); + + if (m_buffer[m_pos] != ',') + break; + + m_pos++; + } if (m_buffer[m_pos] != ')') FATAL_INPUT_ERROR("expected ')'"); m_pos++; - m_incbins.emplace(path); } std::string CFile::ReadPath() |