From 7975b9253291495da8e8e30b09cb325db078c72b Mon Sep 17 00:00:00 2001 From: hkc Date: Tue, 9 Apr 2024 23:36:59 +0300 Subject: [PATCH] Proper pkg-config and error handling on script load --- Makefile | 4 ++-- src/main.c | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 945814a..cd84930 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ -CFLAGS += -LDFLAGS := -lm -lcairo -lxcb -llua5.3 +CFLAGS += `pkg-config --cflags cairo xcb lua53` +LDFLAGS := `pkg-config --libs cairo xcb lua53` OBJECTS := obj/common.o obj/rootwindow.o obj/cairo_context.o obj/api_draw.o livewp: lib diff --git a/src/main.c b/src/main.c index 2eef51e..bb99a2f 100644 --- a/src/main.c +++ b/src/main.c @@ -32,8 +32,13 @@ int main(void) { global_context.lua = luaL_newstate(); luaL_openlibs(global_context.lua); loadapi_draw(global_context.lua); + if (luaL_dofile(global_context.lua, "example.lua") == LUA_OK) { lua_pop(global_context.lua, lua_gettop(global_context.lua)); + } else { + printf("ERROR: %s\n", lua_tostring(global_context.lua, lua_gettop(global_context.lua))); + lua_pop(global_context.lua, lua_gettop(global_context.lua)); + return EXIT_FAILURE; }