From cb8fa1e6743a3499ce4d089abd1c9dd31c30742e Mon Sep 17 00:00:00 2001 From: mckaygerhard Date: Wed, 13 Sep 2023 00:41:06 -0400 Subject: [PATCH] fix serverlist implementation error, fix postgres find, fix pkg-config missing from ci build * closes https://codeberg.org/minenux/minetest-engine-minetest/issues/25 * related https://codeberg.org/minenux/minetest-engine-multicraft2/issues/46 --- src/CMakeLists.txt | 4 ++-- src/serverlist.cpp | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index b66f0f3d8..63f46a202 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -211,8 +211,8 @@ if(ENABLE_POSTGRESQL) set(USE_POSTGRESQL TRUE) message(STATUS "PostgreSQL backend enabled") # This variable is case sensitive, don't try to change it to POSTGRESQL_INCLUDE_DIR - message(STATUS "PostgreSQL includes: ${PostgreSQL_INCLUDE_DIR}") - include_directories(${PostgreSQL_INCLUDE_DIR}) + message(STATUS "PostgreSQL includes: ${PostgreSQL_INCLUDE_DIRS}") + include_directories(${PostgreSQL_INCLUDE_DIRS}) else() message(STATUS "PostgreSQL not found!") endif() diff --git a/src/serverlist.cpp b/src/serverlist.cpp index 77c169ed4..6dade03cc 100644 --- a/src/serverlist.cpp +++ b/src/serverlist.cpp @@ -32,6 +32,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include #include "convert_json.h" #include "httpfetch.h" +#include "util/base64.h" #include "util/string.h" namespace ServerList