mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-05-31 17:32:43 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix clang warnings and remove remaining baserom references

Browse Source
This commit is contained in:
octorock
2021-11-20 23:40:47 +01:00
parent 74e416b578
commit db763950bb
16 changed files with 436 additions and 706 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/asset_processor/main.cpp
+10 -5
View File
@@ -71,13 +71,13 @@ int main(int argc, char** argv) {
argCount--;
args++;
} else {
std::cerr << "Unrecognized argument `" << args[0] << "`" << std::endl;
std::cerr << "Error: Unrecognized argument `" << args[0] << "`" << std::endl;
std::exit(1);
}
}
if (argCount != 3) {
std::cerr << "Not enough arguments. expected: 3, actual: " << argCount << std::endl;
std::cerr << "Error: Not enough arguments. expected: 3, actual: " << argCount << std::endl;
usage();
}
@@ -88,18 +88,23 @@ int main(int argc, char** argv) {
} else if (strcmp(args[0], "build") == 0) {
gMode = BUILD;
} else {
std::cerr << "Unsupported mode `" << args[0] << "`" << std::endl;
std::cerr << "Error: Unsupported mode `" << args[0] << "`" << std::endl;
std::exit(1);
}
gVariant = args[1];
if (gVariant != "USA" && gVariant != "EU" && gVariant != "JP" && gVariant != "DEMO_USA" && gVariant != "DEMO_JP") {
std::cerr << "Unsupported variant `" << gVariant << "`" << std::endl;
std::cerr << "Error: Unsupported variant `" << gVariant << "`" << std::endl;
std::exit(1);
}
gAssetsFolder = args[2];
gBaseromPath = baseroms[gVariant];
if (!std::filesystem::exists(gBaseromPath)) {
std::cerr << "Error: You need to provide a " << gVariant << " ROM as " << gBaseromPath << std::endl;
std::exit(1);
}
// Read baserom.
std::ifstream file(gBaseromPath, std::ios::binary | std::ios::ate);
std::streamsize size = file.tellg();
@@ -255,7 +260,7 @@ std::unique_ptr<BaseAsset> getAssetHandlerByType(const std::filesystem::path& pa
// Unknown binary asset
assetHandler = std::make_unique<BaseAsset>(path, start, size, asset);
} else {
std::cerr << "Unimplemented asset type `" << type << "`" << std::endl;
std::cerr << "Error: Unimplemented asset type `" << type << "`" << std::endl;
std::exit(1);
}
assetHandler->setup();