diff options
| author | romeojulietthotel | 2016-09-22 22:38:57 -0700 |
|---|---|---|
| committer | Rémi Verschelde | 2016-10-09 17:21:17 +0200 |
| commit | 228ee4363ec2aec06d20a7f0752c979ec50c6537 (patch) | |
| tree | 02c92f36d836120883438afd6472fb09cdd3f7e9 | |
| parent | 36b1521cdc2f2a6277341230a6c5a27198514abe (diff) | |
| download | godot-228ee4363ec2aec06d20a7f0752c979ec50c6537.tar.gz godot-228ee4363ec2aec06d20a7f0752c979ec50c6537.tar.zst godot-228ee4363ec2aec06d20a7f0752c979ec50c6537.zip | |
Use pkgconfig to locate ALSA libs (#6119)
* This allows building when ALSA libs are in a non-standard location. PKG_CONFIG_PATH alone is not enough as the final link fails. Adding this makes the final link succeed.
* The extra LIBS flag for alsa is not needed so removing.
(cherry picked from commit 94d6757a0d7426f6805c6f9d50a8afc0c2f6061a)
| -rw-r--r-- | platform/x11/detect.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/platform/x11/detect.py b/platform/x11/detect.py index 356de7b2b..ba232f6d4 100644 --- a/platform/x11/detect.py +++ b/platform/x11/detect.py @@ -155,7 +155,7 @@ def configure(env): if os.system("pkg-config --exists alsa")==0: print("Enabling ALSA") env.Append(CPPFLAGS=["-DALSA_ENABLED"]) - env.Append(LIBS=['asound']) + env.ParseConfig('pkg-config alsa --cflags --libs') else: print("ALSA libraries not found, disabling driver") |