From 59629bc1a89f8c516263faaee29e8a8ac0c90336 Mon Sep 17 00:00:00 2001
From: DJLevel3 <zachcommercialmail@gmail.com>
Date: Sat, 16 Aug 2025 07:55:27 -0600
Subject: [PATCH] Make LuaJIT build a little more robust

---
 Source/lua/LuaParser.cpp                 |  4 ++--
 luajit_linux.sh => luajit_linux_macos.sh |  0
 osci-render.jucer                        | 21 +++++++++++----------
 3 files changed, 13 insertions(+), 12 deletions(-)
 rename luajit_linux.sh => luajit_linux_macos.sh (100%)

diff --git a/Source/lua/LuaParser.cpp b/Source/lua/LuaParser.cpp
index 7fa9219..98a4840 100644
--- a/Source/lua/LuaParser.cpp
+++ b/Source/lua/LuaParser.cpp
@@ -1,8 +1,8 @@
 #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!
-// On Windows and MacOS, this will be done automatically as a pre-build step when you compile SharedCode.
-// On Linux, you'll have to run the shell script "luajit_linux.sh" in the root of the Git repository.
+// 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;
diff --git a/luajit_linux.sh b/luajit_linux_macos.sh
similarity index 100%
rename from luajit_linux.sh
rename to luajit_linux_macos.sh
diff --git a/osci-render.jucer b/osci-render.jucer
index 5aabc9d..0573ef5 100644
--- a/osci-render.jucer
+++ b/osci-render.jucer
@@ -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="cd %%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">
@@ -628,10 +628,12 @@
                JUCE_WEB_BROWSER="0"/>
   <EXPORTFORMATS>
     <LINUX_MAKE targetFolder="Builds/osci-render/LinuxMakefile" smallIcon="pSc1mq"
-                bigIcon="pSc1mq">
+                bigIcon="pSc1mq" externalLibraries="lua51">
       <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"/>
@@ -666,12 +668,12 @@
             extraLinkerFlags="/IGNORE:4006" externalLibraries="lua51.lib">
       <CONFIGURATIONS>
         <CONFIGURATION isDebug="1" name="Debug" targetName="osci-render" winWarningLevel="2"
-                       prebuildCommand="..\..\..\luajit_win.bat" libraryPath="..\..\..\modules\LuaJIT\src"
-                       headerPath="..\..\..\modules\LuaJIT\src"/>
+                       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"
-                       prebuildCommand="..\..\..\luajit_win.bat" libraryPath="..\..\..\modules\LuaJIT\src"
-                       headerPath="..\..\..\modules\LuaJIT\src"/>
+                       libraryPath="..\..\..\modules\LuaJIT\src" headerPath="..\..\..\modules\LuaJIT\src"
+                       prebuildCommand="..\..\..\luajit_win.bat"/>
       </CONFIGURATIONS>
       <MODULEPATHS>
         <MODULEPATH id="juce_audio_basics" path="../../../JUCE/modules"/>
@@ -707,8 +709,7 @@
                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" prebuildCommand="if [[ $TARGET_NAME == *&quot;Shared Code&quot;* ]]; then&#10;    cd ..\..\..\modules\LuaJIT\src&#10;    make -j$(nproc)&#10;fi"
-               externalLibraries="lua51">
+               iosDevelopmentTeamID="D86A3M3H2L" externalLibraries="lua51">
       <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)"