[nostalgia] Reorganize Keel components of modules into own directories

This commit is contained in:
2023-06-17 19:37:34 -05:00
parent ecde759bec
commit 2974fa5863
17 changed files with 183 additions and 18 deletions
@@ -1,8 +1,6 @@
add_library(
NostalgiaCore
gfx.cpp
keelmodule.cpp
typeconv.cpp
)
if(TURBINE_BUILD_TYPE STREQUAL "GBA")
@@ -11,11 +9,6 @@ else()
add_subdirectory(opengl)
endif()
if(NOT MSVC)
target_compile_options(NostalgiaCore PUBLIC -Wsign-conversion)
target_compile_options(NostalgiaCore PRIVATE -Wconversion)
endif()
target_include_directories(
NostalgiaCore PUBLIC
../include
@@ -26,6 +19,7 @@ target_link_libraries(
Turbine
)
add_subdirectory(keel)
if(NOSTALGIA_BUILD_STUDIO)
add_subdirectory(studio)
endif()
@@ -36,4 +30,4 @@ install(
DESTINATION
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib
)
)
@@ -0,0 +1,24 @@
add_library(
NostalgiaCore-Keel
keelmodule.cpp
typeconv.cpp
)
target_include_directories(
NostalgiaCore-Keel PUBLIC
../include
)
target_link_libraries(
NostalgiaCore-Keel PUBLIC
Keel
NostalgiaCore
)
install(
TARGETS
NostalgiaCore-Keel
DESTINATION
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib
)
@@ -7,9 +7,8 @@
#include <keel/asset.hpp>
#include <keel/module.hpp>
#include <nostalgia/core/gfx.hpp>
#include <nostalgia/core/keelmodule.hpp>
#include <nostalgia/core/palette.hpp>
#include <nostalgia/core/tilesheet.hpp>
#include "typeconv.hpp"
@@ -9,7 +9,8 @@
#include <keel/typeconv.hpp>
#include <nostalgia/core/context.hpp>
#include <nostalgia/core/gfx.hpp>
#include <nostalgia/core/palette.hpp>
#include <nostalgia/core/tilesheet.hpp>
namespace nostalgia::core {