From 062a665899e4b9e75a921d2ed3b284988a00f597 Mon Sep 17 00:00:00 2001 From: Caleb Connolly Date: Sat, 22 Jan 2022 20:46:04 +0000 Subject: [PATCH] move to meson, use tfblib as an external dependency needs: https://github.com/vvaltchev/tfblib/pull/4 --- .gitignore | 3 ++- CMakeLists.txt | 13 ------------- logo.h => include/logo.h | 0 meson.build | 11 +++++++++++ src/meson.build | 8 ++++++++ pbsplash.c => src/pbsplash.c | 0 tfblib | 1 - 7 files changed, 21 insertions(+), 15 deletions(-) delete mode 100644 CMakeLists.txt rename logo.h => include/logo.h (100%) create mode 100644 meson.build create mode 100644 src/meson.build rename pbsplash.c => src/pbsplash.c (100%) delete mode 160000 tfblib diff --git a/.gitignore b/.gitignore index 567609b..ca1be8f 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ -build/ +builddir/ + diff --git a/CMakeLists.txt b/CMakeLists.txt deleted file mode 100644 index 2603af1..0000000 --- a/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -cmake_minimum_required(VERSION 3.10) - -# set the project name -project(pbsplash) - -# add the executable -add_executable(pbsplash pbsplash.c) - -include_directories(tfblib/include) - -add_subdirectory(tfblib) - -target_link_libraries(pbsplash tfb) diff --git a/logo.h b/include/logo.h similarity index 100% rename from logo.h rename to include/logo.h diff --git a/meson.build b/meson.build new file mode 100644 index 0000000..1f5cf92 --- /dev/null +++ b/meson.build @@ -0,0 +1,11 @@ +project('pbsplash', 'c') + +deps = [ + dependency('tfblib'), +] + +inc = [ + include_directories('include'), +] + +subdir('src') diff --git a/src/meson.build b/src/meson.build new file mode 100644 index 0000000..86fb3c1 --- /dev/null +++ b/src/meson.build @@ -0,0 +1,8 @@ +src = [ + 'pbsplash.c', +] + +executable('pbsplash', src, + include_directories: inc, + dependencies: deps, + install: true) diff --git a/pbsplash.c b/src/pbsplash.c similarity index 100% rename from pbsplash.c rename to src/pbsplash.c diff --git a/tfblib b/tfblib deleted file mode 160000 index 3e5de10..0000000 --- a/tfblib +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 3e5de1026f2965591fb9feb1256c0ea10f4dc928