Add YAZE_UTIL_SRC to CMakeLists and update flag definitions in z3ed and yaze
This commit is contained in:
@@ -99,6 +99,7 @@ if (YAZE_BUILD_LIB)
|
|||||||
${YAZE_APP_GFX_SRC}
|
${YAZE_APP_GFX_SRC}
|
||||||
${YAZE_APP_ZELDA3_SRC}
|
${YAZE_APP_ZELDA3_SRC}
|
||||||
${YAZE_GUI_SRC}
|
${YAZE_GUI_SRC}
|
||||||
|
${YAZE_UTIL_SRC}
|
||||||
${IMGUI_SRC}
|
${IMGUI_SRC}
|
||||||
${IMGUI_TEST_ENGINE_SOURCES}
|
${IMGUI_TEST_ENGINE_SOURCES}
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -23,8 +23,6 @@ DEFINE_FLAG(std::string, length, "", "The length of the data to read.");
|
|||||||
|
|
||||||
DEFINE_FLAG(std::string, file_size, "", "The size of the file to expand to.");
|
DEFINE_FLAG(std::string, file_size, "", "The size of the file to expand to.");
|
||||||
DEFINE_FLAG(std::string, dest_rom, "", "The destination ROM file.");
|
DEFINE_FLAG(std::string, dest_rom, "", "The destination ROM file.");
|
||||||
DEFINE_FLAG(std::string, tile32_id_list, "",
|
|
||||||
"The list of tile32 IDs to transfer.");
|
|
||||||
|
|
||||||
int main(int argc, char *argv[]) {
|
int main(int argc, char *argv[]) {
|
||||||
yaze::util::FlagParser flag_parser(yaze::util::global_flag_registry());
|
yaze::util::FlagParser flag_parser(yaze::util::global_flag_registry());
|
||||||
|
|||||||
@@ -5,12 +5,17 @@
|
|||||||
#include <sstream>
|
#include <sstream>
|
||||||
|
|
||||||
#include "app/core/platform/app_delegate.h"
|
#include "app/core/platform/app_delegate.h"
|
||||||
|
#include "app/core/controller.h"
|
||||||
#include "app/rom.h"
|
#include "app/rom.h"
|
||||||
#include "app/zelda3/overworld/overworld.h"
|
#include "app/zelda3/overworld/overworld.h"
|
||||||
#include "dungeon.h"
|
#include "dungeon.h"
|
||||||
#include "util/flag.h"
|
#include "util/flag.h"
|
||||||
#include "yaze_config.h"
|
#include "yaze_config.h"
|
||||||
|
|
||||||
|
DEFINE_FLAG(
|
||||||
|
std::string, rom_file, "", "Path to the ROM file to load. "
|
||||||
|
"If not specified, the app will run without a ROM.");
|
||||||
|
|
||||||
int yaze_app_main(int argc, char **argv) {
|
int yaze_app_main(int argc, char **argv) {
|
||||||
yaze::util::FlagParser parser(yaze::util::global_flag_registry());
|
yaze::util::FlagParser parser(yaze::util::global_flag_registry());
|
||||||
RETURN_IF_EXCEPTION(parser.Parse(argc, argv));
|
RETURN_IF_EXCEPTION(parser.Parse(argc, argv));
|
||||||
@@ -23,7 +28,7 @@ int yaze_app_main(int argc, char **argv) {
|
|||||||
return yaze_run_cocoa_app_delegate(rom_filename.c_str());
|
return yaze_run_cocoa_app_delegate(rom_filename.c_str());
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
auto controller = std::make_unique<core::Controller>();
|
auto controller = std::make_unique<yaze::core::Controller>();
|
||||||
EXIT_IF_ERROR(controller->OnEntry(rom_filename))
|
EXIT_IF_ERROR(controller->OnEntry(rom_filename))
|
||||||
while (controller->IsActive()) {
|
while (controller->IsActive()) {
|
||||||
controller->OnInput();
|
controller->OnInput();
|
||||||
|
|||||||
Reference in New Issue
Block a user