Move liblua code to libs directory.

zsbzsb · Aug 1, 2022 · 6777e57 · 6777e57
1 parent 67d5422
commit 6777e57
Show file tree

Hide file tree

Showing 146 changed files with 312 additions and 307 deletions.
diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json
@@ -48,7 +48,7 @@
                     "${workspaceRoot}/build/include/*",
                     "${workspaceRoot}/libs/element/src/*",
                     "${workspaceRoot}/libs/element/include/*",
-                    "${workspaceRoot}/libs/element/lua/*",
+                    "${workspaceRoot}/libs/lua/*",
                     "${workspaceRoot}/libs/JUCE/modules/*",
                     "${workspaceRoot}/libs/kv/modules/*",
                     "${workspaceRoot}/libs/compat/*",
@@ -88,7 +88,7 @@
                 "${workspaceRoot}/build/include/*",
                 "${workspaceRoot}/libs/element/src/*",
                 "${workspaceRoot}/libs/element/include/*",
-                "${workspaceRoot}/libs/element/lua/*",
+                "${workspaceRoot}/libs/lua/*",
                 "${workspaceRoot}/libs/JUCE/modules/*",
                 "${workspaceRoot}/libs/kv/modules/*",
                 "${workspaceRoot}/libs/compat/*",
@@ -111,7 +111,7 @@
                 "${workspaceRoot}/build/include/*",
                 "${workspaceRoot}/libs/element/src/*",
                 "${workspaceRoot}/libs/element/include/*",
-                "${workspaceRoot}/libs/element/lua/*",
+                "${workspaceRoot}/libs/lua/*",
                 "${workspaceRoot}/libs/JUCE/modules/*",
                 "${workspaceRoot}/libs/kv/modules/*",
                 "${workspaceRoot}/libs/compat/*",
@@ -141,7 +141,7 @@
                 "${workspaceFolder}/build/include/*",
                 "${workspaceFolder}/libs/element/src/*",
                 "${workspaceFolder}/libs/element/include/*",
-                "${workspaceFolder}/libs/element/lua/*",
+                "${workspaceFolder}/libs/lua/*",
                 "${workspaceFolder}/libs/JUCE/modules/*",
                 "${workspaceFolder}/libs/kv/modules/*",
                 "${workspaceFolder}/libs/compat/*",

diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -11,7 +11,7 @@
             "cwd": "${fileDirname}",
             "environment": [
                 { "name": "LD_LIBRARY_PATH", "value": "${workspaceRoot}/build/lib" },
-                { "name": "LUA_PATH", "value": "${workspaceRoot}/libs/element/lua/?.lua" },
+                { "name": "LUA_PATH", "value": "${workspaceRoot}/libs/lua/?.lua" },
                 { "name": "ELEMENT_SCRIPTS_PATH", "value": "${workspaceRoot}/scripts/?.lua" }
             ],
             "console": "externalTerminal"
@@ -21,16 +21,16 @@
             "type": "cppdbg",
             "request": "launch",
             "args": [],
-            "program": "${workspaceRoot}/build/bin/element",
+            "program": "${workspaceRoot}/build-native/element",
             "cwd": "${workspaceRoot}",
             "environment": [
                 { "name": "LD_LIBRARY_PATH", "value": "${workspaceRoot}/build/lib" },
-                { "name": "LUA_PATH", "value": "${workspaceRoot}/libs/element/lua/?.lua" },
+                { "name": "LUA_PATH", "value": "${workspaceRoot}/libs/lua/?.lua" },
                 { "name": "ELEMENT_SCRIPTS_PATH", "value": "${workspaceRoot}/scripts/?.lua" }
             ],
             "externalConsole": false,
             "stopAtEntry": false,
-            "preLaunchTask": "Waf Build",
+            // "preLaunchTask": "Waf Build",
             "linux": {
                 "MIMode": "gdb",
                 "logging": {

diff --git a/config.ld b/config.ld
@@ -2,17 +2,17 @@ project     = 'Element'
 title       = 'Element Lua Documentation'
 description = 'Element Lua Documentation'
 file = {
-    'libs/element/lua',
+    'libs/lua',
     'scripts',
     'src/engine/MidiPipe.cpp',
     exclude = {
         'docs/examples',
-        'libs/element/lua/element.lua',
-        'libs/element/lua/el/audio_buffer.hpp',
-        'libs/element/lua/el/midi_buffer.hpp',
-        'libs/element/lua/el/sol_helpers.hpp',
-        'libs/element/lua/el/lua-kv.hpp',
-        'libs/element/lua/el/lua-kv.h',
+        'libs/lua/element.lua',
+        'libs/lua/el/audio_buffer.hpp',
+        'libs/lua/el/midi_buffer.hpp',
+        'libs/lua/el/sol_helpers.hpp',
+        'libs/lua/el/lua-kv.hpp',
+        'libs/lua/el/lua-kv.h',
     },
 }
 examples = {

diff --git a/docs/conf.py b/docs/conf.py
@@ -40,7 +40,7 @@
 
 # a list of lua source root
 lua_source_path = [ 
-    "../libs/element/lua/el",
+    "../libs/lua/el",
     "../src/engine" 
 ]
 

diff --git a/libs/element/meson.build b/libs/element/meson.build
diff --git a/libs/element/lua/.gitignore → libs/lua/.gitignore b/libs/element/lua/.gitignore → libs/lua/.gitignore
diff --git a/libs/element/lua/Makefile → libs/lua/Makefile b/libs/element/lua/Makefile → libs/lua/Makefile
diff --git a/libs/element/lua/README → libs/lua/README b/libs/element/lua/README → libs/lua/README
diff --git a/libs/element/lua/doc/contents.html → libs/lua/doc/contents.html b/libs/element/lua/doc/contents.html → libs/lua/doc/contents.html
diff --git a/libs/element/lua/doc/index.css → libs/lua/doc/index.css b/libs/element/lua/doc/index.css → libs/lua/doc/index.css
diff --git a/libs/element/lua/doc/logo.gif → libs/lua/doc/logo.gif b/libs/element/lua/doc/logo.gif → libs/lua/doc/logo.gif
diff --git a/libs/element/lua/doc/lua.1 → libs/lua/doc/lua.1 b/libs/element/lua/doc/lua.1 → libs/lua/doc/lua.1
diff --git a/libs/element/lua/doc/lua.css → libs/lua/doc/lua.css b/libs/element/lua/doc/lua.css → libs/lua/doc/lua.css
diff --git a/libs/element/lua/doc/luac.1 → libs/lua/doc/luac.1 b/libs/element/lua/doc/luac.1 → libs/lua/doc/luac.1
diff --git a/libs/element/lua/doc/manual.css → libs/lua/doc/manual.css b/libs/element/lua/doc/manual.css → libs/lua/doc/manual.css
diff --git a/libs/element/lua/doc/manual.html → libs/lua/doc/manual.html b/libs/element/lua/doc/manual.html → libs/lua/doc/manual.html
diff --git a/libs/element/lua/doc/osi-certified-72x60.png → libs/lua/doc/osi-certified-72x60.png b/libs/element/lua/doc/osi-certified-72x60.png → libs/lua/doc/osi-certified-72x60.png
diff --git a/libs/element/lua/doc/readme.html → libs/lua/doc/readme.html b/libs/element/lua/doc/readme.html → libs/lua/doc/readme.html
diff --git a/libs/element/lua/el/AudioBuffer.lua → libs/lua/el/AudioBuffer.lua b/libs/element/lua/el/AudioBuffer.lua → libs/lua/el/AudioBuffer.lua
diff --git a/libs/element/lua/el/AudioBuffer32.cpp → libs/lua/el/AudioBuffer32.cpp b/libs/element/lua/el/AudioBuffer32.cpp → libs/lua/el/AudioBuffer32.cpp
diff --git a/libs/element/lua/el/AudioBuffer64.cpp → libs/lua/el/AudioBuffer64.cpp b/libs/element/lua/el/AudioBuffer64.cpp → libs/lua/el/AudioBuffer64.cpp
diff --git a/libs/element/lua/el/AudioBufferImpl.ipp → libs/lua/el/AudioBufferImpl.ipp b/libs/element/lua/el/AudioBufferImpl.ipp → libs/lua/el/AudioBufferImpl.ipp
diff --git a/libs/element/lua/el/Bounds.cpp → libs/lua/el/Bounds.cpp b/libs/element/lua/el/Bounds.cpp → libs/lua/el/Bounds.cpp
diff --git a/libs/element/lua/el/CommandManager.cpp → libs/lua/el/CommandManager.cpp b/libs/element/lua/el/CommandManager.cpp → libs/lua/el/CommandManager.cpp
diff --git a/libs/element/lua/el/Desktop.cpp → libs/lua/el/Desktop.cpp b/libs/element/lua/el/Desktop.cpp → libs/lua/el/Desktop.cpp
diff --git a/libs/element/lua/el/DocumentWindow.cpp → libs/lua/el/DocumentWindow.cpp b/libs/element/lua/el/DocumentWindow.cpp → libs/lua/el/DocumentWindow.cpp
diff --git a/libs/element/lua/el/File.cpp → libs/lua/el/File.cpp b/libs/element/lua/el/File.cpp → libs/lua/el/File.cpp
diff --git a/libs/element/lua/el/Globals.cpp → libs/lua/el/Globals.cpp b/libs/element/lua/el/Globals.cpp → libs/lua/el/Globals.cpp
diff --git a/libs/element/lua/el/Graphics.cpp → libs/lua/el/Graphics.cpp b/libs/element/lua/el/Graphics.cpp → libs/lua/el/Graphics.cpp
diff --git a/libs/element/lua/el/MidiBuffer.cpp → libs/lua/el/MidiBuffer.cpp b/libs/element/lua/el/MidiBuffer.cpp → libs/lua/el/MidiBuffer.cpp
diff --git a/libs/element/lua/el/MidiMessage.cpp → libs/lua/el/MidiMessage.cpp b/libs/element/lua/el/MidiMessage.cpp → libs/lua/el/MidiMessage.cpp
diff --git a/libs/element/lua/el/MouseEvent.cpp → libs/lua/el/MouseEvent.cpp b/libs/element/lua/el/MouseEvent.cpp → libs/lua/el/MouseEvent.cpp
diff --git a/libs/element/lua/el/Node.cpp → libs/lua/el/Node.cpp b/libs/element/lua/el/Node.cpp → libs/lua/el/Node.cpp
diff --git a/libs/element/lua/el/Parameter.cpp → libs/lua/el/Parameter.cpp b/libs/element/lua/el/Parameter.cpp → libs/lua/el/Parameter.cpp
diff --git a/libs/element/lua/el/Point.cpp → libs/lua/el/Point.cpp b/libs/element/lua/el/Point.cpp → libs/lua/el/Point.cpp
diff --git a/libs/element/lua/el/Range.cpp → libs/lua/el/Range.cpp b/libs/element/lua/el/Range.cpp → libs/lua/el/Range.cpp
diff --git a/libs/element/lua/el/Rectangle.cpp → libs/lua/el/Rectangle.cpp b/libs/element/lua/el/Rectangle.cpp → libs/lua/el/Rectangle.cpp
diff --git a/libs/element/lua/el/Session.cpp → libs/lua/el/Session.cpp b/libs/element/lua/el/Session.cpp → libs/lua/el/Session.cpp
diff --git a/libs/element/lua/el/Slider.cpp → libs/lua/el/Slider.cpp b/libs/element/lua/el/Slider.cpp → libs/lua/el/Slider.cpp
diff --git a/libs/element/lua/el/TextButton.cpp → libs/lua/el/TextButton.cpp b/libs/element/lua/el/TextButton.cpp → libs/lua/el/TextButton.cpp
diff --git a/libs/element/lua/el/Widget.cpp → libs/lua/el/Widget.cpp b/libs/element/lua/el/Widget.cpp → libs/lua/el/Widget.cpp
diff --git a/libs/element/lua/el/audio.c → libs/lua/el/audio.c b/libs/element/lua/el/audio.c → libs/lua/el/audio.c
diff --git a/libs/element/lua/el/audio_buffer.hpp → libs/lua/el/audio_buffer.hpp b/libs/element/lua/el/audio_buffer.hpp → libs/lua/el/audio_buffer.hpp
diff --git a/libs/element/lua/el/bytes.c → libs/lua/el/bytes.c b/libs/element/lua/el/bytes.c → libs/lua/el/bytes.c
diff --git a/libs/element/lua/el/bytes.h → libs/lua/el/bytes.h b/libs/element/lua/el/bytes.h → libs/lua/el/bytes.h
diff --git a/libs/element/lua/el/command.lua → libs/lua/el/command.lua b/libs/element/lua/el/command.lua → libs/lua/el/command.lua
diff --git a/libs/element/lua/el/factories.hpp → libs/lua/el/factories.hpp b/libs/element/lua/el/factories.hpp → libs/lua/el/factories.hpp
diff --git a/libs/element/lua/el/lua-kv.h → libs/lua/el/lua-kv.h b/libs/element/lua/el/lua-kv.h → libs/lua/el/lua-kv.h
diff --git a/libs/element/lua/el/lua-kv.hpp → libs/lua/el/lua-kv.hpp b/libs/element/lua/el/lua-kv.hpp → libs/lua/el/lua-kv.hpp
diff --git a/libs/element/lua/el/midi.c → libs/lua/el/midi.c b/libs/element/lua/el/midi.c → libs/lua/el/midi.c
diff --git a/libs/element/lua/el/midi_buffer.hpp → libs/lua/el/midi_buffer.hpp b/libs/element/lua/el/midi_buffer.hpp → libs/lua/el/midi_buffer.hpp
diff --git a/libs/element/lua/el/object.hpp → libs/lua/el/object.hpp b/libs/element/lua/el/object.hpp → libs/lua/el/object.hpp
diff --git a/libs/element/lua/el/object.lua → libs/lua/el/object.lua b/libs/element/lua/el/object.lua → libs/lua/el/object.lua
diff --git a/libs/element/lua/el/packed.h → libs/lua/el/packed.h b/libs/element/lua/el/packed.h → libs/lua/el/packed.h
diff --git a/libs/element/lua/el/rectangle.hpp → libs/lua/el/rectangle.hpp b/libs/element/lua/el/rectangle.hpp → libs/lua/el/rectangle.hpp
diff --git a/libs/element/lua/el/round.c → libs/lua/el/round.c b/libs/element/lua/el/round.c → libs/lua/el/round.c
diff --git a/libs/element/lua/el/script.lua → libs/lua/el/script.lua b/libs/element/lua/el/script.lua → libs/lua/el/script.lua
diff --git a/libs/element/lua/el/slug.lua → libs/lua/el/slug.lua b/libs/element/lua/el/slug.lua → libs/lua/el/slug.lua
diff --git a/libs/element/lua/el/sol_helpers.hpp → libs/lua/el/sol_helpers.hpp b/libs/element/lua/el/sol_helpers.hpp → libs/lua/el/sol_helpers.hpp
diff --git a/libs/element/lua/el/util.h → libs/lua/el/util.h b/libs/element/lua/el/util.h → libs/lua/el/util.h
diff --git a/libs/element/lua/el/vector.c → libs/lua/el/vector.c b/libs/element/lua/el/vector.c → libs/lua/el/vector.c
diff --git a/libs/element/lua/el/widget.hpp → libs/lua/el/widget.hpp b/libs/element/lua/el/widget.hpp → libs/lua/el/widget.hpp
diff --git a/libs/lua/meson.build b/libs/lua/meson.build
@@ -0,0 +1,37 @@
+
+libelement_lua = static_library ('element_lua', '''
+    src/lauxlib.c
+    src/liolib.c
+    src/lopcodes.c
+    src/lstate.c
+    src/lobject.c
+    src/lmathlib.c
+    src/loadlib.c
+    src/lvm.c
+    src/lfunc.c
+    src/lstrlib.c
+    src/linit.c
+    src/lstring.c
+    src/lundump.c
+    src/lctype.c
+    src/ltable.c
+    src/ldump.c
+    src/loslib.c
+    src/lgc.c
+    src/lzio.c
+    src/ldblib.c
+    src/lutf8lib.c
+    src/lmem.c
+    src/lcorolib.c
+    src/lcode.c
+    src/ltablib.c
+    src/lapi.c
+    src/lbaselib.c
+    src/ldebug.c
+    src/lparser.c
+    src/llex.c
+    src/ltm.c
+    src/ldo.c'''.split(),
+    install : false,
+    gnu_symbol_visibility : 'default'
+)
diff --git a/libs/element/lua/sol/config.hpp → libs/lua/sol/config.hpp b/libs/element/lua/sol/config.hpp → libs/lua/sol/config.hpp
diff --git a/libs/element/lua/sol/forward.hpp → libs/lua/sol/forward.hpp b/libs/element/lua/sol/forward.hpp → libs/lua/sol/forward.hpp
diff --git a/libs/element/lua/sol/sol.hpp → libs/lua/sol/sol.hpp b/libs/element/lua/sol/sol.hpp → libs/lua/sol/sol.hpp
diff --git a/libs/element/lua/src/Makefile → libs/lua/src/Makefile b/libs/element/lua/src/Makefile → libs/lua/src/Makefile
diff --git a/libs/element/lua/src/lapi.c → libs/lua/src/lapi.c b/libs/element/lua/src/lapi.c → libs/lua/src/lapi.c
diff --git a/libs/element/lua/src/lapi.h → libs/lua/src/lapi.h b/libs/element/lua/src/lapi.h → libs/lua/src/lapi.h
diff --git a/libs/element/lua/src/lauxlib.c → libs/lua/src/lauxlib.c b/libs/element/lua/src/lauxlib.c → libs/lua/src/lauxlib.c
diff --git a/libs/element/lua/src/lauxlib.h → libs/lua/src/lauxlib.h b/libs/element/lua/src/lauxlib.h → libs/lua/src/lauxlib.h
diff --git a/libs/element/lua/src/lbaselib.c → libs/lua/src/lbaselib.c b/libs/element/lua/src/lbaselib.c → libs/lua/src/lbaselib.c
diff --git a/libs/element/lua/src/lcode.c → libs/lua/src/lcode.c b/libs/element/lua/src/lcode.c → libs/lua/src/lcode.c
diff --git a/libs/element/lua/src/lcode.h → libs/lua/src/lcode.h b/libs/element/lua/src/lcode.h → libs/lua/src/lcode.h
diff --git a/libs/element/lua/src/lcorolib.c → libs/lua/src/lcorolib.c b/libs/element/lua/src/lcorolib.c → libs/lua/src/lcorolib.c
diff --git a/libs/element/lua/src/lctype.c → libs/lua/src/lctype.c b/libs/element/lua/src/lctype.c → libs/lua/src/lctype.c
diff --git a/libs/element/lua/src/lctype.h → libs/lua/src/lctype.h b/libs/element/lua/src/lctype.h → libs/lua/src/lctype.h
diff --git a/libs/element/lua/src/ldblib.c → libs/lua/src/ldblib.c b/libs/element/lua/src/ldblib.c → libs/lua/src/ldblib.c
diff --git a/libs/element/lua/src/ldebug.c → libs/lua/src/ldebug.c b/libs/element/lua/src/ldebug.c → libs/lua/src/ldebug.c
diff --git a/libs/element/lua/src/ldebug.h → libs/lua/src/ldebug.h b/libs/element/lua/src/ldebug.h → libs/lua/src/ldebug.h
diff --git a/libs/element/lua/src/ldo.c → libs/lua/src/ldo.c b/libs/element/lua/src/ldo.c → libs/lua/src/ldo.c
diff --git a/libs/element/lua/src/ldo.h → libs/lua/src/ldo.h b/libs/element/lua/src/ldo.h → libs/lua/src/ldo.h
diff --git a/libs/element/lua/src/ldump.c → libs/lua/src/ldump.c b/libs/element/lua/src/ldump.c → libs/lua/src/ldump.c
diff --git a/libs/element/lua/src/lfunc.c → libs/lua/src/lfunc.c b/libs/element/lua/src/lfunc.c → libs/lua/src/lfunc.c
diff --git a/libs/element/lua/src/lfunc.h → libs/lua/src/lfunc.h b/libs/element/lua/src/lfunc.h → libs/lua/src/lfunc.h
diff --git a/libs/element/lua/src/lgc.c → libs/lua/src/lgc.c b/libs/element/lua/src/lgc.c → libs/lua/src/lgc.c
diff --git a/libs/element/lua/src/lgc.h → libs/lua/src/lgc.h b/libs/element/lua/src/lgc.h → libs/lua/src/lgc.h
diff --git a/libs/element/lua/src/linit.c → libs/lua/src/linit.c b/libs/element/lua/src/linit.c → libs/lua/src/linit.c
diff --git a/libs/element/lua/src/liolib.c → libs/lua/src/liolib.c b/libs/element/lua/src/liolib.c → libs/lua/src/liolib.c
diff --git a/libs/element/lua/src/ljumptab.h → libs/lua/src/ljumptab.h b/libs/element/lua/src/ljumptab.h → libs/lua/src/ljumptab.h
diff --git a/libs/element/lua/src/llex.c → libs/lua/src/llex.c b/libs/element/lua/src/llex.c → libs/lua/src/llex.c
diff --git a/libs/element/lua/src/llex.h → libs/lua/src/llex.h b/libs/element/lua/src/llex.h → libs/lua/src/llex.h
diff --git a/libs/element/lua/src/llimits.h → libs/lua/src/llimits.h b/libs/element/lua/src/llimits.h → libs/lua/src/llimits.h
diff --git a/libs/element/lua/src/lmathlib.c → libs/lua/src/lmathlib.c b/libs/element/lua/src/lmathlib.c → libs/lua/src/lmathlib.c
diff --git a/libs/element/lua/src/lmem.c → libs/lua/src/lmem.c b/libs/element/lua/src/lmem.c → libs/lua/src/lmem.c
diff --git a/libs/element/lua/src/lmem.h → libs/lua/src/lmem.h b/libs/element/lua/src/lmem.h → libs/lua/src/lmem.h
diff --git a/libs/element/lua/src/loadlib.c → libs/lua/src/loadlib.c b/libs/element/lua/src/loadlib.c → libs/lua/src/loadlib.c
diff --git a/libs/element/lua/src/lobject.c → libs/lua/src/lobject.c b/libs/element/lua/src/lobject.c → libs/lua/src/lobject.c
diff --git a/libs/element/lua/src/lobject.h → libs/lua/src/lobject.h b/libs/element/lua/src/lobject.h → libs/lua/src/lobject.h
diff --git a/libs/element/lua/src/lopcodes.c → libs/lua/src/lopcodes.c b/libs/element/lua/src/lopcodes.c → libs/lua/src/lopcodes.c
diff --git a/libs/element/lua/src/lopcodes.h → libs/lua/src/lopcodes.h b/libs/element/lua/src/lopcodes.h → libs/lua/src/lopcodes.h
diff --git a/libs/element/lua/src/lopnames.h → libs/lua/src/lopnames.h b/libs/element/lua/src/lopnames.h → libs/lua/src/lopnames.h
diff --git a/libs/element/lua/src/loslib.c → libs/lua/src/loslib.c b/libs/element/lua/src/loslib.c → libs/lua/src/loslib.c
diff --git a/libs/element/lua/src/lparser.c → libs/lua/src/lparser.c b/libs/element/lua/src/lparser.c → libs/lua/src/lparser.c
diff --git a/libs/element/lua/src/lparser.h → libs/lua/src/lparser.h b/libs/element/lua/src/lparser.h → libs/lua/src/lparser.h
diff --git a/libs/element/lua/src/lprefix.h → libs/lua/src/lprefix.h b/libs/element/lua/src/lprefix.h → libs/lua/src/lprefix.h
diff --git a/libs/element/lua/src/lstate.c → libs/lua/src/lstate.c b/libs/element/lua/src/lstate.c → libs/lua/src/lstate.c
diff --git a/libs/element/lua/src/lstate.h → libs/lua/src/lstate.h b/libs/element/lua/src/lstate.h → libs/lua/src/lstate.h
diff --git a/libs/element/lua/src/lstring.c → libs/lua/src/lstring.c b/libs/element/lua/src/lstring.c → libs/lua/src/lstring.c
diff --git a/libs/element/lua/src/lstring.h → libs/lua/src/lstring.h b/libs/element/lua/src/lstring.h → libs/lua/src/lstring.h
diff --git a/libs/element/lua/src/lstrlib.c → libs/lua/src/lstrlib.c b/libs/element/lua/src/lstrlib.c → libs/lua/src/lstrlib.c
diff --git a/libs/element/lua/src/ltable.c → libs/lua/src/ltable.c b/libs/element/lua/src/ltable.c → libs/lua/src/ltable.c
diff --git a/libs/element/lua/src/ltable.h → libs/lua/src/ltable.h b/libs/element/lua/src/ltable.h → libs/lua/src/ltable.h
diff --git a/libs/element/lua/src/ltablib.c → libs/lua/src/ltablib.c b/libs/element/lua/src/ltablib.c → libs/lua/src/ltablib.c
diff --git a/libs/element/lua/src/ltm.c → libs/lua/src/ltm.c b/libs/element/lua/src/ltm.c → libs/lua/src/ltm.c
diff --git a/libs/element/lua/src/ltm.h → libs/lua/src/ltm.h b/libs/element/lua/src/ltm.h → libs/lua/src/ltm.h
diff --git a/libs/element/lua/src/lua.c → libs/lua/src/lua.c b/libs/element/lua/src/lua.c → libs/lua/src/lua.c
diff --git a/libs/element/lua/src/lua.h → libs/lua/src/lua.h b/libs/element/lua/src/lua.h → libs/lua/src/lua.h
diff --git a/libs/element/lua/src/lua.hpp → libs/lua/src/lua.hpp b/libs/element/lua/src/lua.hpp → libs/lua/src/lua.hpp
diff --git a/libs/element/lua/src/luac.c → libs/lua/src/luac.c b/libs/element/lua/src/luac.c → libs/lua/src/luac.c
diff --git a/libs/element/lua/src/luaconf.h → libs/lua/src/luaconf.h b/libs/element/lua/src/luaconf.h → libs/lua/src/luaconf.h
diff --git a/libs/element/lua/src/lualib.h → libs/lua/src/lualib.h b/libs/element/lua/src/lualib.h → libs/lua/src/lualib.h
diff --git a/libs/element/lua/src/lundump.c → libs/lua/src/lundump.c b/libs/element/lua/src/lundump.c → libs/lua/src/lundump.c
diff --git a/libs/element/lua/src/lundump.h → libs/lua/src/lundump.h b/libs/element/lua/src/lundump.h → libs/lua/src/lundump.h
diff --git a/libs/element/lua/src/lutf8lib.c → libs/lua/src/lutf8lib.c b/libs/element/lua/src/lutf8lib.c → libs/lua/src/lutf8lib.c
diff --git a/libs/element/lua/src/lvm.c → libs/lua/src/lvm.c b/libs/element/lua/src/lvm.c → libs/lua/src/lvm.c
diff --git a/libs/element/lua/src/lvm.h → libs/lua/src/lvm.h b/libs/element/lua/src/lvm.h → libs/lua/src/lvm.h
diff --git a/libs/element/lua/src/lzio.c → libs/lua/src/lzio.c b/libs/element/lua/src/lzio.c → libs/lua/src/lzio.c
diff --git a/libs/element/lua/src/lzio.h → libs/lua/src/lzio.h b/libs/element/lua/src/lzio.h → libs/lua/src/lzio.h
diff --git a/meson.build b/meson.build
@@ -1,4 +1,4 @@
-project ('element', ['c', 'cpp', 'objc', 'objcpp'],
+project ('element', ['c', 'cpp', 'objc', 'objcpp' ],
     version : '0.47.0',
     meson_version : '>= 0.56.0',
     default_options : [ 'c_std=c11', 'cpp_std=c++17' ])
@@ -14,43 +14,7 @@ add_global_arguments ([
 # Boost
 boost_dep = dependency ('boost', required : true)
 
-# Lua
-libelement_lua = static_library ('lua', '''
-    libs/element/lua/src/lauxlib.c
-    libs/element/lua/src/liolib.c
-    libs/element/lua/src/lopcodes.c
-    libs/element/lua/src/lstate.c
-    libs/element/lua/src/lobject.c
-    libs/element/lua/src/lmathlib.c
-    libs/element/lua/src/loadlib.c
-    libs/element/lua/src/lvm.c
-    libs/element/lua/src/lfunc.c
-    libs/element/lua/src/lstrlib.c
-    libs/element/lua/src/linit.c
-    libs/element/lua/src/lstring.c
-    libs/element/lua/src/lundump.c
-    libs/element/lua/src/lctype.c
-    libs/element/lua/src/ltable.c
-    libs/element/lua/src/ldump.c
-    libs/element/lua/src/loslib.c
-    libs/element/lua/src/lgc.c
-    libs/element/lua/src/lzio.c
-    libs/element/lua/src/ldblib.c
-    libs/element/lua/src/lutf8lib.c
-    libs/element/lua/src/lmem.c
-    libs/element/lua/src/lcorolib.c
-    libs/element/lua/src/lcode.c
-    libs/element/lua/src/ltablib.c
-    libs/element/lua/src/lapi.c
-    libs/element/lua/src/lbaselib.c
-    libs/element/lua/src/ldebug.c
-    libs/element/lua/src/lparser.c
-    libs/element/lua/src/llex.c
-    libs/element/lua/src/ltm.c
-    libs/element/lua/src/ldo.c
-    '''.split(),
-    install : false,
-    gnu_symbol_visibility : 'default')
+subdir ('libs/lua')
 
 # JUCE
 juce_modules = '''
@@ -181,31 +145,31 @@ libelement_sources = '''
     libs/element/src/module.cpp
     libs/element/src/scripting.cpp
     libs/element/src/strings.cpp
-    libs/element/lua/el/audio.c
-    libs/element/lua/el/AudioBuffer32.cpp
-    libs/element/lua/el/AudioBuffer64.cpp
-    libs/element/lua/el/Bounds.cpp
-    libs/element/lua/el/bytes.c
-    libs/element/lua/el/CommandManager.cpp
-    libs/element/lua/el/Desktop.cpp
-    libs/element/lua/el/DocumentWindow.cpp
-    libs/element/lua/el/File.cpp
-    libs/element/lua/el/Globals.cpp
-    libs/element/lua/el/Graphics.cpp
-    libs/element/lua/el/midi.c
-    libs/element/lua/el/MidiBuffer.cpp
-    libs/element/lua/el/MidiMessage.cpp
-    libs/element/lua/el/MouseEvent.cpp
-    libs/element/lua/el/Node.cpp
-    libs/element/lua/el/Parameter.cpp
-    libs/element/lua/el/Point.cpp
-    libs/element/lua/el/Range.cpp
-    libs/element/lua/el/Rectangle.cpp
-    libs/element/lua/el/round.c
-    libs/element/lua/el/Session.cpp
-    libs/element/lua/el/Slider.cpp
-    libs/element/lua/el/TextButton.cpp
-    libs/element/lua/el/Widget.cpp
+    libs/lua/el/audio.c
+    libs/lua/el/AudioBuffer32.cpp
+    libs/lua/el/AudioBuffer64.cpp
+    libs/lua/el/Bounds.cpp
+    libs/lua/el/bytes.c
+    libs/lua/el/CommandManager.cpp
+    libs/lua/el/Desktop.cpp
+    libs/lua/el/DocumentWindow.cpp
+    libs/lua/el/File.cpp
+    libs/lua/el/Globals.cpp
+    libs/lua/el/Graphics.cpp
+    libs/lua/el/midi.c
+    libs/lua/el/MidiBuffer.cpp
+    libs/lua/el/MidiMessage.cpp
+    libs/lua/el/MouseEvent.cpp
+    libs/lua/el/Node.cpp
+    libs/lua/el/Parameter.cpp
+    libs/lua/el/Point.cpp
+    libs/lua/el/Range.cpp
+    libs/lua/el/Rectangle.cpp
+    libs/lua/el/round.c
+    libs/lua/el/Session.cpp
+    libs/lua/el/Slider.cpp
+    libs/lua/el/TextButton.cpp
+    libs/lua/el/Widget.cpp
     src/CapsLock.cpp
     src/Commands.cpp
     src/controllers/AppController.cpp
@@ -372,9 +336,9 @@ libelement_sources += juce_sources
 libelement_includes = '''
     libs/compat
     libs/element/include
-    libs/element/lua
-    libs/element/lua/src
-    libs/element/lua/el
+    libs/lua
+    libs/lua/src
+    libs/lua/el
     libs/element/src
     libs/JUCE/modules
     libs/kv/modules

diff --git a/src/engine/MidiPipe.cpp b/src/engine/MidiPipe.cpp
@@ -24,8 +24,8 @@
 // @pragma nostrip
 
 #include "lua.hpp"
-#include "../../libs/element/lua/el/midi_buffer.hpp"
-#include "../../libs/element/lua/el/factories.hpp"
+#include "../../libs/lua/el/midi_buffer.hpp"
+#include "../../libs/lua/el/factories.hpp"
 #include "engine/MidiPipe.h"
 
 namespace Element {

diff --git a/src/engine/nodes/LuaNode.cpp b/src/engine/nodes/LuaNode.cpp
@@ -20,7 +20,7 @@
 #include <math.h>
 #include "sol/sol.hpp"
 #include "element/element.h"
-#include "../../../libs/element/lua/el/factories.hpp"
+#include "../../../libs/lua/el/factories.hpp"
 
 #include "ElementApp.h"
 #include "engine/nodes/LuaNode.h"

diff --git a/src/engine/nodes/ScriptNode.cpp b/src/engine/nodes/ScriptNode.cpp
@@ -20,7 +20,7 @@
 #include <math.h>
 #include "sol/sol.hpp"
 #include "element/element.h"
-#include "../../../libs/element/lua/el/factories.hpp"
+#include "../../../libs/lua/el/factories.hpp"
 
 #include "ElementApp.h"
 #include "engine/nodes/ScriptNode.h"

diff --git a/src/gui/ContextMenus.h b/src/gui/ContextMenus.h
@@ -361,19 +361,21 @@ class NodePopupMenu : public PopupMenu
         }
         else if (result >= 40000 && result < 50000)
         {
-            const int osFactor = (int) powf (2, float (result - 40000));
+#if 0
+            const int osFactor = (int) powf (2, float (result - 40000));            
             if (auto gNode = node.getObject())
             {
                 // FIXME:
-                // auto* graph = gNode->getParentGraph();
-                // // TODO: don't reload the entire graph
-                // bool wasSuspended = graph->isSuspended();
-                // graph->suspendProcessing (true);
-                // graph->releaseResources();
-                // gNode->setOversamplingFactor (osFactor);
-                // graph->prepareToPlay (gNode->getParentGraph()->getSampleRate(), gNode->getParentGraph()->getBlockSize());
-                // graph->suspendProcessing (wasSuspended);
+                auto* graph = gNode->getParentGraph();
+                // TODO: don't reload the entire graph
+                bool wasSuspended = graph->isSuspended();
+                graph->suspendProcessing (true);
+                graph->releaseResources();
+                gNode->setOversamplingFactor (osFactor);
+                graph->prepareToPlay (gNode->getParentGraph()->getSampleRate(), gNode->getParentGraph()->getBlockSize());
+                graph->suspendProcessing (wasSuspended);
             }
+#endif
         }
 
         return nullptr;

diff --git a/src/gui/nodes/ScriptNodeEditor.cpp b/src/gui/nodes/ScriptNodeEditor.cpp
@@ -18,7 +18,7 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include "../../../libs/element/lua/el/object.hpp"
+#include "../../../libs/lua/el/object.hpp"
 #include "gui/nodes/ScriptNodeEditor.h"
 #include "gui/LookAndFeel.h"
 #include "scripting/LuaBindings.h"

diff --git a/src/scripting/DSPScript.cpp b/src/scripting/DSPScript.cpp
@@ -17,7 +17,7 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include "../../libs/element/lua/el/factories.hpp"
+#include "../../libs/lua/el/factories.hpp"
 #include "engine/MidiPipe.h"
 #include "scripting/DSPScript.h"
 

diff --git a/src/scripting/LuaBindings.cpp b/src/scripting/LuaBindings.cpp
@@ -151,7 +151,7 @@ namespace Lua {
         if (topdir.exists() && topdir.isDirectory())
         {
             dirs.add (topdir.getChildFile ("libs/lua-kv/src").getFullPathName());
-            dirs.add (topdir.getChildFile ("libs/element/lua").getFullPathName());
+            dirs.add (topdir.getChildFile ("libs/lua").getFullPathName());
         }
 #endif
         return dirs;