From da8577214c06e2df3aaca5305bc903d75105ab66 Mon Sep 17 00:00:00 2001 From: Alexis He Date: Wed, 25 Aug 2021 11:45:31 +0200 Subject: [PATCH] Add: link to android environment with fluidsynth 2.2.2 prebuilt --- .github/workflows/nightly-android.yml | 2 +- music/fluidsynth.cc | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/nightly-android.yml b/.github/workflows/nightly-android.yml index bfbd92916..e1863b57d 100644 --- a/.github/workflows/nightly-android.yml +++ b/.github/workflows/nightly-android.yml @@ -78,7 +78,7 @@ jobs: - name: Checkout lib Android SDL by pelya (hard coded version) working-directory: /android-sdl run: | - git init && git remote add origin https://github.com/pelya/commandergenius.git && git fetch origin 22e2154d7e0105a06b067751c2f7ab4c134a9f1b && git reset --hard FETCH_HEAD + git init && git remote add origin https://github.com/krosk/commandergenius.git && git fetch origin 4bc45825086deecb8f55f424d9125591d0e7a59b && git reset --hard FETCH_HEAD - name: Setup licenses for Gradle working-directory: /android-sdl diff --git a/music/fluidsynth.cc b/music/fluidsynth.cc index 821fdcf13..fd3b39bdd 100644 --- a/music/fluidsynth.cc +++ b/music/fluidsynth.cc @@ -188,13 +188,11 @@ static void fluid_log(int level, const char *message, void *) bool dr_init_midi() { -#ifndef __ANDROID__ fluid_set_log_function(FLUID_PANIC, fluid_log, NULL); fluid_set_log_function(FLUID_ERR, fluid_log, NULL); fluid_set_log_function(FLUID_WARN, fluid_log, NULL); fluid_set_log_function(FLUID_INFO, fluid_log, NULL); fluid_set_log_function(FLUID_DBG, fluid_log, NULL); -#endif #ifdef _WIN32 std::string fluidsynth_driver = "dsound"; -- 2.28.0.windows.1