Mercurial > molko
changeset 125:d59efa737fcc
cmake: add examples and fix
| author | David Demelier <markand@malikania.fr> |
|---|---|
| date | Tue, 06 Oct 2020 12:43:29 +0200 |
| parents | 7b84764741b6 |
| children | 52148edddcc6 |
| files | CMakeLists.txt cmake/MolkoDefineExecutable.cmake examples/CMakeLists.txt examples/example-inventory.c examples/example-message.c examples/example-sound.c |
| diffstat | 6 files changed, 90 insertions(+), 37 deletions(-) [+] |
line wrap: on
line diff
--- a/CMakeLists.txt Mon Oct 05 16:24:37 2020 +0200 +++ b/CMakeLists.txt Tue Oct 06 12:43:29 2020 +0200 @@ -52,4 +52,6 @@ add_subdirectory(libadventure) add_subdirectory(molko) +add_subdirectory(examples) + add_subdirectory(tests)
--- a/cmake/MolkoDefineExecutable.cmake Mon Oct 05 16:24:37 2020 +0200 +++ b/cmake/MolkoDefineExecutable.cmake Tue Oct 06 12:43:29 2020 +0200 @@ -36,7 +36,12 @@ add_executable(${EXE_TARGET} ${EXE_SOURCES} ${OUTPUTS}) target_compile_definitions(${EXE_TARGET} PRIVATE ${EXE_FLAGS}) - target_include_directories(${EXE_TARGET} PRIVATE ${EXE_INCLUDES}) + target_include_directories( + ${EXE_TARGET} + PRIVATE + ${CMAKE_CURRENT_BINARY_DIR} + ${EXE_INCLUDES} + ) target_link_libraries( ${EXE_TARGET} PRIVATE
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/examples/CMakeLists.txt Tue Oct 06 12:43:29 2020 +0200 @@ -0,0 +1,46 @@ +# +# CMakeLists.txt -- CMake build system for molko +# +# Copyright (c) 2020 David Demelier <markand@malikania.fr> +# +# Permission to use, copy, modify, and/or distribute this software for any +# purpose with or without fee is hereby granted, provided that the above +# copyright notice and this permission notice appear in all copies. +# +# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF +# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +# + +project(examples) + +molko_define_executable( + TARGET example-inventory + SOURCES example-inventory + ASSETS + ${examples_SOURCE_DIR}/assets/images/fish.png + ${examples_SOURCE_DIR}/assets/images/potion.png + ${examples_SOURCE_DIR}/assets/images/sword.png + FOLDER examples + LIBRARIES libcore +) + +molko_define_executable( + TARGET example-message + SOURCES example-message.c + FOLDER examples + LIBRARIES libcore +) + +molko_define_executable( + TARGET example-sound + SOURCES example-sound.c + FOLDER examples + ASSETS + ${examples_SOURCE_DIR}/assets/sounds/vabsounds-romance.ogg + LIBRARIES libcore +)
--- a/examples/example-inventory.c Mon Oct 05 16:24:37 2020 +0200 +++ b/examples/example-inventory.c Tue Oct 06 12:43:29 2020 +0200 @@ -16,24 +16,24 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include <clock.h> -#include <event.h> -#include <image.h> -#include <inventory.h> -#include <inventory_dialog.h> -#include <item.h> -#include <painter.h> -#include <panic.h> -#include <sys.h> -#include <texture.h> -#include <theme.h> -#include <util.h> -#include <window.h> +#include <core/clock.h> +#include <core/event.h> +#include <core/image.h> +#include <core/inventory.h> +#include <core/inventory_dialog.h> +#include <core/item.h> +#include <core/painter.h> +#include <core/panic.h> +#include <core/sys.h> +#include <core/texture.h> +#include <core/theme.h> +#include <core/util.h> +#include <core/window.h> /* https://shikashiassets.itch.io/shikashis-fantasy-icons-pack */ -#include "assets/images/fish.h" -#include "assets/images/potion.h" -#include "assets/images/sword.h" +#include <assets/images/fish.h> +#include <assets/images/potion.h> +#include <assets/images/sword.h> #define W 1280 #define H 720
--- a/examples/example-message.c Mon Oct 05 16:24:37 2020 +0200 +++ b/examples/example-message.c Tue Oct 06 12:43:29 2020 +0200 @@ -16,15 +16,15 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include <clock.h> -#include <event.h> -#include <message.h> -#include <painter.h> -#include <panic.h> -#include <sys.h> -#include <util.h> -#include <theme.h> -#include <window.h> +#include <core/clock.h> +#include <core/event.h> +#include <core/message.h> +#include <core/painter.h> +#include <core/panic.h> +#include <core/sys.h> +#include <core/util.h> +#include <core/theme.h> +#include <core/window.h> #define W 1280 #define H 720
--- a/examples/example-sound.c Mon Oct 05 16:24:37 2020 +0200 +++ b/examples/example-sound.c Tue Oct 06 12:43:29 2020 +0200 @@ -16,19 +16,19 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include <clock.h> -#include <event.h> -#include <label.h> -#include <painter.h> -#include <panic.h> -#include <sound.h> -#include <sys.h> -#include <theme.h> -#include <util.h> -#include <window.h> +#include <core/clock.h> +#include <core/event.h> +#include <core/label.h> +#include <core/painter.h> +#include <core/panic.h> +#include <core/sound.h> +#include <core/sys.h> +#include <core/theme.h> +#include <core/util.h> +#include <core/window.h> /* https://freesound.org/people/VABsounds/sounds/423658 */ -#include "assets/sounds/vabsounds-romance.h" +#include <assets/sounds/vabsounds-romance.h> #define W 1280 #define H 720