From d44112408e53f662e8afe302775e6a1051d8f598 Mon Sep 17 00:00:00 2001 From: dlannan Date: Wed, 29 Jan 2025 16:48:21 +1030 Subject: [PATCH] Added pathing for ffi header inclusion --- ffi/sokol/sokol_app.lua | 10 +++++----- ffi/sokol/sokol_gfx.lua | 3 ++- ffi/sokol/sokol_gp.lua | 5 +++-- ffi/sokol/sokol_libs.lua | 9 +++++---- 4 files changed, 15 insertions(+), 12 deletions(-) diff --git a/ffi/sokol/sokol_app.lua b/ffi/sokol/sokol_app.lua index fdcddc7..af453b6 100644 --- a/ffi/sokol/sokol_app.lua +++ b/ffi/sokol/sokol_app.lua @@ -1,3 +1,5 @@ +-- load lcpp (ffi.cdef wrapper turned on per default) +local lcpp = require("tools.lcpp") local ffi = require( "ffi" ) local sokol_filename = _G.SOKOL_DLL or "sokol_dll" @@ -14,13 +16,11 @@ local lib = ffi_sokol_app or libs[ ffi.os ][ ffi.arch ] print(lib) local sokol_app = ffi.load( lib ) --- load lcpp (ffi.cdef wrapper turned on per default) -local lcpp = require("tools.lcpp") - -- just use LuaJIT ffi and lcpp together +HEADER_PATH = HEADER_PATH or "" ffi.cdef([[ -#include -#include +#include "]]..HEADER_PATH..[[ffi/sokol-headers/sokol_app.h" +#include "]]..HEADER_PATH..[[ffi/sokol-headers/sokol_log.h" ]]) return sokol_app \ No newline at end of file diff --git a/ffi/sokol/sokol_gfx.lua b/ffi/sokol/sokol_gfx.lua index 82366db..acd3a49 100644 --- a/ffi/sokol/sokol_gfx.lua +++ b/ffi/sokol/sokol_gfx.lua @@ -17,6 +17,7 @@ local sokol_gfx = ffi.load( lib ) local lcpp = require("tools.lcpp") -- just use LuaJIT ffi and lcpp together -ffi.cdef([[#include ]]) +HEADER_PATH = HEADER_PATH or "" +ffi.cdef([[#include "]]..HEADER_PATH..[[ffi/sokol-headers/sokol_gfx.h" ]]) return sokol_gfx \ No newline at end of file diff --git a/ffi/sokol/sokol_gp.lua b/ffi/sokol/sokol_gp.lua index 1bd6045..4b50712 100644 --- a/ffi/sokol/sokol_gp.lua +++ b/ffi/sokol/sokol_gp.lua @@ -17,9 +17,10 @@ local sokol_gfx = ffi.load( lib ) local lcpp = require("tools.lcpp") -- just use LuaJIT ffi and lcpp together +HEADER_PATH = HEADER_PATH or "" ffi.cdef([[ -#include -#include + #include "]]..HEADER_PATH..[[ffi/sokol-headers/sokol_gfx.h" + #include "]]..HEADER_PATH..[[ffi/sokol-headers/sokol_gp.h" ]]) return sokol_gfx \ No newline at end of file diff --git a/ffi/sokol/sokol_libs.lua b/ffi/sokol/sokol_libs.lua index 5619635..bfdeac1 100644 --- a/ffi/sokol/sokol_libs.lua +++ b/ffi/sokol/sokol_libs.lua @@ -17,11 +17,12 @@ local sokol_libs = ffi.load( lib ) local lcpp = require("tools.lcpp") -- just use LuaJIT ffi and lcpp together +HEADER_PATH = HEADER_PATH or "" ffi.cdef([[ -#include -#include -#include -#include + #include "]]..HEADER_PATH..[[ffi/sokol-headers/sokol_args.h" + #include "]]..HEADER_PATH..[[ffi/sokol-headers/sokol_fetch.h" + #include "]]..HEADER_PATH..[[ffi/sokol-headers/sokol_glue.h" + #include "]]..HEADER_PATH..[[ffi/sokol-headers/sokol_time.h" ]]) return sokol_libs \ No newline at end of file