ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-16 19:47:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update scaninc and preproc with multi-file incbins

Browse Source
This commit is contained in:
Diegoisawesome 2018-09-06 03:45:50 -05:00
parent f8f7a8e300
commit e0a83e3d72
2 changed files with 69 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
tools/preproc/c_file.cpp
View File

@ -325,6 +325,10 @@ void CFile::TryConvertIncbin()
m_pos++;
std::printf("{");
while (true)
{
SkipWhitespace();
if (m_buffer[m_pos] != '"')
@ -357,15 +361,6 @@ void CFile::TryConvertIncbin()
m_pos++;
SkipWhitespace();
if (m_buffer[m_pos] != ')')
RaiseError("expected ')'");
m_pos++;
std::printf("{");
int fileSize;
std::unique_ptr<unsigned char[]> buffer = ReadWholeFile(path, fileSize);
@ -386,6 +381,19 @@ void CFile::TryConvertIncbin()
std::printf("%uu,", data);
}
SkipWhitespace();
if (m_buffer[m_pos] != ',')
break;
m_pos++;
}
if (m_buffer[m_pos] != ')')
RaiseError("expected ')'");
m_pos++;
std::printf("}");
}

11
tools/scaninc/c_file.cpp
View File

@ -244,18 +244,27 @@ void CFile::CheckIncbin()
m_pos++;
while (true)
{
SkipWhitespace();
std::string path = ReadPath();
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()