Mercurial > molko
changeset 574:8cf895e51fb6
win: various improvements
| author | David Demelier <markand@malikania.fr> |
|---|---|
| date | Fri, 10 Mar 2023 19:23:31 +0100 |
| parents | f3d9e10bcaf8 |
| children | d682f9142c52 |
| files | cmake/MlkBcc.cmake cmake/MlkLibrary.cmake cmake/MlkMap.cmake cmake/MlkTileset.cmake libmlk-core/mlk/core/sys.c libmlk-rpg/mlk/rpg/map-loader.c |
| diffstat | 6 files changed, 21 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/cmake/MlkBcc.cmake Fri Mar 10 08:47:04 2023 +0100 +++ b/cmake/MlkBcc.cmake Fri Mar 10 19:23:31 2023 +0100 @@ -98,4 +98,10 @@ list(APPEND ${_bcc_OUTPUTS_VAR} ${_bcc_output_file}) endforeach () + + source_group( + TREE ${_bcc_base_directory} + FILES ${${_bcc_OUTPUTS_VAR}} + PREFIX build/assets + ) endmacro()
--- a/cmake/MlkLibrary.cmake Fri Mar 10 08:47:04 2023 +0100 +++ b/cmake/MlkLibrary.cmake Fri Mar 10 19:23:31 2023 +0100 @@ -34,7 +34,6 @@ if (LIB_ASSETS) mlk_bcc(ASSETS ${LIB_ASSETS} OUTPUTS_VAR HEADERS) - source_group(build/assets FILES ${HEADERS}) endif () if (LIB_LANGS AND MLK_WITH_NLS) @@ -44,7 +43,6 @@ SOURCES ${LIB_SOURCES} OUTPUTS_VAR MO ) - source_group(build/nls FILES ${MO}) endif () if (LIB_MAPS)
--- a/cmake/MlkMap.cmake Fri Mar 10 08:47:04 2023 +0100 +++ b/cmake/MlkMap.cmake Fri Mar 10 19:23:31 2023 +0100 @@ -36,4 +36,10 @@ mlk_map(${i} ${output_directory}/${filename}.map) list(APPEND ${output_var} ${output_directory}/${filename}.map) endforeach () + + source_group( + TREE ${output_directory} + FILES ${${output_var}} + PREFIX build/maps + ) endmacro()
--- a/cmake/MlkTileset.cmake Fri Mar 10 08:47:04 2023 +0100 +++ b/cmake/MlkTileset.cmake Fri Mar 10 19:23:31 2023 +0100 @@ -36,4 +36,10 @@ mlk_tileset(${i} ${output_directory}/${filename}.tileset) list(APPEND ${output_var} ${output_directory}/${filename}.tileset) endforeach () + + source_group( + TREE ${output_directory} + FILES ${${output_var}} + PREFIX build/tilesets + ) endmacro()
--- a/libmlk-core/mlk/core/sys.c Fri Mar 10 08:47:04 2023 +0100 +++ b/libmlk-core/mlk/core/sys.c Fri Mar 10 19:23:31 2023 +0100 @@ -265,6 +265,7 @@ IMG_Quit(); SDL_Quit(); + audio_finish(); } static int
--- a/libmlk-rpg/mlk/rpg/map-loader.c Fri Mar 10 08:47:04 2023 +0100 +++ b/libmlk-rpg/mlk/rpg/map-loader.c Fri Mar 10 19:23:31 2023 +0100 @@ -237,6 +237,8 @@ return mlk_errf("missing background layer"); if (!map->layers[1].tiles) return mlk_errf("missing foreground layer"); + if (!map->tileset) + return mlk_errf("missing tileset"); return 0; }