diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2017-12-14 08:59:46 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2017-12-14 09:01:27 -0300 |
| commit | f3ad14224e27f2a25196575e3c43ebc792c90894 (patch) | |
| tree | 84e60bc2fafda809f51bd0892e39205da9423068 /platform/x11/detect.py | |
| parent | aa6772d7abb3ff1ff77b1b658617904bb0af1fbb (diff) | |
| download | redot-engine-f3ad14224e27f2a25196575e3c43ebc792c90894.tar.gz | |
-Add lightmapper
-Fixes to unwrapper (remove degenerates), makes Thekla not crash
-Added optional cancel button in EditorProgress
-Added function to force processing of events (needed for cancel button)
Diffstat (limited to 'platform/x11/detect.py')
| -rw-r--r-- | platform/x11/detect.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/platform/x11/detect.py b/platform/x11/detect.py index d7dbe71da4..fb3b7588d2 100644 --- a/platform/x11/detect.py +++ b/platform/x11/detect.py @@ -158,6 +158,7 @@ def configure(env): if not env['builtin_libwebp']: env.ParseConfig('pkg-config libwebp --cflags --libs') + # freetype depends on libpng and zlib, so bundling one of them while keeping others # as shared libraries leads to weird issues if env['builtin_freetype'] or env['builtin_libpng'] or env['builtin_zlib']: @@ -263,5 +264,10 @@ def configure(env): env.Append(CPPFLAGS=['-m64']) env.Append(LINKFLAGS=['-m64', '-L/usr/lib/i686-linux-gnu']) + + if (env["openmp"]): + env.Append(CPPFLAGS=['-fopenmp']) + env.Append(LIBS=['gomp']) + if env['use_static_cpp']: env.Append(LINKFLAGS=['-static-libstdc++']) |