diff options
| author | briaguya <70942617+briaguya-ai@users.noreply.github.com> | 2023-04-12 21:14:33 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-12 21:14:33 -0400 |
| commit | dbdd2de9610f73098c0302d833b05d03633d221e (patch) | |
| tree | 1ca8fec1b6470cd362776668899eb33b70a7dc63 | |
| parent | 2cb9df0be10a4361c4cddce67afdfc95c5276bb2 (diff) | |
build/package/ship `soh.otr` (#2699)
* update
* Update generate-builds.yml
* Update generate-builds.yml
* sohotr in CI?
* paths
* gitignore soh.otr
* Fix
* no COMMAND maybe?
* try generating otr as it's own step
* deps
* f
* g
* h
* a
* cc
* ccc
* m
* blarg
* try uploading
* try
* s
* copy things
* wii u?
* wiiu
* don't fail
* windows without cpack?
* wut
* whoops
* see all the things plz
* b
* v
* zip working maybe
* ok but this tho
* pdb and switch
* mac lus
* soh.otr in appimage
* down first
* mac
* bundle soh otr into mac app and read it from the bundle
* appimage fix
* try just downloading for mac?
* i like to mv it mv it
* mv to the right place
* no more otrgui
* bring back otrgui and assets
* echo blarg
* echo
* zapd.exe
* clean and remove
* a
* space
---------
Co-authored-by: louis <louist103@gmail.com>
Co-authored-by: louist103 <35883445+louist103@users.noreply.github.com>
Co-authored-by: briaguya <briaguya@alice>
Co-authored-by: Adam Bird <archez39@me.com>
| -rw-r--r-- | ZAPD/Globals.h | 3 | ||||
| -rw-r--r-- | ZAPD/Main.cpp | 15 |
2 files changed, 17 insertions, 1 deletions
diff --git a/ZAPD/Globals.h b/ZAPD/Globals.h index e0cf1d1..629a5d3 100644 --- a/ZAPD/Globals.h +++ b/ZAPD/Globals.h @@ -54,7 +54,7 @@ public: bool useLegacyZDList; bool singleThreaded; VerbosityLevel verbosity; // ZAPD outputs additional information - ZFileMode fileMode; + ZFileMode fileMode = ZFileMode::Invalid; fs::path baseRomPath, inputPath, outputPath, sourceOutputPath, cfgPath, fileListPath; TextureType texType; ZGame game; @@ -65,6 +65,7 @@ public: bool forceUnaccountedStatic = false; bool otrMode = true; bool buildRawTexture = false; + bool onlyGenSohOtr = false; ZRom* rom; std::vector<ZFile*> files; diff --git a/ZAPD/Main.cpp b/ZAPD/Main.cpp index d596d05..38b0f15 100644 --- a/ZAPD/Main.cpp +++ b/ZAPD/Main.cpp @@ -260,10 +260,23 @@ int main(int argc, char* argv[]) { Globals::Instance->buildRawTexture = true; } + else if (arg == "--norom") + { + Globals::Instance->onlyGenSohOtr = true; + } } + // Parse File Mode ExporterSet* exporterSet = Globals::Instance->GetExporterSet(); + + if(Globals::Instance->onlyGenSohOtr) { + exporterSet->endProgramFunc(); + + delete g; + return 0; + } + std::string buildMode = argv[1]; ZFileMode fileMode = ZFileMode::Invalid; @@ -420,6 +433,8 @@ int main(int argc, char* argv[]) if (exporterSet != nullptr && exporterSet->endProgramFunc != nullptr) exporterSet->endProgramFunc(); +end: + delete g; return 0; } |