1berry/godotengine
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SCons: Cleanup pulseaudio defines for Linux

Browse Source 
No need to define _REENTRANT manually when using the system lib,
it's part of the pkgconfig cflags.
And we were then defining PULSEAUDIO_ENABLED twice.
This commit is contained in:
Rémi Verschelde 2023-03-09 16:05:52 +01:00
parent d3415ae5aa
commit a35586779e
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
platform/linuxbsd/detect.py
View File

@ -307,10 +307,11 @@ def configure(env: "Environment"):
if not env["use_sowrap"]: if not env["use_sowrap"]:
if os.system("pkg-config --exists libpulse") == 0: # 0 means found if os.system("pkg-config --exists libpulse") == 0: # 0 means found
env.ParseConfig("pkg-config libpulse --cflags --libs") env.ParseConfig("pkg-config libpulse --cflags --libs")
env.Append(CPPDEFINES=["PULSEAUDIO_ENABLED", "_REENTRANT"]) env.Append(CPPDEFINES=["PULSEAUDIO_ENABLED"])
else: else:
print("Warning: PulseAudio development libraries not found. Disabling the PulseAudio audio driver.") print("Warning: PulseAudio development libraries not found. Disabling the PulseAudio audio driver.")
env["pulseaudio"] = False env["pulseaudio"] = False
else:
env.Append(CPPDEFINES=["PULSEAUDIO_ENABLED", "_REENTRANT"]) env.Append(CPPDEFINES=["PULSEAUDIO_ENABLED", "_REENTRANT"])
if env["dbus"]: if env["dbus"]: