kopia lustrzana https://github.com/jameshball/osci-render
Merge develop
James H Ball
commit
b8f243f335
|
|
@ -67,7 +67,7 @@ jobs:
|
|||
- uses: maxim-lobanov/setup-xcode@v1
|
||||
with:
|
||||
xcode-version: latest
|
||||
|
||||
|
||||
- name: Import application certificates
|
||||
uses: apple-actions/import-codesign-certs@v3
|
||||
with:
|
||||
|
|
|
|||
|
|
@ -7,10 +7,11 @@
|
|||
[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 "modules/melatonin_inspector"]
|
||||
path = modules/melatonin_inspector
|
||||
url = https://github.com/sudara/melatonin_inspector.git
|
||||
branch = main
|
||||
[submodule "LuaJIT"]
|
||||
path = modules/LuaJIT
|
||||
url = https://luajit.org/git/luajit.git
|
||||
ignore = untracked
|
||||
|
|
|
|||
|
|
@ -8,10 +8,13 @@ SosciMainMenuBarModel::SosciMainMenuBarModel(SosciPluginEditor& e, SosciAudioPro
|
|||
}
|
||||
|
||||
void SosciMainMenuBarModel::resetMenuItems() {
|
||||
MainMenuBarModel::resetMenuItems();
|
||||
|
||||
addTopLevelMenu("File");
|
||||
addTopLevelMenu("About");
|
||||
addTopLevelMenu("Video");
|
||||
addTopLevelMenu("Audio");
|
||||
addTopLevelMenu("Interface");
|
||||
|
||||
std::vector<std::tuple<juce::String, const void*, int>> examples = {
|
||||
{"default.sosci", BinaryData::default_sosci, BinaryData::default_sosciSize},
|
||||
|
|
@ -111,8 +114,7 @@ void SosciMainMenuBarModel::resetMenuItems() {
|
|||
}
|
||||
|
||||
// Interface menu index depends on whether Audio menu exists
|
||||
int interfaceMenuIndex = (editor.processor.wrapperType == juce::AudioProcessor::WrapperType::wrapperType_Standalone) ? 4 : 3;
|
||||
addToggleMenuItem(interfaceMenuIndex, "Listen for Special Keys", [this] {
|
||||
addToggleMenuItem(4, "Listen for Special Keys", [this] {
|
||||
processor.setAcceptsKeys(! processor.getAcceptsKeys());
|
||||
resetMenuItems();
|
||||
}, [this] { return processor.getAcceptsKeys(); });
|
||||
|
|
|
|||
|
|
@ -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 +0,0 @@
|
|||
Subproject commit 3dbb1a4b894c0744a331d4319d8d1704dc4ad943
|
||||
|
|
@ -1 +0,0 @@
|
|||
#include "luaimport.h"
|
||||
|
|
@ -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
|
||||
|
|
@ -22,13 +22,13 @@ eval "$RESAVE_COMMAND"
|
|||
# Build mac version
|
||||
if [ "$OS" = "mac" ]; then
|
||||
cd "$ROOT/Builds/$PLUGIN/MacOSX"
|
||||
xcodebuild -configuration Release || exit 1
|
||||
xcodebuild -configuration Release -parallelizeTargets -jobs $(sysctl -n hw.logicalcpu) || exit 1
|
||||
fi
|
||||
|
||||
# Build linux version
|
||||
if [ "$OS" = "linux" ]; then
|
||||
cd "$ROOT/Builds/$PLUGIN/LinuxMakefile"
|
||||
make CONFIG=Release
|
||||
make -j$(nproc) CONFIG=Release
|
||||
|
||||
cp -r ./build/$PLUGIN.vst3 "$ROOT/ci/bin/$PLUGIN.vst3"
|
||||
cp -r ./build/$PLUGIN "$ROOT/ci/bin/$PLUGIN"
|
||||
|
|
@ -44,11 +44,10 @@ fi
|
|||
if [ "$OS" = "win" ]; then
|
||||
VS_WHERE="C:/Program Files (x86)/Microsoft Visual Studio/Installer/vswhere.exe"
|
||||
|
||||
MSBUILD_EXE=$("$VS_WHERE" -latest -requires Microsoft.Component.MSBuild -find "MSBuild\**\Bin\MSBuild.exe")
|
||||
echo $MSBUILD_EXE
|
||||
eval "$($(cygpath "$COMSPEC") /c$(cygpath -w "$ROOT/ci/vcvars_export.bat"))"
|
||||
|
||||
cd "$ROOT/Builds/$PLUGIN/VisualStudio2022"
|
||||
"$MSBUILD_EXE" "$PLUGIN.sln" "//p:VisualStudioVersion=16.0" "//m" "//t:Build" "//p:Configuration=Release" "//p:Platform=x64" "//p:PreferredToolArchitecture=x64" "//restore" "//p:RestorePackagesConfig=true"
|
||||
msbuild.exe "//m" "$PLUGIN.sln" "//p:VisualStudioVersion=16.0" "//p:MultiProcessorCompilation=true" "//p:CL_MPCount=16" "//p:BuildInParallel=true" "//t:Build" "//p:Configuration=Release" "//p:Platform=x64" "//p:PreferredToolArchitecture=x64" "//restore" "//p:RestorePackagesConfig=true"
|
||||
cp "$ROOT/Builds/$PLUGIN/VisualStudio2022/x64/Release/Standalone Plugin/$PLUGIN.pdb" "$ROOT/bin/$OUTPUT_NAME.pdb"
|
||||
fi
|
||||
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ fi
|
|||
|
||||
curl -s -S -L "https://api.juce.com/api/v1/download/juce/latest/$PROJUCER_OS" -o Projucer.zip
|
||||
# curl -s -S -L "https://github.com/juce-framework/JUCE/releases/download/8.0.4/juce-8.0.4-$PROJUCER_OS.zip" -o Projucer.zip
|
||||
unzip Projucer.zip
|
||||
unzip -q Projucer.zip
|
||||
|
||||
# Set Projucer path based on OS
|
||||
if [ "$OS" = "mac" ]; then
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ eval "$RESAVE_COMMAND"
|
|||
# Build mac version
|
||||
if [ "$OS" = "mac" ]; then
|
||||
cd "$ROOT/Builds/Test/MacOSX"
|
||||
xcodebuild -configuration Release || exit 1
|
||||
xcodebuild -configuration Release -parallelizeTargets -jobs $(sysctl -n hw.logicalcpu) || exit 1
|
||||
cd "build/Release"
|
||||
find .
|
||||
echo "Running the test"
|
||||
|
|
@ -20,7 +20,7 @@ fi
|
|||
# Build linux version
|
||||
if [ "$OS" = "linux" ]; then
|
||||
cd "$ROOT/Builds/Test/LinuxMakefile"
|
||||
make CONFIG=Release
|
||||
make -j$(nproc) CONFIG=Release
|
||||
|
||||
cd build
|
||||
echo "Running the test"
|
||||
|
|
@ -36,7 +36,7 @@ if [ "$OS" = "win" ]; then
|
|||
echo $MSBUILD_EXE
|
||||
|
||||
cd "$ROOT/Builds/Test/VisualStudio2022"
|
||||
"$MSBUILD_EXE" "$PLUGIN.sln" "//p:VisualStudioVersion=16.0" "//m" "//t:Build" "//p:Configuration=Release" "//p:Platform=x64" "//p:PreferredToolArchitecture=x64"
|
||||
"$MSBUILD_EXE" "//m" "$PLUGIN.sln" "//p:MultiProcessorCompilation=true" "//p:CL_MPCount=32" "//p:VisualStudioVersion=16.0" "//t:Build" "//p:Configuration=Release" "//p:Platform=x64" "//p:PreferredToolArchitecture=x64"
|
||||
|
||||
cd "x64/Release/ConsoleApp"
|
||||
echo "Running the test"
|
||||
|
|
|
|||
|
|
@ -0,0 +1,7 @@
|
|||
@echo off
|
||||
|
||||
set VSWHERE="C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere"
|
||||
for /f "tokens=*" %%i in ('%VSWHERE% -latest -property installationPath') do set VSWHERE2=%%i
|
||||
|
||||
call "%VSWHERE2%\VC\Auxiliary\Build\vcvars64.bat" > nul
|
||||
bash -c "export -p"
|
||||
|
|
@ -0,0 +1,62 @@
|
|||
#!/bin/bash
|
||||
|
||||
# Build LuaJIT for Linux or macOS (produces universal static lib on macOS).
|
||||
# Safe to run multiple times; always re-build cleanly for each architecture.
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
# Resolve DIR (allow user override). Prefer script directory so you can invoke from anywhere.
|
||||
: "${DIR:=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}"
|
||||
|
||||
LUAJIT_SRC="$DIR/modules/LuaJIT/src"
|
||||
if [[ ! -d "$LUAJIT_SRC" ]]; then
|
||||
echo "Error: LuaJIT source directory not found: $LUAJIT_SRC" >&2
|
||||
echo "(Did you forget to init submodules or place LuaJIT under modules/LuaJIT?)" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
cd "$LUAJIT_SRC"
|
||||
|
||||
if [[ "$OSTYPE" == "darwin"* ]]; then
|
||||
echo "Building LuaJIT universal binary (x86_64 + arm64)..."
|
||||
|
||||
# Allow caller to override; default minimum version.
|
||||
export MACOSX_DEPLOYMENT_TARGET="${MACOSX_DEPLOYMENT_TARGET:-10.13}"
|
||||
CPUs=$(sysctl -n hw.logicalcpu)
|
||||
|
||||
# Remove any previous fat/intermediate libs to avoid accidental reuse.
|
||||
rm -f libluajit_x86_64.a libluajit_arm64.a libluajit.a
|
||||
|
||||
# Function to build one architecture.
|
||||
build_arch() {
|
||||
local ARCH="$1" TARGET_NAME="$2"
|
||||
echo "-- Building $ARCH ..."
|
||||
make clean || true # ignore if already clean
|
||||
MACOSX_DEPLOYMENT_TARGET=$MACOSX_DEPLOYMENT_TARGET \
|
||||
make -j"$CPUs" \
|
||||
LUAJIT_T="$TARGET_NAME" \
|
||||
BUILDMODE=static \
|
||||
CC="clang -arch $ARCH -mmacosx-version-min=$MACOSX_DEPLOYMENT_TARGET" \
|
||||
XCFLAGS="-mmacosx-version-min=$MACOSX_DEPLOYMENT_TARGET" \
|
||||
|| { echo "Build failed for $ARCH" >&2; exit 2; }
|
||||
mv libluajit.a "libluajit_${ARCH}.a"
|
||||
echo "-- Built $ARCH OK"
|
||||
}
|
||||
|
||||
build_arch x86_64 luajit-x86_64
|
||||
build_arch arm64 luajit-arm64
|
||||
|
||||
echo "-- Creating universal libluajit.a"
|
||||
lipo -create -output libluajit.a libluajit_x86_64.a libluajit_arm64.a
|
||||
lipo -info libluajit.a || true
|
||||
echo "Universal libluajit.a created."
|
||||
else
|
||||
# Linux path
|
||||
CPUs="${NPROC:-$(getconf _NPROCESSORS_ONLN 2>/dev/null || nproc 2>/dev/null || echo 1)}"
|
||||
echo "Building LuaJIT static library for Linux with $CPUs threads..."
|
||||
make clean || true
|
||||
make -j"$CPUs" BUILDMODE=static XCFLAGS="-fPIC"
|
||||
echo "Linux libluajit.a built."
|
||||
fi
|
||||
|
||||
echo "Done."
|
||||
|
|
@ -0,0 +1,22 @@
|
|||
@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
|
||||
call .\msvcbuild.bat static
|
||||
copy /b lua51.lib luajit51.lib
|
||||
goto finish_luajit
|
||||
|
||||
:error_luajit
|
||||
|
||||
timeout 10
|
||||
|
||||
:finish_luajit
|
||||
@echo on
|
||||
|
|
@ -0,0 +1 @@
|
|||
Subproject commit 871db2c84ecefd70a850e03a6c340214a81739f0
|
||||
|
|
@ -1 +1 @@
|
|||
Subproject commit 17edebcc64d9dc96a9c0b0c7e9b9bd1673a585f9
|
||||
Subproject commit ffc70ba399f9afaeefb996eb14e55a1d487270b8
|
||||
|
|
@ -4,9 +4,9 @@
|
|||
addUsingNamespaceToJuceHeader="0" jucerFormatVersion="1" pluginCharacteristicsValue="pluginWantsMidiIn"
|
||||
pluginManufacturer="jameshball" aaxIdentifier="sh.ball.oscirender"
|
||||
cppLanguageStandard="20" projectLineFeed=" " headerPath="./include"
|
||||
version="2.5.1.1" companyName="James H Ball" companyWebsite="https://osci-render.com"
|
||||
version="2.6.0.0" 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="echo "Building LuaJIT for $OSTYPE..." && DIR=%%1%% %%1%%/luajit_linux_macos.sh ">
|
||||
<MAINGROUP id="j5Ge2T" name="osci-render">
|
||||
<GROUP id="{5ABCED88-0059-A7AF-9596-DBF91DDB0292}" name="Resources">
|
||||
<GROUP id="{17F5509B-A3D9-D161-3F5C-4DC2E1C335E7}" name="audio">
|
||||
|
|
@ -422,73 +422,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>
|
||||
|
|
@ -749,10 +682,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"/>
|
||||
|
|
@ -786,11 +721,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="luajit51.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="call ..\..\..\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="call ..\..\..\luajit_win.bat" enablePluginBinaryCopyStep="0"/>
|
||||
</CONFIGURATIONS>
|
||||
<MODULEPATHS>
|
||||
<MODULEPATH id="juce_audio_basics" path="../../../JUCE/modules"/>
|
||||
|
|
@ -827,15 +766,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"
|
||||
userNotes="D86A3M3H2L">
|
||||
hardenedRuntime="1" hardenedRuntimeOptions="com.apple.security.cs.allow-jit,com.apple.security.cs.allow-unsigned-executable-memory,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"
|
||||
userNotes="Developer ID Application: James Ball (D86A3M3H2L)"/>
|
||||
headerPath="../../../modules/LuaJIt/src" libraryPath="../../../modules/LuaJIt/src"
|
||||
codeSigningIdentity="Developer ID Application: James Ball (D86A3M3H2L)"/>
|
||||
<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"
|
||||
headerPath="../../../modules/LuaJIt/src" libraryPath="../../../modules/LuaJIt/src"
|
||||
codeSigningIdentity="Developer ID Application: James Ball (D86A3M3H2L)"/>
|
||||
<CONFIGURATION name="Release (Development)" targetName="osci-render" customXcodeFlags="LD_RUNPATH_SEARCH_PATHS = '/Library/Frameworks',OTHER_CODE_SIGN_FLAGS = --timestamp --force --deep"
|
||||
userNotes="Developer ID Application: James Ball (D86A3M3H2L)"/>
|
||||
headerPath="../../../modules/LuaJIt/src" libraryPath="../../../modules/LuaJIt/src"
|
||||
codeSigningIdentity="Developer ID Application: James Ball (D86A3M3H2L)"/>
|
||||
</CONFIGURATIONS>
|
||||
<MODULEPATHS>
|
||||
<MODULEPATH id="juce_audio_basics" path="../../../JUCE/modules"/>
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
<JUCERPROJECT id="HH2E72" name="sosci" projectType="audioplug" useAppConfig="0"
|
||||
addUsingNamespaceToJuceHeader="0" jucerFormatVersion="1" pluginManufacturer="jameshball"
|
||||
aaxIdentifier="sh.ball.sosci" cppLanguageStandard="20" projectLineFeed=" "
|
||||
headerPath="./include" version="1.1.7.1" companyName="James H Ball"
|
||||
headerPath="./include" version="1.1.8.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"
|
||||
pluginManufacturerCode="Jhba" pluginCode="Sosc" pluginAUMainType="'aufx'">
|
||||
|
|
|
|||
Ładowanie…
Reference in New Issue