Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CREATE_PROJECT: Fix enabling fluidlite #3185

Merged
merged 1 commit into from Jul 24, 2021
Merged

Conversation

@sluicebox
Copy link
Member

@sluicebox sluicebox commented Jul 21, 2021

--enable-fluidlite doesn't work because create_project doesn't define USE_FLUIDSYNTH when fluidlite is enabled. USE_FLUIDLITE requires USE_FLUIDSYNTH to be defined. The two libraries are mutually exclusive but not the definitions.

See:

#ifdef USE_FLUIDSYNTH

And:

scummvm/configure

Line 5013 in fcf56ca

define_in_config_if_yes "$_fluidlite" 'USE_FLUIDSYNTH'

@sluicebox sluicebox requested a review from SupSuper Jul 21, 2021
@sluicebox sluicebox force-pushed the sluicebox:cp_fluidlite branch from 45fb052 to c56becb Jul 21, 2021
@SupSuper SupSuper merged commit f0fd086 into scummvm:master Jul 24, 2021
5 of 8 checks passed
5 of 8 checks passed
@github-actions
Windows (win32, x86-windows, x86, --enable-faad --enable-mpeg2 --enable-discord --disable-fribidi... Windows (win32, x86-windows, x86, --enable-faad --enable-mpeg2 --enable-discord --disable-fribidi...
Details
@github-actions
Windows (x64, x64, x64-windows, --enable-faad --enable-mpeg2 --enable-discord --disable-fribidi, ... Windows (x64, x64, x64-windows, --enable-faad --enable-mpeg2 --enable-discord --disable-fribidi, ...
Details
@github-actions
Windows (arm64, arm64, arm64-windows, --enable-faad --enable-mpeg2 --enable-discord --disable-fri... Windows (arm64, arm64, arm64-windows, --enable-faad --enable-mpeg2 --enable-discord --disable-fri...
Details
@github-actions
Xcode (macosx, -scheme ScummVM-macOS, --disable-nasm --enable-faad --enable-mpeg2, a52dec faad2 f...
Details
@github-actions
Xcode (ios7, -scheme ScummVM-iOS CODE_SIGN_IDENTITY="" CODE_SIGNING_ALLOWED=NO, --disable-nasm --...
Details
@github-actions
Ubuntu (ubuntu-latest, sdl2-config, --enable-c++11, libsdl2-dev libsdl2-net-dev liba52-dev libjpe...
Details
@github-actions
Ubuntu (ubuntu-18.04, sdl-config, --disable-c++11, libsdl1.2-dev libsdl-net1.2-dev liba52-dev lib...
Details
@codacy-production
Codacy Static Code Analysis Codacy Static Code Analysis
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants