-
-
Save atsushieno/950eb50626e0009d5e919588a0ca9ef9 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/app/src/main/cpp/fluidsynth/android/CMakeLists.txt b/app/src/main/cpp/fluidsynth/android/CMakeLists.txt | |
index b0905df..86f3c42 100644 | |
--- a/app/src/main/cpp/fluidsynth/android/CMakeLists.txt | |
+++ b/app/src/main/cpp/fluidsynth/android/CMakeLists.txt | |
@@ -33,7 +33,6 @@ set(fluidsynth_sources | |
${src_DIR}/utils/fluid_ringbuffer.c | |
${src_DIR}/utils/fluid_settings.c | |
${src_DIR}/bindings/fluid_filerenderer.c | |
- ${src_DIR}/drivers/fluid_adriver.c | |
${src_DIR}/drivers/fluid_opensles.c | |
${src_DIR}/utils/fluid_sys.c | |
src/bindings/fluid_cmd.c | |
@@ -82,3 +81,6 @@ target_compile_options(fluidsynth | |
PRIVATE -DHAVE_CONFIG_H | |
PRIVATE -Wno-unused-variable | |
PRIVATE "$<$<CONFIG:DEBUG>:-Werror>") # Only include -Werror when building debug config | |
+ | |
+target_link_libraries (fluidsynth OpenSLES) | |
+ | |
diff --git a/app/src/main/cpp/fluidsynth/src/CMakeLists.txt b/app/src/main/cpp/fluidsynth/src/CMakeLists.txt | |
index 608564b..e0568bb 100644 | |
--- a/app/src/main/cpp/fluidsynth/src/CMakeLists.txt | |
+++ b/app/src/main/cpp/fluidsynth/src/CMakeLists.txt | |
@@ -83,6 +83,10 @@ if ( WINDOWS_SUPPORT ) | |
set ( fluid_windows_SOURCES drivers/fluid_dsound.c drivers/fluid_winmidi.c ) | |
endif ( WINDOWS_SUPPORT ) | |
+if ( OPENSLES_SUPPORT ) | |
+ set ( fluid_opensles_SOURCES drivers/fluid_opensles.c ) | |
+endif ( OPENSLES_SUPPORT ) | |
+ | |
if ( OSS_SUPPORT ) | |
set ( fluid_oss_SOURCES drivers/fluid_oss.c ) | |
endif ( OSS_SUPPORT ) | |
@@ -244,6 +248,8 @@ link_directories ( | |
${LIBSNDFILE_LIBRARY_DIRS} | |
${DBUS_LIBDIR} | |
${DBUS_LIBRARY_DIRS} | |
+ ${OPENSLES_LIBDIR} | |
+ ${OPENSLES_LIBRARY_DIRS} | |
) | |
@@ -259,6 +265,7 @@ add_library ( libfluidsynth | |
${fluid_jack_SOURCES} | |
${fluid_lash_SOURCES} | |
${fluid_midishare_SOURCES} | |
+ ${fluid_opensles_SOURCES} | |
${fluid_oss_SOURCES} | |
${fluid_portaudio_SOURCES} | |
${fluid_pulse_SOURCES} | |
@@ -326,6 +333,7 @@ target_link_libraries ( libfluidsynth | |
${PULSE_LIBRARIES} | |
${PORTAUDIO_LIBRARIES} | |
${LIBSNDFILE_LIBRARIES} | |
+ ${OPENSLES_LIBRARIES} | |
${DBUS_LIBRARIES} | |
${READLINE_LIBS} | |
${DART_LIBS} | |
diff --git a/app/src/main/cpp/fluidsynth/src/config.cmake b/app/src/main/cpp/fluidsynth/src/config.cmake | |
index 49a2618..22dc0f9 100644 | |
--- a/app/src/main/cpp/fluidsynth/src/config.cmake | |
+++ b/app/src/main/cpp/fluidsynth/src/config.cmake | |
@@ -160,6 +160,9 @@ | |
/* Define to 1 if your C compiler doesn't accept -c and -o together. */ | |
#cmakedefine NO_MINUS_C_MINUS_O @NO_MINUS_C_MINUS_O@ | |
+/* Define to enable OpenSLES driver */ | |
+#cmakedefine OPENSLES_SUPPORT @OPENSLES_SUPPORT@ | |
+ | |
/* Define to enable OSS driver */ | |
#cmakedefine OSS_SUPPORT @OSS_SUPPORT@ | |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment