[nostalgia] Fix NostalgiaGfx lib name, stub out sound package
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
add_library(
|
||||
NostalgiaCore
|
||||
NostalgiaGfx
|
||||
gfx.cpp
|
||||
tilesheet.cpp
|
||||
)
|
||||
@@ -10,12 +10,12 @@ if(NOT BUILDCORE_TARGET STREQUAL "gba")
|
||||
endif()
|
||||
|
||||
target_include_directories(
|
||||
NostalgiaCore PUBLIC
|
||||
NostalgiaGfx PUBLIC
|
||||
../include
|
||||
)
|
||||
|
||||
target_link_libraries(
|
||||
NostalgiaCore PUBLIC
|
||||
NostalgiaGfx PUBLIC
|
||||
Turbine
|
||||
)
|
||||
|
||||
@@ -26,7 +26,7 @@ endif()
|
||||
|
||||
install(
|
||||
TARGETS
|
||||
NostalgiaCore
|
||||
NostalgiaGfx
|
||||
DESTINATION
|
||||
LIBRARY DESTINATION lib
|
||||
ARCHIVE DESTINATION lib
|
||||
|
||||
@@ -1,15 +1,15 @@
|
||||
add_library(
|
||||
NostalgiaCore-GBA OBJECT
|
||||
NostalgiaGfx-GBA OBJECT
|
||||
context.cpp
|
||||
gfx.cpp
|
||||
panic.cpp
|
||||
)
|
||||
target_include_directories(
|
||||
NostalgiaCore-GBA PUBLIC
|
||||
NostalgiaGfx-GBA PUBLIC
|
||||
../../include
|
||||
)
|
||||
target_link_libraries(
|
||||
NostalgiaCore-GBA PUBLIC
|
||||
NostalgiaGfx-GBA PUBLIC
|
||||
TeaGBA
|
||||
Keel
|
||||
Turbine
|
||||
@@ -17,5 +17,5 @@ target_link_libraries(
|
||||
|
||||
if(BUILDCORE_TARGET STREQUAL "gba")
|
||||
set_source_files_properties(gfx.cpp PROPERTIES COMPILE_FLAGS -marm)
|
||||
target_link_libraries(NostalgiaCore PUBLIC NostalgiaCore-GBA)
|
||||
target_link_libraries(NostalgiaGfx PUBLIC NostalgiaGfx-GBA)
|
||||
endif()
|
||||
|
||||
@@ -1,18 +1,18 @@
|
||||
add_library(
|
||||
NostalgiaCore-Keel
|
||||
NostalgiaGfx-Keel
|
||||
keelmodule.cpp
|
||||
typeconv.cpp
|
||||
)
|
||||
|
||||
target_link_libraries(
|
||||
NostalgiaCore-Keel PUBLIC
|
||||
NostalgiaGfx-Keel PUBLIC
|
||||
Keel
|
||||
NostalgiaCore
|
||||
NostalgiaGfx
|
||||
)
|
||||
|
||||
install(
|
||||
TARGETS
|
||||
NostalgiaCore-Keel
|
||||
NostalgiaGfx-Keel
|
||||
DESTINATION
|
||||
LIBRARY DESTINATION lib
|
||||
ARCHIVE DESTINATION lib
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
target_sources(
|
||||
NostalgiaCore PRIVATE
|
||||
NostalgiaGfx PRIVATE
|
||||
context.cpp
|
||||
gfx.cpp
|
||||
)
|
||||
target_link_libraries(
|
||||
NostalgiaCore PUBLIC
|
||||
NostalgiaGfx PUBLIC
|
||||
GlUtils
|
||||
)
|
||||
|
||||
@@ -1,25 +1,25 @@
|
||||
add_library(NostalgiaCore-Studio)
|
||||
add_library(NostalgiaGfx-Studio)
|
||||
|
||||
add_library(
|
||||
NostalgiaCore-Studio-ImGui
|
||||
NostalgiaGfx-Studio-ImGui
|
||||
studiomodule.cpp
|
||||
)
|
||||
|
||||
target_link_libraries(
|
||||
NostalgiaCore-Studio PUBLIC
|
||||
NostalgiaCore
|
||||
NostalgiaGfx-Studio PUBLIC
|
||||
NostalgiaGfx
|
||||
Studio
|
||||
)
|
||||
|
||||
target_link_libraries(
|
||||
NostalgiaCore-Studio-ImGui PUBLIC
|
||||
NostalgiaCore-Studio
|
||||
NostalgiaGfx-Studio-ImGui PUBLIC
|
||||
NostalgiaGfx-Studio
|
||||
)
|
||||
|
||||
install(
|
||||
TARGETS
|
||||
NostalgiaCore-Studio-ImGui
|
||||
NostalgiaCore-Studio
|
||||
NostalgiaGfx-Studio-ImGui
|
||||
NostalgiaGfx-Studio
|
||||
LIBRARY DESTINATION
|
||||
${NOSTALGIA_DIST_MODULE}
|
||||
)
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
target_sources(
|
||||
NostalgiaCore-Studio-ImGui PRIVATE
|
||||
NostalgiaGfx-Studio-ImGui PRIVATE
|
||||
paletteeditor-imgui.cpp
|
||||
)
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
|
||||
target_sources(
|
||||
NostalgiaCore-Studio PRIVATE
|
||||
NostalgiaGfx-Studio PRIVATE
|
||||
addcolorcommand.cpp
|
||||
addpagecommand.cpp
|
||||
applycolorallpagescommand.cpp
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
target_sources(
|
||||
NostalgiaCore-Studio PRIVATE
|
||||
NostalgiaGfx-Studio PRIVATE
|
||||
tilesheeteditorview.cpp
|
||||
tilesheeteditormodel.cpp
|
||||
tilesheetpixelgrid.cpp
|
||||
@@ -7,12 +7,12 @@ target_sources(
|
||||
)
|
||||
|
||||
target_sources(
|
||||
NostalgiaCore-Studio-ImGui PRIVATE
|
||||
NostalgiaGfx-Studio-ImGui PRIVATE
|
||||
tilesheeteditor-imgui.cpp
|
||||
)
|
||||
|
||||
target_link_libraries(
|
||||
NostalgiaCore-Studio-ImGui PUBLIC
|
||||
NostalgiaGfx-Studio-ImGui PUBLIC
|
||||
lodepng
|
||||
)
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
target_sources(
|
||||
NostalgiaCore-Studio PRIVATE
|
||||
NostalgiaGfx-Studio PRIVATE
|
||||
addsubsheetcommand.cpp
|
||||
cutpastecommand.cpp
|
||||
deletetilescommand.cpp
|
||||
|
||||
@@ -18,14 +18,13 @@
|
||||
#include "commands/drawcommand.hpp"
|
||||
#include "commands/flipcommand.hpp"
|
||||
#include "commands/inserttilescommand.hpp"
|
||||
#include "commands/movesubsheetcommand.hpp"
|
||||
#include "commands/palettechangecommand.hpp"
|
||||
#include "commands/rmsubsheetcommand.hpp"
|
||||
#include "commands/rotatecommand.hpp"
|
||||
#include "commands/updatesubsheetcommand.hpp"
|
||||
#include "tilesheeteditormodel.hpp"
|
||||
|
||||
#include "commands/movesubsheetcommand.hpp"
|
||||
#include "commands/rotatecommand.hpp"
|
||||
|
||||
namespace nostalgia::gfx {
|
||||
|
||||
// delete pixels of all non-leaf nodes
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
add_executable(
|
||||
NostalgiaCoreTest
|
||||
NostalgiaGfxTest
|
||||
tests.cpp
|
||||
)
|
||||
|
||||
target_link_libraries(
|
||||
NostalgiaCoreTest
|
||||
NostalgiaCore
|
||||
NostalgiaGfxTest
|
||||
NostalgiaGfx
|
||||
)
|
||||
|
||||
add_test("[NostalgiaCore] readWriteTileSheet" ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/NostalgiaCoreTest readWriteTileSheet)
|
||||
add_test("[NostalgiaGfx] readWriteTileSheet" ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/NostalgiaGfxTest readWriteTileSheet)
|
||||
|
||||
Reference in New Issue
Block a user