Fix ios analyzer

Trying to disable some unused features that might be biting us.. Diffs= 0d03a416b Fix ios analyzer (#7198) Co-authored-by: Luigi Rosso <[email protected]>
rive-app · May 3, 2024 · 785bee1 · 785bee1
1 parent 0a88f0e
commit 785bee1
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 9 deletions.
diff --git a/.rive_head b/.rive_head
@@ -1 +1 @@
-335a30588e5052375d6245e65c3c0a64864d486e
+0d03a416b584cdd95aa4b496df105c14cdd2c05c
diff --git a/build/premake5.lua b/build/premake5.lua
@@ -11,14 +11,19 @@ filter({ 'options:with_rive_text' })
 do
     defines({ 'WITH_RIVE_TEXT' })
 end
-filter({})
 filter({ 'options:with_rive_audio=system' })
 do
-    defines({ 'WITH_RIVE_AUDIO' })
+    defines({ 'WITH_RIVE_AUDIO', 'MA_NO_RESOURCE_MANAGER' })
 end
+
 filter({ 'options:with_rive_audio=external' })
 do
-    defines({ 'WITH_RIVE_AUDIO', 'EXTERNAL_RIVE_AUDIO_ENGINE', 'MA_NO_DEVICE_IO' })
+    defines({
+        'WITH_RIVE_AUDIO',
+        'EXTERNAL_RIVE_AUDIO_ENGINE',
+        'MA_NO_DEVICE_IO',
+        'MA_NO_RESOURCE_MANAGER',
+    })
 end
 filter({})
 

diff --git a/dependencies/premake5_harfbuzz_v2.lua b/dependencies/premake5_harfbuzz_v2.lua
@@ -227,20 +227,26 @@ do
     defines({
         'HB_ONLY_ONE_SHAPER', -- added this for Geotech Mac multi-module issue: https://github.com/rive-app/rive-cpp/issues/369
         'HAVE_OT',
+        'HB_NO_CFF',
         'HB_NO_FALLBACK_SHAPE',
         'HB_NO_WIN1256',
         'HB_NO_EXTERN_HELPERS',
         'HB_DISABLE_DEPRECATED',
         'HB_NO_COLOR',
         'HB_NO_BITMAP',
         'HB_NO_BUFFER_SERIALIZE',
+        'HB_NO_BUFFER_VERIFY',
+        'HB_NO_BUFFER_MESSAGE',
         'HB_NO_SETLOCALE',
         'HB_NO_STYLE',
         'HB_NO_VERTICAL',
         'HB_NO_LAYOUT_COLLECT_GLYPHS',
         'HB_NO_LAYOUT_RARELY_USED',
         'HB_NO_LAYOUT_UNUSED',
         'HB_NO_OT_FONT_GLYPH_NAMES',
+        'HB_NO_PAINT',
+        'HB_NO_MMAP',
+        'HB_NO_META',
     })
 
     filter('toolset:not msc')

diff --git a/dependencies/premake5_miniaudio.lua b/dependencies/premake5_miniaudio.lua
@@ -1,2 +1,2 @@
 local dependency = require('dependency')
-miniaudio = dependency.github('rive-app/miniaudio', 'rive_changes')
+miniaudio = dependency.github('rive-app/miniaudio', 'rive_changes_4')
diff --git a/dependencies/premake5_miniaudio_v2.lua b/dependencies/premake5_miniaudio_v2.lua
@@ -1,3 +1,3 @@
 dofile('rive_build_config.lua')
 local dependency = require('dependency')
-miniaudio = dependency.github('rive-app/miniaudio', 'rive_changes')
+miniaudio = dependency.github('rive-app/miniaudio', 'rive_changes_4')
diff --git a/premake5_v2.lua b/premake5_v2.lua
@@ -8,14 +8,19 @@ filter({ 'options:with_rive_text' })
 do
     defines({ 'WITH_RIVE_TEXT' })
 end
-filter({})
 filter({ 'options:with_rive_audio=system' })
 do
-    defines({ 'WITH_RIVE_AUDIO' })
+    defines({ 'WITH_RIVE_AUDIO', 'MA_NO_RESOURCE_MANAGER' })
 end
+
 filter({ 'options:with_rive_audio=external' })
 do
-    defines({ 'WITH_RIVE_AUDIO', 'EXTERNAL_RIVE_AUDIO_ENGINE', 'MA_NO_DEVICE_IO' })
+    defines({
+        'WITH_RIVE_AUDIO',
+        'EXTERNAL_RIVE_AUDIO_ENGINE',
+        'MA_NO_DEVICE_IO',
+        'MA_NO_RESOURCE_MANAGER',
+    })
 end
 filter({})
 
@@ -89,6 +94,7 @@ do
             '-Wno-implicit-fallthrough',
             '-Wno-implicit-int-conversion',
             '-Wno-undef',
+            '-Wno-unused-function',
         })
     end
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		335a30588e5052375d6245e65c3c0a64864d486e
		0d03a416b584cdd95aa4b496df105c14cdd2c05c