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 std::function 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=" " headerPath="./include" version="2.5.1.1" companyName="James H Ball" companyWebsite="https://osci-render.com" companyEmail="james@ball.sh" defines="NOMINMAX=1 INTERNET_FLAG_NO_AUTO_REDIRECT=0 OSCI_PREMIUM=1 JUCE_USE_CUSTOM_PLUGIN_STANDALONE_APP=1 JUCE_MODAL_LOOPS_PERMITTED=1" - pluginAUMainType="'aumf'"> + pluginAUMainType="'aumf'" postExportShellCommandPosix="cd %%1%%; .\luajit_linux_macos.sh "> @@ -628,10 +628,12 @@ JUCE_WEB_BROWSER="0"/> + bigIcon="pSc1mq" externalLibraries="lua51"> - - + + @@ -666,12 +668,12 @@ extraLinkerFlags="/IGNORE:4006" externalLibraries="lua51.lib"> + libraryPath="..\..\..\modules\LuaJIT\src" headerPath="..\..\..\modules\LuaJIT\src" + prebuildCommand="..\..\..\luajit_win.bat"/> + libraryPath="..\..\..\modules\LuaJIT\src" headerPath="..\..\..\modules\LuaJIT\src" + prebuildCommand="..\..\..\luajit_win.bat"/> @@ -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 == *"Shared Code"* ]]; then cd ..\..\..\modules\LuaJIT\src make -j$(nproc) fi" - externalLibraries="lua51"> + iosDevelopmentTeamID="D86A3M3H2L" externalLibraries="lua51">