From a66f1499a4003957cf5690f5e4f3902716c3742d Mon Sep 17 00:00:00 2001 From: Gary Talent Date: Tue, 11 Feb 2020 23:18:18 -0600 Subject: [PATCH] [nostalgia/core/gba] Move cstartup.cpp back to gbastartup --- deps/gbastartup/CMakeLists.txt | 1 + {src/nostalgia/core/gba => deps/gbastartup}/cstartup.cpp | 0 src/nostalgia/core/gba/CMakeLists.txt | 3 +-- 3 files changed, 2 insertions(+), 2 deletions(-) rename {src/nostalgia/core/gba => deps/gbastartup}/cstartup.cpp (100%) diff --git a/deps/gbastartup/CMakeLists.txt b/deps/gbastartup/CMakeLists.txt index 1adae538..203bbb72 100644 --- a/deps/gbastartup/CMakeLists.txt +++ b/deps/gbastartup/CMakeLists.txt @@ -2,6 +2,7 @@ enable_language(C ASM) add_library( GbaStartup gba_crt0.s + cstartup.cpp ) target_link_libraries( diff --git a/src/nostalgia/core/gba/cstartup.cpp b/deps/gbastartup/cstartup.cpp similarity index 100% rename from src/nostalgia/core/gba/cstartup.cpp rename to deps/gbastartup/cstartup.cpp diff --git a/src/nostalgia/core/gba/CMakeLists.txt b/src/nostalgia/core/gba/CMakeLists.txt index c112c0cd..678f9434 100644 --- a/src/nostalgia/core/gba/CMakeLists.txt +++ b/src/nostalgia/core/gba/CMakeLists.txt @@ -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() \ No newline at end of file +endif()