diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-10-01 12:45:50 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-01 12:45:50 +0200 |
| commit | c2abf1a4e93d2870ddecb2e7e7c80ba3f8be3397 (patch) | |
| tree | 1c2c5e8253a7ed84cee097a1390bd0d8e53bbe75 /platform/x11/detect.py | |
| parent | c51caa3dbdf4acaa7e063c46ae8026adb0633008 (diff) | |
| parent | 6bfb7944d9a1639042ba23fd0ff9950fff9464dd (diff) | |
Merge pull request #22582 from akien-mga/scons-clean-cpppath
SCons: Remove avoidable defines from main env's CPPPATH
Diffstat (limited to 'platform/x11/detect.py')
| -rw-r--r-- | platform/x11/detect.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/platform/x11/detect.py b/platform/x11/detect.py index 905546e724..ee59e9b5a1 100644 --- a/platform/x11/detect.py +++ b/platform/x11/detect.py @@ -250,7 +250,8 @@ def configure(env): if (os.system("pkg-config --exists alsa") == 0): # 0 means found print("Enabling ALSA") env.Append(CPPFLAGS=["-DALSA_ENABLED", "-DALSAMIDI_ENABLED"]) - env.ParseConfig('pkg-config alsa --cflags --libs') + # Don't parse --cflags, we don't need to add /usr/include/alsa to include path + env.ParseConfig('pkg-config alsa --libs') else: print("ALSA libraries not found, disabling driver") @@ -278,7 +279,7 @@ def configure(env): env.ParseConfig('pkg-config zlib --cflags --libs') env.Append(CPPPATH=['#platform/x11']) - env.Append(CPPFLAGS=['-DX11_ENABLED', '-DUNIX_ENABLED', '-DOPENGL_ENABLED', '-DGLES_ENABLED', '-DGLES_OVER_GL']) + env.Append(CPPFLAGS=['-DX11_ENABLED', '-DUNIX_ENABLED', '-DOPENGL_ENABLED', '-DGLES_ENABLED']) env.Append(LIBS=['GL', 'pthread']) if (platform.system() == "Linux"): |