Build Android deps with audio

Diffs= fddb050ca Build Android deps with audio (#6515) Co-authored-by: Umberto Sonnino <[email protected]>
rive-app · Jan 26, 2024 · 2126435 · 2126435
1 parent b1dc7eb
commit 2126435
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/.rive_head b/.rive_head
@@ -1 +1 @@
-5cfc226f2444c9bef5f8ce06ef4d8cacde53f41c
+fddb050ca322c797dbbd01292f7d4f2b568eb627
diff --git 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
@@ -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')
+
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		5cfc226f2444c9bef5f8ce06ef4d8cacde53f41c
		fddb050ca322c797dbbd01292f7d4f2b568eb627