소스 검색

SCons: Cleanup pulseaudio defines for Linux

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.

(cherry picked from commit a35586779e716e6f625e7b1b66c6e03d4a4306b3)
Rémi Verschelde 2 년 전
부모
커밋
516323f4ab
1개의 변경된 파일3개의 추가작업 그리고 2개의 파일을 삭제
  1. 3 2
      platform/linuxbsd/detect.py

+ 3 - 2
platform/linuxbsd/detect.py

@@ -307,11 +307,12 @@ 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
-        env.Append(CPPDEFINES=["PULSEAUDIO_ENABLED", "_REENTRANT"])
+        else:
+            env.Append(CPPDEFINES=["PULSEAUDIO_ENABLED", "_REENTRANT"])
 
 
     if env["dbus"]:
     if env["dbus"]:
         if not env["use_sowrap"]:
         if not env["use_sowrap"]: