mirror
/
osci-render
kopia lustrzana https://github.com/jameshball/osci-render
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Merge pull request #312 from DJLevel3/luajit-attempt-2 

Luajit attempt 2
pull/316/head^2
James H Ball 2025-08-17 09:11:48 +01:00 zatwierdzone przez GitHub
rodzic 13a7744fa3 90585abd54
commit 412b385f7e
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: B5690EEEBB952194
9 zmienionych plików z 66 dodań i 128 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

6
.gitmodules vendored
Wyświetl plik

@ -7,6 +7,6 @@
[submodule "modules/osci_render_core"]
path = modules/osci_render_core
url = ../../jameshball/osci_render_core.git
[submodule "Source/lua/lua"]
path = Source/lua/lua
url = ../../lua/lua.git
[submodule "LuaJIT"]
path = modules/LuaJIT
url = https://luajit.org/git/luajit.git

12
Source/lua/LuaParser.cpp
Wyświetl plik

@ -1,5 +1,9 @@
#include "LuaParser.h"
#include "luaimport.h"
// If you haven't compiled LuaJIT yet, this will fail, and you'll get a ton of syntax errors in a few Lua-related files!
// On all platforms, this should be done automatically when you run the export.
// If not, use the luajit_win.bat or luajit_linux_macos.sh scripts in the git root from the dev environment.
#include <lua.hpp>
std::function<void(const std::string&)> LuaParser::onPrint;
std::function<void()> LuaParser::onClear;
@ -322,7 +326,7 @@ static int luaPrint(lua_State* L) {
int nargs = lua_gettop(L);
for (int i = 1; i <= nargs; ++i) {
LuaParser::onPrint(luaL_tolstring(L, i, nullptr));
LuaParser::onPrint(lua_tolstring(L, i, nullptr));
lua_pop(L, 1);
}
@ -468,7 +472,7 @@ void LuaParser::revertToFallback(lua_State*& L) {
}
void LuaParser::readTable(lua_State*& L, std::vector<float>& values) {
auto length = lua_rawlen(L, -1);
auto length = lua_objlen(L, -1);
for (int i = 1; i <= length; i++) {
lua_pushinteger(L, i);
@ -493,7 +497,7 @@ std::vector<float> LuaParser::run(lua_State*& L, LuaVariables& vars) {
setGlobalVariables(L, vars);
// Get the function from the registry
lua_geti(L, LUA_REGISTRYINDEX, functionRef);
lua_rawgeti(L, LUA_REGISTRYINDEX, functionRef);
setMaximumInstructions(L, 5000000);

1
Source/lua/lua

@ -1 +0,0 @@
Subproject commit 3dbb1a4b894c0744a331d4319d8d1704dc4ad943

1
Source/lua/luaimport.cpp
Wyświetl plik

@ -1 +0,0 @@
#include "luaimport.h"

40
Source/lua/luaimport.h
Wyświetl plik

@ -1,40 +0,0 @@
#ifndef LUAIMPORT_H
#define LUAIMPORT_H
extern "C" {
#include "lua/lapi.c"
#include "lua/lauxlib.c"
#include "lua/lbaselib.c"
#include "lua/lcode.c"
#include "lua/lcorolib.c"
#include "lua/lctype.c"
#include "lua/ldblib.c"
#include "lua/ldebug.c"
#include "lua/ldo.c"
#include "lua/ldump.c"
#include "lua/lfunc.c"
#include "lua/lgc.c"
#include "lua/linit.c"
#include "lua/liolib.c"
#include "lua/llex.c"
#include "lua/lmathlib.c"
#include "lua/lmem.c"
#include "lua/loadlib.c"
#include "lua/lobject.c"
#include "lua/lopcodes.c"
#include "lua/loslib.c"
#include "lua/lparser.c"
#include "lua/lstate.c"
#include "lua/lstring.c"
#include "lua/lstrlib.c"
#include "lua/ltable.c"
#include "lua/ltablib.c"
#include "lua/ltests.c"
#include "lua/ltm.c"
#include "lua/lundump.c"
#include "lua/lutf8lib.c"
#include "lua/lvm.c"
#include "lua/lzio.c"
}
#endif

12
luajit_linux_macos.sh 100755
Wyświetl plik

@ -0,0 +1,12 @@
#!/bin/sh
# Run this if you're on Linux and you haven't already built LuaJIT.
# If you don't, osci-render won't compile.
cd "$DIR/modules/LuaJIT/src"
if [[ "$OSTYPE" == "darwin"* ]]; then
make -j$(sysctl -n hw.logicalcpu) BUILDMODE=static MACOSX_DEPLOYMENT_TARGET=10.13
else
make -j$(nproc) BUILDMODE=static
fi

21
luajit_win.bat 100644
Wyświetl plik

@ -0,0 +1,21 @@
@echo off
if "%VisualStudioVersion%"=="" (
ECHO Visual Studio command line variables not detected!
ECHO This script will only work if you run it from a Visual Studio command line!
goto error_luajit
)
if /I "%VSTEL_MSBuildProjectFullPath:~-18%" neq "SharedCode.vcxproj" (
goto finish_luajit
)
cd ..\..\..\modules\LuaJIT\src
.\msvcbuild.bat static
goto finish_luajit
:error_luajit
timeout /T 10
:finish_luajit
@echo on

1
modules/LuaJIT 160000

@ -0,0 +1 @@
Subproject commit 871db2c84ecefd70a850e03a6c340214a81739f0

100
osci-render.jucer
Wyświetl plik

@ -6,7 +6,7 @@
cppLanguageStandard="20" projectLineFeed="&#10;" headerPath="./include"
version="2.5.1.1" companyName="James H Ball" companyWebsite="https://osci-render.com"
companyEmail="james@ball.sh" defines="NOMINMAX=1&#10;INTERNET_FLAG_NO_AUTO_REDIRECT=0&#10;OSCI_PREMIUM=1&#10;JUCE_USE_CUSTOM_PLUGIN_STANDALONE_APP=1&#10;JUCE_MODAL_LOOPS_PERMITTED=1"
pluginAUMainType="'aumf'">
pluginAUMainType="'aumf'" postExportShellCommandPosix="DIR=%%1%% %%1%%/luajit_linux_macos.sh ">
<MAINGROUP id="j5Ge2T" name="osci-render">
<GROUP id="{5ABCED88-0059-A7AF-9596-DBF91DDB0292}" name="Resources">
<GROUP id="{8930EC48-30FD-646B-9DC5-0861171F8B2E}" name="fonts">
@ -407,73 +407,6 @@
file="Source/ixwebsocket/IXWebSocketVersion.h"/>
</GROUP>
<GROUP id="{90BFF2D8-C8EE-510F-7993-421FDEEFA277}" name="lua">
<GROUP id="{48ED0B9A-609D-7DBC-26B7-D100F7245749}" name="lua">
<FILE id="reW6LF" name="lapi.c" compile="1" resource="0" file="Source/lua/lua/lapi.c"/>
<FILE id="y6wTEu" name="lapi.h" compile="0" resource="0" file="Source/lua/lua/lapi.h"/>
<FILE id="fbjV69" name="lauxlib.c" compile="1" resource="0" file="Source/lua/lua/lauxlib.c"/>
<FILE id="xeR3L4" name="lauxlib.h" compile="0" resource="0" file="Source/lua/lua/lauxlib.h"/>
<FILE id="tyfIH6" name="lbaselib.c" compile="1" resource="0" file="Source/lua/lua/lbaselib.c"/>
<FILE id="DaKxGG" name="lcode.c" compile="1" resource="0" file="Source/lua/lua/lcode.c"/>
<FILE id="lheIiL" name="lcode.h" compile="0" resource="0" file="Source/lua/lua/lcode.h"/>
<FILE id="UEhwiT" name="lcorolib.c" compile="1" resource="0" file="Source/lua/lua/lcorolib.c"/>
<FILE id="OPy1EB" name="lctype.c" compile="1" resource="0" file="Source/lua/lua/lctype.c"/>
<FILE id="fryrEr" name="lctype.h" compile="0" resource="0" file="Source/lua/lua/lctype.h"/>
<FILE id="bHUPPW" name="ldblib.c" compile="1" resource="0" file="Source/lua/lua/ldblib.c"/>
<FILE id="XlYtBV" name="ldebug.c" compile="1" resource="0" file="Source/lua/lua/ldebug.c"/>
<FILE id="vAb8NE" name="ldebug.h" compile="0" resource="0" file="Source/lua/lua/ldebug.h"/>
<FILE id="rD9LiE" name="ldo.c" compile="1" resource="0" file="Source/lua/lua/ldo.c"/>
<FILE id="gEaRAH" name="ldo.h" compile="0" resource="0" file="Source/lua/lua/ldo.h"/>
<FILE id="WJkF05" name="ldump.c" compile="1" resource="0" file="Source/lua/lua/ldump.c"/>
<FILE id="DgPsbd" name="lfunc.c" compile="1" resource="0" file="Source/lua/lua/lfunc.c"/>
<FILE id="znxihn" name="lfunc.h" compile="0" resource="0" file="Source/lua/lua/lfunc.h"/>
<FILE id="xGDelH" name="lgc.c" compile="1" resource="0" file="Source/lua/lua/lgc.c"/>
<FILE id="vxmneh" name="lgc.h" compile="0" resource="0" file="Source/lua/lua/lgc.h"/>
<FILE id="GMI2lH" name="linit.c" compile="1" resource="0" file="Source/lua/lua/linit.c"/>
<FILE id="bXgGvu" name="liolib.c" compile="1" resource="0" file="Source/lua/lua/liolib.c"/>
<FILE id="JYZsRj" name="ljumptab.h" compile="0" resource="0" file="Source/lua/lua/ljumptab.h"/>
<FILE id="MPzwjd" name="llex.c" compile="1" resource="0" file="Source/lua/lua/llex.c"/>
<FILE id="ZlS9jV" name="llex.h" compile="0" resource="0" file="Source/lua/lua/llex.h"/>
<FILE id="xxSacr" name="llimits.h" compile="0" resource="0" file="Source/lua/lua/llimits.h"/>
<FILE id="yZ9gsY" name="lmathlib.c" compile="1" resource="0" file="Source/lua/lua/lmathlib.c"/>
<FILE id="vepfiL" name="lmem.c" compile="1" resource="0" file="Source/lua/lua/lmem.c"/>
<FILE id="ogXP1X" name="lmem.h" compile="0" resource="0" file="Source/lua/lua/lmem.h"/>
<FILE id="hdpbrZ" name="loadlib.c" compile="1" resource="0" file="Source/lua/lua/loadlib.c"/>
<FILE id="Ae13uk" name="lobject.c" compile="1" resource="0" file="Source/lua/lua/lobject.c"/>
<FILE id="yVQOFR" name="lobject.h" compile="0" resource="0" file="Source/lua/lua/lobject.h"/>
<FILE id="Yjl2jU" name="lopcodes.c" compile="1" resource="0" file="Source/lua/lua/lopcodes.c"/>
<FILE id="WrOMUG" name="lopcodes.h" compile="0" resource="0" file="Source/lua/lua/lopcodes.h"/>
<FILE id="Mcf4k0" name="lopnames.h" compile="0" resource="0" file="Source/lua/lua/lopnames.h"/>
<FILE id="IxVaWn" name="loslib.c" compile="1" resource="0" file="Source/lua/lua/loslib.c"/>
<FILE id="PT6prM" name="lparser.c" compile="1" resource="0" file="Source/lua/lua/lparser.c"/>
<FILE id="glxbom" name="lparser.h" compile="0" resource="0" file="Source/lua/lua/lparser.h"/>
<FILE id="mhS3hR" name="lprefix.h" compile="0" resource="0" file="Source/lua/lua/lprefix.h"/>
<FILE id="QUU8pb" name="lstate.c" compile="1" resource="0" file="Source/lua/lua/lstate.c"/>
<FILE id="nLiPGo" name="lstate.h" compile="0" resource="0" file="Source/lua/lua/lstate.h"/>
<FILE id="ACSLBM" name="lstring.c" compile="1" resource="0" file="Source/lua/lua/lstring.c"/>
<FILE id="mfaeJ4" name="lstring.h" compile="0" resource="0" file="Source/lua/lua/lstring.h"/>
<FILE id="qUaJcc" name="lstrlib.c" compile="1" resource="0" file="Source/lua/lua/lstrlib.c"/>
<FILE id="H79BnO" name="ltable.c" compile="1" resource="0" file="Source/lua/lua/ltable.c"/>
<FILE id="QWr3bh" name="ltable.h" compile="0" resource="0" file="Source/lua/lua/ltable.h"/>
<FILE id="C6dr1W" name="ltablib.c" compile="1" resource="0" file="Source/lua/lua/ltablib.c"/>
<FILE id="Dqa8zj" name="ltests.c" compile="1" resource="0" file="Source/lua/lua/ltests.c"/>
<FILE id="PSAt8D" name="ltests.h" compile="0" resource="0" file="Source/lua/lua/ltests.h"/>
<FILE id="wlxeWJ" name="ltm.c" compile="1" resource="0" file="Source/lua/lua/ltm.c"/>
<FILE id="WrmVGh" name="ltm.h" compile="0" resource="0" file="Source/lua/lua/ltm.h"/>
<FILE id="tNTcX7" name="lua.c" compile="1" resource="0" file="Source/lua/lua/lua.c"/>
<FILE id="VNMXFl" name="lua.h" compile="0" resource="0" file="Source/lua/lua/lua.h"/>
<FILE id="Bxx6Ju" name="luaconf.h" compile="0" resource="0" file="Source/lua/lua/luaconf.h"/>
<FILE id="uyv67S" name="lualib.h" compile="0" resource="0" file="Source/lua/lua/lualib.h"/>
<FILE id="mSI25W" name="lundump.c" compile="1" resource="0" file="Source/lua/lua/lundump.c"/>
<FILE id="wzaUVI" name="lundump.h" compile="0" resource="0" file="Source/lua/lua/lundump.h"/>
<FILE id="ImkHXE" name="lutf8lib.c" compile="1" resource="0" file="Source/lua/lua/lutf8lib.c"/>
<FILE id="IWMeha" name="lvm.c" compile="1" resource="0" file="Source/lua/lua/lvm.c"/>
<FILE id="maQFOJ" name="lvm.h" compile="0" resource="0" file="Source/lua/lua/lvm.h"/>
<FILE id="JIpgrH" name="lzio.c" compile="1" resource="0" file="Source/lua/lua/lzio.c"/>
<FILE id="bm8hWL" name="lzio.h" compile="0" resource="0" file="Source/lua/lua/lzio.h"/>
<FILE id="uiz8kq" name="onelua.c" compile="1" resource="0" file="Source/lua/lua/onelua.c"/>
</GROUP>
<FILE id="abPiYS" name="luaimport.cpp" compile="1" resource="0" file="Source/lua/luaimport.cpp"/>
<FILE id="Q0Kb3f" name="luaimport.h" compile="0" resource="0" file="Source/lua/luaimport.h"/>
<FILE id="WKSBg8" name="LuaParser.cpp" compile="1" resource="0" file="Source/lua/LuaParser.cpp"/>
<FILE id="E4ORpe" name="LuaParser.h" compile="0" resource="0" file="Source/lua/LuaParser.h"/>
</GROUP>
@ -737,10 +670,12 @@
JUCE_WEB_BROWSER="0"/>
<EXPORTFORMATS>
<LINUX_MAKE targetFolder="Builds/osci-render/LinuxMakefile" smallIcon="pSc1mq"
bigIcon="pSc1mq">
bigIcon="pSc1mq" externalLibraries="luajit">
<CONFIGURATIONS>
<CONFIGURATION isDebug="1" name="Debug" targetName="osci-render"/>
<CONFIGURATION isDebug="0" name="Release" targetName="osci-render"/>
<CONFIGURATION isDebug="1" name="Debug" targetName="osci-render" headerPath="../../../modules/LuaJIT/src"
libraryPath="../../../modules/LuaJIT/src"/>
<CONFIGURATION isDebug="0" name="Release" targetName="osci-render" headerPath="../../../modules/LuaJIT/src"
libraryPath="../../../modules/LuaJIT/src"/>
</CONFIGURATIONS>
<MODULEPATHS>
<MODULEPATH id="juce_audio_basics" path="../../../JUCE/modules"/>
@ -773,11 +708,15 @@
</LINUX_MAKE>
<VS2022 targetFolder="Builds/osci-render/VisualStudio2022" smallIcon="pSc1mq"
bigIcon="pSc1mq" extraCompilerFlags="/wd4005 /wd4244 /wd4305 /wd4584"
extraLinkerFlags="/IGNORE:4006">
extraLinkerFlags="/IGNORE:4006" externalLibraries="lua51.lib">
<CONFIGURATIONS>
<CONFIGURATION isDebug="1" name="Debug" targetName="osci-render" winWarningLevel="2"/>
<CONFIGURATION isDebug="1" name="Debug" targetName="osci-render" winWarningLevel="2"
libraryPath="..\..\..\modules\LuaJIT\src" headerPath="..\..\..\modules\LuaJIT\src"
prebuildCommand="..\..\..\luajit_win.bat"/>
<CONFIGURATION isDebug="0" name="Release" targetName="osci-render" alwaysGenerateDebugSymbols="1"
debugInformationFormat="ProgramDatabase" winWarningLevel="2"/>
debugInformationFormat="ProgramDatabase" winWarningLevel="2"
libraryPath="..\..\..\modules\LuaJIT\src" headerPath="..\..\..\modules\LuaJIT\src"
prebuildCommand="..\..\..\luajit_win.bat"/>
</CONFIGURATIONS>
<MODULEPATHS>
<MODULEPATH id="juce_audio_basics" path="../../../JUCE/modules"/>
@ -813,15 +752,18 @@
bigIcon="aZXbCi" applicationCategory="public.app-category.music"
microphonePermissionNeeded="1" frameworkSearchPaths="/Library/Frameworks"
extraCustomFrameworks="/Library/Frameworks/Syphon.framework"
hardenedRuntime="1" hardenedRuntimeOptions="com.apple.security.cs.disable-library-validation,com.apple.security.device.audio-input"
iosDevelopmentTeamID="D86A3M3H2L">
hardenedRuntime="1" hardenedRuntimeOptions="com.apple.security.cs.allow-jit,com.apple.security.cs.disable-library-validation,com.apple.security.device.audio-input"
externalLibraries="luajit" iosDevelopmentTeamID="D86A3M3H2L">
<CONFIGURATIONS>
<CONFIGURATION isDebug="1" name="Debug" targetName="osci-render" customXcodeFlags="LD_RUNPATH_SEARCH_PATHS = '/Library/Frameworks',OTHER_CODE_SIGN_FLAGS = --timestamp --force --deep"
codeSigningIdentity="Developer ID Application: James Ball (D86A3M3H2L)"/>
headerPath="../../../modules/LuaJIt/src" libraryPath="../../../modules/LuaJIt/src"
codeSigningIdentity="&quot;Developer ID Application: James Ball (D86A3M3H2L)&quot;"/>
<CONFIGURATION name="Release" targetName="osci-render" customXcodeFlags="LD_RUNPATH_SEARCH_PATHS = '/Library/Frameworks',CODE_SIGN_INJECT_BASE_ENTITLEMENTS=NO,OTHER_CODE_SIGN_FLAGS = --timestamp --force --deep"
codeSigningIdentity="Developer ID Application: James Ball (D86A3M3H2L)"/>
headerPath="../../../modules/LuaJIt/src" libraryPath="../../../modules/LuaJIt/src"
codeSigningIdentity="&quot;Developer ID Application: James Ball (D86A3M3H2L)&quot;"/>
<CONFIGURATION name="Release (Development)" targetName="osci-render" customXcodeFlags="LD_RUNPATH_SEARCH_PATHS = '/Library/Frameworks',OTHER_CODE_SIGN_FLAGS = --timestamp --force --deep"
codeSigningIdentity="Developer ID Application: James Ball (D86A3M3H2L)"/>
headerPath="../../../modules/LuaJIt/src" libraryPath="../../../modules/LuaJIt/src"
codeSigningIdentity="&quot;Developer ID Application: James Ball (D86A3M3H2L)&quot;"/>
</CONFIGURATIONS>
<MODULEPATHS>
<MODULEPATH id="juce_audio_basics" path="../../../JUCE/modules"/>