From 72c090d10feaafe5a4c4845b35fa50abfcc8d908 Mon Sep 17 00:00:00 2001 From: Lizzy Fleckenstein Date: Sat, 3 Aug 2024 06:29:23 +0200 Subject: [PATCH] remove asprintf wrap asprintf is in posix 2024 --- meson.build | 2 +- src/client/client_entity.c | 1 - src/client/client_inventory.c | 1 - src/client/debug_menu.c | 1 - src/client/input.c | 1 - src/client/terrain_gfx.c | 1 - subprojects/asprintf.wrap | 8 -------- 7 files changed, 1 insertion(+), 14 deletions(-) delete mode 100644 subprojects/asprintf.wrap diff --git a/meson.build b/meson.build index ad53f6b..ef8ffcf 100644 --- a/meson.build +++ b/meson.build @@ -4,6 +4,7 @@ add_project_arguments([ '-Wno-address-of-packed-member', '-DGLEW_NO_GLU', '-DUSE_DRAGONNET', + '-D_GNU_SOURCE', # TODO: remove once posix 2024 is in glibc '-DASSET_PATH="' + get_option('asset_path') + '"', ], language: 'c') @@ -99,7 +100,6 @@ executable('dragonblocks-client', dependency('glew'), dependency('gl'), dependency('glfw3'), - dependency('asprintf'), dependency('linenoise'), dependency('freetype2'), ], diff --git a/src/client/client_entity.c b/src/client/client_entity.c index 8b073a8..f2ef2e0 100644 --- a/src/client/client_entity.c +++ b/src/client/client_entity.c @@ -1,4 +1,3 @@ -#include #include #include #include diff --git a/src/client/client_inventory.c b/src/client/client_inventory.c index d5178b9..c252de8 100644 --- a/src/client/client_inventory.c +++ b/src/client/client_inventory.c @@ -1,4 +1,3 @@ -#include #include #include #include "client/client_config.h" diff --git a/src/client/debug_menu.c b/src/client/debug_menu.c index f252565..6697ad2 100644 --- a/src/client/debug_menu.c +++ b/src/client/debug_menu.c @@ -1,4 +1,3 @@ -#include #include #include #include diff --git a/src/client/input.c b/src/client/input.c index a5927ff..9754b11 100644 --- a/src/client/input.c +++ b/src/client/input.c @@ -1,4 +1,3 @@ -#include #include #include #include diff --git a/src/client/terrain_gfx.c b/src/client/terrain_gfx.c index 144c465..b0cffc9 100644 --- a/src/client/terrain_gfx.c +++ b/src/client/terrain_gfx.c @@ -1,5 +1,4 @@ #include -#include #include #include #include diff --git a/subprojects/asprintf.wrap b/subprojects/asprintf.wrap deleted file mode 100644 index c4b84b1..0000000 --- a/subprojects/asprintf.wrap +++ /dev/null @@ -1,8 +0,0 @@ -[wrap-git] -url = https://github.com/dragonblocks/asprintf -revision = head -depth = 1 -method = cmake - -[provide] -asprintf = asprintf_dep