zone/OpenAssetTools
zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2025-04-21 00:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Introduce "none" project type

Browse Source
This commit is contained in:
Jan 2023-10-21 14:59:42 +02:00
parent 0b4a0ac070
commit 85b6c3f6bd
1 changed files with 40 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/Linker/Linker.cpp
View File

@ -44,6 +44,7 @@ const IZoneCreator* const ZONE_CREATORS[]
enum class ProjectType enum class ProjectType
{ {
NONE,
FASTFILE, FASTFILE,
IPAK, IPAK,
@ -52,6 +53,7 @@ enum class ProjectType
constexpr const char* PROJECT_TYPE_NAMES[static_cast<unsigned>(ProjectType::MAX)] constexpr const char* PROJECT_TYPE_NAMES[static_cast<unsigned>(ProjectType::MAX)]
{ {
"none",
"fastfile", "fastfile",
"ipak" "ipak"
}; };
@ -271,7 +273,7 @@ class LinkerImpl final : public Linker
static bool GetProjectTypeFromZoneDefinition(ProjectType& projectType, const std::string& targetName, const ZoneDefinition& zoneDefinition) static bool GetProjectTypeFromZoneDefinition(ProjectType& projectType, const std::string& targetName, const ZoneDefinition& zoneDefinition)
{ {
auto firstGameEntry = true; auto firstTypeEntry = true;
const auto [rangeBegin, rangeEnd] = zoneDefinition.m_metadata_lookup.equal_range(METADATA_TYPE); const auto [rangeBegin, rangeEnd] = zoneDefinition.m_metadata_lookup.equal_range(METADATA_TYPE);
for (auto i = rangeBegin; i != rangeEnd; ++i) for (auto i = rangeBegin; i != rangeEnd; ++i)
{ {
@ -282,10 +284,10 @@ class LinkerImpl final : public Linker
return false; return false;
} }
if (firstGameEntry) if (firstTypeEntry)
{ {
projectType = parsedProjectType; projectType = parsedProjectType;
firstGameEntry = false; firstTypeEntry = false;
} }
else else
{ {
@ -298,8 +300,13 @@ class LinkerImpl final : public Linker
} }
} }
if (firstGameEntry) if (firstTypeEntry)
{
if (zoneDefinition.m_assets.empty())
projectType = ProjectType::NONE;
else
projectType = ProjectType::FASTFILE; projectType = ProjectType::FASTFILE;
}
return true; return true;
} }
@ -451,6 +458,11 @@ class LinkerImpl final : public Linker
return true; return true;
} }
bool BuildReferencedTargets(const std::string& projectName, const std::string& targetName, const ZoneDefinition& zoneDefinition) const
{
return true;
}
bool BuildProject(const std::string& projectName, const std::string& targetName) bool BuildProject(const std::string& projectName, const std::string& targetName)
{ {
auto sourceSearchPaths = m_search_paths.GetSourceSearchPathsForProject(projectName); auto sourceSearchPaths = m_search_paths.GetSourceSearchPathsForProject(projectName);
@ -463,6 +475,9 @@ class LinkerImpl final : public Linker
if (!GetProjectTypeFromZoneDefinition(projectType, targetName, *zoneDefinition)) if (!GetProjectTypeFromZoneDefinition(projectType, targetName, *zoneDefinition))
return false; return false;
auto result = false;
if (projectType != ProjectType::NONE)
{
std::string gameName; std::string gameName;
if (!GetGameNameFromZoneDefinition(gameName, targetName, *zoneDefinition)) if (!GetGameNameFromZoneDefinition(gameName, targetName, *zoneDefinition))
return false; return false;
@ -471,7 +486,6 @@ class LinkerImpl final : public Linker
auto assetSearchPaths = m_search_paths.GetAssetSearchPathsForProject(gameName, projectName); auto assetSearchPaths = m_search_paths.GetAssetSearchPathsForProject(gameName, projectName);
auto gdtSearchPaths = m_search_paths.GetGdtSearchPathsForProject(gameName, projectName); auto gdtSearchPaths = m_search_paths.GetGdtSearchPathsForProject(gameName, projectName);
auto result = false;
switch (projectType) switch (projectType)
{ {
case ProjectType::FASTFILE: case ProjectType::FASTFILE:
@ -486,6 +500,9 @@ class LinkerImpl final : public Linker
assert(false); assert(false);
break; break;
} }
}
result = result && BuildReferencedTargets(projectName, targetName, *zoneDefinition);
m_search_paths.UnloadProjectSpecificSearchPaths(); m_search_paths.UnloadProjectSpecificSearchPaths();