|
| 1 | +diff --git a/meson.build b/meson.build |
| 2 | +index 34fa8a3..4e27b5d 100644 |
| 3 | +--- a/meson.build |
| 4 | ++++ b/meson.build |
| 5 | +@@ -357,7 +357,7 @@ threads_dep = dependency( |
| 6 | + required: opt_threads, |
| 7 | + ) |
| 8 | + |
| 9 | +-if platform_is_apple |
| 10 | ++if platform_is_apple or platform_is_android |
| 11 | + libusb_dep = fake_dep |
| 12 | + else |
| 13 | + libusb_dep = dependency( |
| 14 | +@@ -1301,7 +1301,7 @@ if platform_is_android |
| 15 | + sys_audio_driver = ['opensles', 'android'] |
| 16 | + sys_video_driver = ['android'] |
| 17 | + sys_video_render = ['ogl_es2'] |
| 18 | +- extra_deps += [cc.find_library('android'), cc.find_library('log')] |
| 19 | ++ extra_deps += [cc.find_library('android'), cc.find_library('log'), cc.find_library('OpenSLES')] |
| 20 | + if not opt_video_openglesv2.disabled() |
| 21 | + extra_deps += cc.find_library( |
| 22 | + 'GLESv2', |
| 23 | +@@ -1565,7 +1565,7 @@ if platform_is_darwin |
| 24 | + all_sources += [objc_sources] |
| 25 | + endif |
| 26 | + |
| 27 | +-if platform_is_winrt or platform_is_haiku |
| 28 | ++if platform_is_winrt or platform_is_haiku or platform_is_android |
| 29 | + add_languages( |
| 30 | + 'cpp', |
| 31 | + native: false, |
| 32 | +diff --git a/src/core/android/meson.build b/src/core/android/meson.build |
| 33 | +index 9097eee..670052e 100644 |
| 34 | +--- a/src/core/android/meson.build |
| 35 | ++++ b/src/core/android/meson.build |
| 36 | +@@ -1 +1,2 @@ |
| 37 | + c_sources += files('SDL_android.c') |
| 38 | ++extra_deps += dependency('cpu-features') |
| 39 | +diff --git a/src/video/haiku/meson.build b/src/video/haiku/meson.build |
| 40 | +index 01c0215..5f353c8 100644 |
| 41 | +--- a/src/video/haiku/meson.build |
| 42 | ++++ b/src/video/haiku/meson.build |
| 43 | +@@ -1,3 +1,4 @@ |
| 44 | ++if platform_is_haiku |
| 45 | + cxx_sources += files( |
| 46 | + 'SDL_bclipboard.cc', |
| 47 | + 'SDL_bevents.cc', |
| 48 | +@@ -8,3 +9,4 @@ cxx_sources += files( |
| 49 | + 'SDL_bvideo.cc', |
| 50 | + 'SDL_bwindow.cc', |
| 51 | + ) |
| 52 | ++endif |
0 commit comments