From fbb46d571a664aa7220dfe1ef3f49579a3227a0b Mon Sep 17 00:00:00 2001 From: scawful Date: Thu, 14 Nov 2024 13:28:42 -0500 Subject: [PATCH] Housekeeping --- src/app/core/platform/font_loader.h | 7 +++---- src/cli/z3ed.cmake | 2 ++ src/test/yaze_test.cc | 22 ++++++---------------- 3 files changed, 11 insertions(+), 20 deletions(-) diff --git a/src/app/core/platform/font_loader.h b/src/app/core/platform/font_loader.h index cc337798..abda231c 100644 --- a/src/app/core/platform/font_loader.h +++ b/src/app/core/platform/font_loader.h @@ -1,7 +1,6 @@ -// FontLoader.h -#ifndef FONTLOADER_H -#define FONTLOADER_H +#ifndef YAZE_APP_CORE_PLATFORM_FONTLOADER_H +#define YAZE_APP_CORE_PLATFORM_FONTLOADER_H void LoadSystemFonts(); -#endif // FONTLOADER_H +#endif // YAZE_APP_CORE_PLATFORM_FONTLOADER_H diff --git a/src/cli/z3ed.cmake b/src/cli/z3ed.cmake index 633b3286..2c179068 100644 --- a/src/cli/z3ed.cmake +++ b/src/cli/z3ed.cmake @@ -6,7 +6,9 @@ add_executable( cli/handlers/tile16_transfer.cc app/rom.cc app/core/common.cc + app/core/project.cc app/editor/utils/gfx_context.cc + app/core/platform/file_path.mm ${YAZE_APP_EMU_SRC} ${YAZE_APP_GFX_SRC} ${YAZE_APP_ZELDA3_SRC} diff --git a/src/test/yaze_test.cc b/src/test/yaze_test.cc index 2d5459fb..f80414ac 100644 --- a/src/test/yaze_test.cc +++ b/src/test/yaze_test.cc @@ -11,21 +11,6 @@ namespace yaze { namespace test { -TEST(YazeTest, LoadAndUnloadRom) { - yaze_flags flags; - flags.rom_filename = "zelda3.sfc"; - const int init = yaze_init(&flags); - ASSERT_EQ(init, 0); - yaze_cleanup(&flags); -} - -TEST(YazeTest, NoFilename) { - yaze_flags flags; - const int init = yaze_init(&flags); - ASSERT_EQ(init, -1); - yaze_cleanup(&flags); -} - } // namespace test } // namespace yaze @@ -37,8 +22,13 @@ int main(int argc, char* argv[]) { if (argc > 1 && std::string(argv[1]) == "integration") { return yaze::test::integration::RunIntegrationTest(); + } else if (argc > 1 && std::string(argv[1]) == "room_object") { + ::testing::InitGoogleTest(&argc, argv); + if (!RUN_ALL_TESTS()) { + return yaze::test::integration::RunIntegrationTest(); + } } ::testing::InitGoogleTest(&argc, argv); return RUN_ALL_TESTS(); -} \ No newline at end of file +}