redo/lua-logic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix require in includes

Browse Source
This commit is contained in:
Redo 2022-11-13 22:45:56 -06:00
parent bcebfed077
commit 4465621b44
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sim/gatedef.lua
View File

@ -1,5 +1,6 @@
local ffi = FFI or require("ffi") local ffi = FFI or require("ffi")
local cFuncsByName, cDataSizeByName = (require or Require)("compiled_sim_gates")
GateDefinition = { GateDefinition = {
ports = {}, ports = {},
@ -7,8 +8,6 @@ GateDefinition = {
input = function(gate, argv) end input = function(gate, argv) end
} }
local cFuncsByName, cDataSizeByName = require("compiled_sim_gates")
function GateDefinition.new(objref, name, description, init, logic, input, global, ports) function GateDefinition.new(objref, name, description, init, logic, input, global, ports)
name = collapseescape(name) name = collapseescape(name)

2
sim/main.lua
View File

@ -19,6 +19,7 @@ print("Save location set to \""..OPT_SAVE_DIR.."\"")
dofile("iosafe.lua") dofile("iosafe.lua")
FFI = ffi FFI = ffi
Socket = socket Socket = socket
Require = require
dofile("utility.lua") dofile("utility.lua")
dofile("simulation.lua") dofile("simulation.lua")
dofile("group.lua") dofile("group.lua")
@ -30,6 +31,7 @@ dofile("save.lua")
dofile("network.lua") dofile("network.lua")
FFI = nil FFI = nil
Socket = nil Socket = nil
Require = nil
-- Default settings -- Default settings
OPT_TICK_ENABLED = true OPT_TICK_ENABLED = true