From 7c0de2679e070d7e5840595ed8dd2632b1765ec3 Mon Sep 17 00:00:00 2001 From: Egor Date: Wed, 31 Jan 2024 21:08:33 +0200 Subject: [PATCH] always compile admin.[ch] this makes it easier to do windows builds --- Makefile | 4 ++-- src/admin.c | 2 ++ src/admin.h | 2 ++ src/common.h | 2 -- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index f5f2e34..202b53d 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,7 @@ TARGET := ircd SOURCES := \ src/main.c \ + src/admin.c \ src/irc.c \ src/ircfmt.c \ src/net.c \ @@ -11,6 +12,7 @@ SOURCES := \ HEADERS := \ src/common.h \ src/config.h \ + src/admin.h \ src/irc.h \ src/ircfmt.h \ src/net.h \ @@ -23,8 +25,6 @@ HEADERS := \ -include config.mk ifdef USE_LUA -SOURCES += src/admin.c -HEADERS += src/admin.h CFLAGS += -DHAS_LUA $(shell pkg-config --cflags lua5.4) LDLIBS += $(shell pkg-config --libs lua5.4) endif diff --git a/src/admin.c b/src/admin.c index 0d8328d..3db32cc 100644 --- a/src/admin.c +++ b/src/admin.c @@ -1,3 +1,4 @@ +#ifdef HAS_LUA #include "admin.h" #include "irc.h" #include "ircfmt.h" @@ -485,3 +486,4 @@ int admin_hook(const char *hook, struct client_data *cl1, struct client_data *cl lua_pop(L, 1); return rv; } +#endif diff --git a/src/admin.h b/src/admin.h index 57cd93d..2076d85 100644 --- a/src/admin.h +++ b/src/admin.h @@ -1,8 +1,10 @@ #ifndef ADMIN_H_ #define ADMIN_H_ +#ifdef HAS_LUA #include "common.h" void admin_init(void); void admin_fini(void); int admin_command(struct client_data *client, char *source, char *command, int argc, char *args[]); int admin_hook(const char *hook, struct client_data *cl1, struct client_data *cl2, struct channel *chan, char *txt); #endif +#endif diff --git a/src/common.h b/src/common.h index af8b8cd..8251528 100644 --- a/src/common.h +++ b/src/common.h @@ -109,7 +109,5 @@ extern map_t autojoin; extern struct client_data *clients; extern struct client_data *dyingclients; -#ifdef HAS_LUA #include "admin.h" #endif -#endif -- 2.56.0