Merge commit '50b1ed33df6ac7ddc89187f657d2eb49cb0d5acc'

This commit is contained in:
Gary Talent 2025-01-17 21:58:18 -06:00
commit 48dec919ab
3 changed files with 9 additions and 2 deletions

View File

@ -3,7 +3,6 @@ add_library(NostalgiaCore-Studio)
add_library( add_library(
NostalgiaCore-Studio-ImGui NostalgiaCore-Studio-ImGui
studiomodule.cpp studiomodule.cpp
tilesheeteditor/tilesheeteditor-imgui.cpp
) )
target_link_libraries( target_link_libraries(
@ -15,7 +14,6 @@ target_link_libraries(
target_link_libraries( target_link_libraries(
NostalgiaCore-Studio-ImGui PUBLIC NostalgiaCore-Studio-ImGui PUBLIC
NostalgiaCore-Studio NostalgiaCore-Studio
Studio
) )
install( install(

View File

@ -9,5 +9,9 @@ target_sources(
commands/renamepagecommand.cpp commands/renamepagecommand.cpp
commands/updatecolorcommand.cpp commands/updatecolorcommand.cpp
commands/updatecolorinfocommand.cpp commands/updatecolorinfocommand.cpp
)
target_sources(
NostalgiaCore-Studio-ImGui PRIVATE
paletteeditor-imgui.cpp paletteeditor-imgui.cpp
) )

View File

@ -6,6 +6,11 @@ target_sources(
tilesheetpixels.cpp tilesheetpixels.cpp
) )
target_sources(
NostalgiaCore-Studio-ImGui PRIVATE
tilesheeteditor-imgui.cpp
)
target_link_libraries( target_link_libraries(
NostalgiaCore-Studio-ImGui PUBLIC NostalgiaCore-Studio-ImGui PUBLIC
lodepng lodepng