drinkingtea/nostalgia
2
0
Fork 0
Code Issues 4 Pull Requests Actions Releases 12 Activity

[nostalgia/core/gba] Move cstartup.cpp back to gbastartup

Browse Source
This commit is contained in:
Gary Talent
2020-02-11 23:18:18 -06:00
parent 29734d5ee1
commit a66f1499a4
3 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/nostalgia/core/gba/CMakeLists.txt
View File

@ -1,7 +1,6 @@
if(NOSTALGIA_BUILD_TYPE STREQUAL "GBA")
add_library(
NostalgiaCore-GBA
cstartup.cpp
core.cpp
gfx.cpp
media.cpp
@ -33,4 +32,4 @@ if(NOSTALGIA_BUILD_TYPE STREQUAL "Native")
)
target_link_libraries(NostalgiaCore-GBA_Test NostalgiaCore)
add_test("NostalgiaCore-GBA\\ Test\\ malloc" NostalgiaCore-GBA_Test malloc)
endif()
endif()

47
src/nostalgia/core/gba/cstartup.cpp
View File

@ -1,47 +0,0 @@
/*
* Copyright 2016 - 2020 gtalent2@gmail.com
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wpedantic"
extern void (*__preinit_array_start[]) (void);
extern void (*__preinit_array_end[]) (void);
extern void (*__init_array_start[]) (void);
extern void (*__init_array_end[]) (void);
namespace nostalgia::core {
void initHeap();
}
extern "C" {
void __libc_init_array() {
auto preInits = __preinit_array_end - __preinit_array_start;
for (decltype(preInits) i = 0; i < preInits; i++) {
__preinit_array_start[i]();
}
auto inits = __init_array_end - __init_array_start;
for (decltype(inits) i = 0; i < inits; i++) {
__preinit_array_start[i]();
}
}
int main(int argc, const char **argv);
int c_start() {
const char *args[2] = {"", "rom.oxfs"};
nostalgia::core::initHeap();
return main(2, args);
}
}
#pragma GCC diagnostic pop