diff --git a/.gitmodules b/.gitmodules index dba9b4a..2ea0cb6 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "internal/luau"] path = internal/luau url = https://github.com/luau-lang/luau +[submodule "ffi/luau"] + path = ffi/luau + url = https://github.com/luau-lang/luau.git diff --git a/ffi/lauxlib.go b/ffi/lauxlib.go index 3696797..4b8002c 100644 --- a/ffi/lauxlib.go +++ b/ffi/lauxlib.go @@ -1,4 +1,4 @@ -package internal +package ffi /* #cgo CFLAGS: -Iluau/VM/include -I/usr/lib/gcc/x86_64-pc-linux-gnu/14.1.1/include diff --git a/ffi/lua.go b/ffi/lua.go index 7461199..d5a8ba0 100644 --- a/ffi/lua.go +++ b/ffi/lua.go @@ -1,4 +1,4 @@ -package internal +package ffi /* #cgo CFLAGS: -Iluau/VM/include -I/usr/lib/gcc/x86_64-pc-linux-gnu/14.1.1/include @@ -697,7 +697,7 @@ func GetUserdataDtor(L *LuaState, tag int32) LuaDestructor { } func SetUserdataMetatable(L *LuaState, tag int32, idx int32) { - C.lua_setuserdatametatable(L, C.int(tag), C.int(idx)) + C.lua_setuserdatametatable(L, C.int(idx)) } func GetUserdataMetatable(L *LuaState, tag int32) { diff --git a/ffi/luau b/ffi/luau new file mode 160000 index 0000000..c517432 --- /dev/null +++ b/ffi/luau @@ -0,0 +1 @@ +Subproject commit c51743268bcbe5c5af1bd78bcacaefe7f6fe3391 diff --git a/ffi/util.go b/ffi/util.go index 6af0e99..76216dd 100644 --- a/ffi/util.go +++ b/ffi/util.go @@ -1,4 +1,4 @@ -package internal +package ffi //#include import "C" diff --git a/ffi/vector3.go b/ffi/vector3.go index 6753de6..b5b918e 100644 --- a/ffi/vector3.go +++ b/ffi/vector3.go @@ -1,6 +1,6 @@ //go:build !LUAU_VECTOR4 -package internal +package ffi /* #cgo CFLAGS: -Iluau/VM/include -I/usr/lib/gcc/x86_64-pc-linux-gnu/14.1.1/include