[nostalgia] Switch to strong int Error

This commit is contained in:
2019-07-28 00:32:42 -05:00
parent f4b336dd77
commit b107dc756b
21 changed files with 204 additions and 133 deletions

View File

@@ -1,8 +1,17 @@
add_executable(
nostalgia
main.cpp
)
if(NOSTALGIA_BUILD_TYPE STREQUAL "GBA")
enable_language(C ASM)
add_executable(
nostalgia
main.cpp
startup.s
)
else()
add_executable(
nostalgia
main.cpp
)
endif()
if(COMMAND OBJCOPY_FILE)
set_target_properties(nostalgia

View File

@@ -14,25 +14,23 @@ using namespace nostalgia::core;
using namespace nostalgia::world;
int run() {
while(1);
ox::FileSystem32 fs(ox::FileStore32(loadRom(), 32 * ox::units::MB));
Context ctx;
init(&ctx);
ctx.rom = &fs;
Zone zone(&ctx, Bounds{0, 0, 40, 40}, 102);
zone.draw(&ctx);
//Zone zone(&ctx, Bounds{0, 0, 40, 40}, 102);
//zone.draw(&ctx);
while (1);
return 0;
}
#ifndef OX_USE_STDLIB
extern "C"
void _start() {
extern "C" void _start() {
run();
}
#else
int main() {