From f4bf8e1d62f86ba58cd47546e2a1897491d1c58b Mon Sep 17 00:00:00 2001
From: IonutParau <ionut.alex.parau@gmail.com>
Date: Tue, 15 Jul 2025 17:48:52 +0200
Subject: [PATCH] fixed a bug related to Lua includes

---
 build.zig         | 18 +++++++++++++-----
 src/testLuaArch.c |  6 +++---
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/build.zig b/build.zig
index 8d12f10..b7b9728 100644
--- a/build.zig
+++ b/build.zig
@@ -79,8 +79,6 @@ fn compileTheRightLua(b: *std.Build, target: std.Build.ResolvedTarget, version:
 
     const rootPath = try std.mem.join(alloc, std.fs.path.sep_str, &.{ "foreign", dirName });
 
-    c.addIncludePath(b.path(rootPath));
-
     // get all the .c files
     var files = std.ArrayList([]const u8).init(alloc);
     errdefer files.deinit();
@@ -105,7 +103,16 @@ fn compileTheRightLua(b: *std.Build, target: std.Build.ResolvedTarget, version:
     return c;
 }
 
-pub fn build(b: *std.Build) void {
+fn includeTheRightLua(b: *std.Build, c: *std.Build.Step.Compile, version: LuaVersion) !void {
+    const alloc = b.allocator;
+    const dirName = @tagName(version);
+
+    const rootPath = try std.mem.join(alloc, std.fs.path.sep_str, &.{ "foreign", dirName });
+
+    c.addIncludePath(b.path(rootPath));
+}
+
+pub fn build(b: *std.Build) !void {
     const target = b.standardTargetOptions(.{});
 
     const os = target.result.os.tag;
@@ -162,7 +169,7 @@ pub fn build(b: *std.Build) void {
             emulator.linkLibrary(raylib.artifact("raylib"));
         }
 
-        const luaVer = b.option(LuaVersion, "lua", "The version of Lua to use.") orelse LuaVersion.lua54;
+        const luaVer = b.option(LuaVersion, "lua", "The version of Lua to use.") orelse LuaVersion.lua52;
         emulator.addCSourceFiles(.{
             .files = &.{
                 "src/testLuaArch.c",
@@ -173,7 +180,8 @@ pub fn build(b: *std.Build) void {
                 if(opts.bit32) "-DNN_BIT32" else "",
             },
         });
-        const l = compileTheRightLua(b, target, luaVer) catch unreachable;
+        const l = try compileTheRightLua(b, target, luaVer);
+        try includeTheRightLua(b, emulator, luaVer);
 
         // forces us to link in everything too
         emulator.addObject(l);
diff --git a/src/testLuaArch.c b/src/testLuaArch.c
index 6cfe680..a7e543e 100644
--- a/src/testLuaArch.c
+++ b/src/testLuaArch.c
@@ -1,6 +1,6 @@
-#include <lua.h>
-#include <lualib.h>
-#include <lauxlib.h>
+#include "lua.h"
+#include "lualib.h"
+#include "lauxlib.h"
 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>