From 2126435e8cdbcfcfd8ac6f46b718f0dfa7530719 Mon Sep 17 00:00:00 2001 From: umberto-sonnino Date: Fri, 26 Jan 2024 10:45:32 +0000 Subject: [PATCH] Build Android deps with audio Diffs= fddb050ca Build Android deps with audio (#6515) Co-authored-by: Umberto Sonnino --- .rive_head | 2 +- build/premake5.lua | 5 +++++ dependencies/premake5_miniaudio.lua | 4 +++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.rive_head b/.rive_head index bdc326a8..549db38d 100644 --- a/.rive_head +++ b/.rive_head @@ -1 +1 @@ -5cfc226f2444c9bef5f8ce06ef4d8cacde53f41c +fddb050ca322c797dbbd01292f7d4f2b568eb627 diff --git a/build/premake5.lua b/build/premake5.lua index d17c9996..9580b97e 100644 --- a/build/premake5.lua +++ b/build/premake5.lua @@ -127,6 +127,11 @@ do do targetdir '%{cfg.system}/x86/bin/%{cfg.buildcfg}' objdir '%{cfg.system}/x86/obj/%{cfg.buildcfg}' + -- Ignore fatal warning for miniaudio on x86 devices. + filter {'files:../src/audio/audio_engine.cpp'} + do + buildoptions {'-Wno-atomic-alignment'} + end end filter {'system:android', 'options:arch=x64'} diff --git a/dependencies/premake5_miniaudio.lua b/dependencies/premake5_miniaudio.lua index aa9e5b28..b8cf0a9f 100644 --- a/dependencies/premake5_miniaudio.lua +++ b/dependencies/premake5_miniaudio.lua @@ -1,2 +1,4 @@ local dependency = require 'dependency' -miniaudio = dependency.github('rive-app/miniaudio', 'rive') +-- miniaudio = dependency.github('rive-app/miniaudio', 'rive') +miniaudio = dependency.github('rive-app/miniaudio', 'rive_changes') +