Make LuaJIT build a little more robust

pull/312/head
DJLevel3 2025-08-16 07:55:27 -06:00
rodzic 40f1f602d7
commit 59629bc1a8
3 zmienionych plików z 13 dodań i 12 usunięć

Wyświetl plik

@ -1,8 +1,8 @@
#include "LuaParser.h" #include "LuaParser.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! // 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 Windows and MacOS, this will be done automatically as a pre-build step when you compile SharedCode. // On all platforms, this should be done automatically when you run the export.
// On Linux, you'll have to run the shell script "luajit_linux.sh" in the root of the Git repository. // If not, use the luajit_win.bat or luajit_linux_macos.sh scripts in the git root from the dev environment.
#include <lua.hpp> #include <lua.hpp>
std::function<void(const std::string&)> LuaParser::onPrint; std::function<void(const std::string&)> LuaParser::onPrint;

Wyświetl plik

@ -6,7 +6,7 @@
cppLanguageStandard="20" projectLineFeed="&#10;" headerPath="./include" cppLanguageStandard="20" projectLineFeed="&#10;" headerPath="./include"
version="2.5.1.1" companyName="James H Ball" companyWebsite="https://osci-render.com" 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" 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="cd %%1%%; .\luajit_linux_macos.sh ">
<MAINGROUP id="j5Ge2T" name="osci-render"> <MAINGROUP id="j5Ge2T" name="osci-render">
<GROUP id="{5ABCED88-0059-A7AF-9596-DBF91DDB0292}" name="Resources"> <GROUP id="{5ABCED88-0059-A7AF-9596-DBF91DDB0292}" name="Resources">
<GROUP id="{8930EC48-30FD-646B-9DC5-0861171F8B2E}" name="fonts"> <GROUP id="{8930EC48-30FD-646B-9DC5-0861171F8B2E}" name="fonts">
@ -628,10 +628,12 @@
JUCE_WEB_BROWSER="0"/> JUCE_WEB_BROWSER="0"/>
<EXPORTFORMATS> <EXPORTFORMATS>
<LINUX_MAKE targetFolder="Builds/osci-render/LinuxMakefile" smallIcon="pSc1mq" <LINUX_MAKE targetFolder="Builds/osci-render/LinuxMakefile" smallIcon="pSc1mq"
bigIcon="pSc1mq"> bigIcon="pSc1mq" externalLibraries="lua51">
<CONFIGURATIONS> <CONFIGURATIONS>
<CONFIGURATION isDebug="1" name="Debug" targetName="osci-render"/> <CONFIGURATION isDebug="1" name="Debug" targetName="osci-render" headerPath="..\..\..\modules\LuaJIT\src"
<CONFIGURATION isDebug="0" name="Release" targetName="osci-render"/> libraryPath="..\..\..\modules\LuaJIT\src"/>
<CONFIGURATION isDebug="0" name="Release" targetName="osci-render" headerPath="..\..\..\modules\LuaJIT\src"
libraryPath="..\..\..\modules\LuaJIT\src"/>
</CONFIGURATIONS> </CONFIGURATIONS>
<MODULEPATHS> <MODULEPATHS>
<MODULEPATH id="juce_audio_basics" path="../../../JUCE/modules"/> <MODULEPATH id="juce_audio_basics" path="../../../JUCE/modules"/>
@ -666,12 +668,12 @@
extraLinkerFlags="/IGNORE:4006" externalLibraries="lua51.lib"> extraLinkerFlags="/IGNORE:4006" externalLibraries="lua51.lib">
<CONFIGURATIONS> <CONFIGURATIONS>
<CONFIGURATION isDebug="1" name="Debug" targetName="osci-render" winWarningLevel="2" <CONFIGURATION isDebug="1" name="Debug" targetName="osci-render" winWarningLevel="2"
prebuildCommand="..\..\..\luajit_win.bat" libraryPath="..\..\..\modules\LuaJIT\src" libraryPath="..\..\..\modules\LuaJIT\src" headerPath="..\..\..\modules\LuaJIT\src"
headerPath="..\..\..\modules\LuaJIT\src"/> prebuildCommand="..\..\..\luajit_win.bat"/>
<CONFIGURATION isDebug="0" name="Release" targetName="osci-render" alwaysGenerateDebugSymbols="1" <CONFIGURATION isDebug="0" name="Release" targetName="osci-render" alwaysGenerateDebugSymbols="1"
debugInformationFormat="ProgramDatabase" winWarningLevel="2" debugInformationFormat="ProgramDatabase" winWarningLevel="2"
prebuildCommand="..\..\..\luajit_win.bat" libraryPath="..\..\..\modules\LuaJIT\src" libraryPath="..\..\..\modules\LuaJIT\src" headerPath="..\..\..\modules\LuaJIT\src"
headerPath="..\..\..\modules\LuaJIT\src"/> prebuildCommand="..\..\..\luajit_win.bat"/>
</CONFIGURATIONS> </CONFIGURATIONS>
<MODULEPATHS> <MODULEPATHS>
<MODULEPATH id="juce_audio_basics" path="../../../JUCE/modules"/> <MODULEPATH id="juce_audio_basics" path="../../../JUCE/modules"/>
@ -707,8 +709,7 @@
microphonePermissionNeeded="1" frameworkSearchPaths="/Library/Frameworks" microphonePermissionNeeded="1" frameworkSearchPaths="/Library/Frameworks"
extraCustomFrameworks="/Library/Frameworks/Syphon.framework" extraCustomFrameworks="/Library/Frameworks/Syphon.framework"
hardenedRuntime="1" hardenedRuntimeOptions="com.apple.security.cs.disable-library-validation,com.apple.security.device.audio-input" hardenedRuntime="1" hardenedRuntimeOptions="com.apple.security.cs.disable-library-validation,com.apple.security.device.audio-input"
iosDevelopmentTeamID="D86A3M3H2L" prebuildCommand="if [[ $TARGET_NAME == *&quot;Shared Code&quot;* ]]; then&#10; cd ..\..\..\modules\LuaJIT\src&#10; make -j$(nproc)&#10;fi" iosDevelopmentTeamID="D86A3M3H2L" externalLibraries="lua51">
externalLibraries="lua51">
<CONFIGURATIONS> <CONFIGURATIONS>
<CONFIGURATION isDebug="1" name="Debug" targetName="osci-render" customXcodeFlags="LD_RUNPATH_SEARCH_PATHS = '/Library/Frameworks',OTHER_CODE_SIGN_FLAGS = --timestamp --force --deep" <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)" codeSigningIdentity="Developer ID Application: James Ball (D86A3M3H2L)"