From bf970db6257c55bb3c513c9e7b8a1c7f78ab2ed6 Mon Sep 17 00:00:00 2001 From: Elias Fleckenstein Date: Sun, 24 Apr 2022 18:07:35 +0200 Subject: [PATCH] Use portable getline --- .gitmodules | 3 +++ deps/getline | 1 + src/CMakeLists.txt | 3 ++- src/client/mesh.c | 1 + src/client/model.c | 1 + src/server/schematic.c | 1 + 6 files changed, 9 insertions(+), 1 deletion(-) create mode 160000 deps/getline diff --git a/.gitmodules b/.gitmodules index 6404413..49df65f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -25,3 +25,6 @@ [submodule "deps/protogen"] path = deps/protogen url = https://github.com/dragonblocks/protogen +[submodule "deps/getline"] + path = deps/getline + url = https://github.com/dragonblocks/getline diff --git a/deps/getline b/deps/getline new file mode 160000 index 0000000..9d102be --- /dev/null +++ b/deps/getline @@ -0,0 +1 @@ +Subproject commit 9d102be3fb622bcd3fab9f7feaafe2b1abf3980a diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 6b28b7f..896d845 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -46,7 +46,7 @@ endif() add_compile_definitions("USE_DRAGONNET") add_compile_definitions("RESSOURCE_PATH=\"${RESSOURCE_PATH}\"") -add_compile_options(-Wall -Wextra -Werror -Wno-address-of-packed-member -Wno-implicit-fallthrough -fmax-errors=4) +add_compile_options(-Wall -Wextra -Werror -Wno-address-of-packed-member -Wno-implicit-fallthrough -Wno-unused-parameter -Wno-maybe-uninitialized -fmax-errors=4) link_libraries( pthread @@ -90,6 +90,7 @@ set(COMMON_SOURCES "${DEPS_DIR}/dragonstd/refcount.c" "${DEPS_DIR}/dragonstd/tree.c" "${DEPS_DIR}/dragonstd/bits/compare.c" + "${DEPS_DIR}/getline/getline.c" "${DEPS_DIR}/linenoise/linenoise.c" "${DEPS_DIR}/linenoise/stringbuf.c" "${DEPS_DIR}/linenoise/utf8.c" diff --git a/src/client/mesh.c b/src/client/mesh.c index d778ce1..1674da0 100644 --- a/src/client/mesh.c +++ b/src/client/mesh.c @@ -1,4 +1,5 @@ #include +#include #include #include #include diff --git a/src/client/model.c b/src/client/model.c index f2a2244..1755bd9 100644 --- a/src/client/model.c +++ b/src/client/model.c @@ -1,4 +1,5 @@ #include +#include #include #include #include diff --git a/src/server/schematic.c b/src/server/schematic.c index 9cd9270..af92cfa 100644 --- a/src/server/schematic.c +++ b/src/server/schematic.c @@ -1,3 +1,4 @@ +#include #include #include #include "server/schematic.h" -- 2.44.0