diff options
| author | Juan Linietsky | 2017-12-24 09:31:17 -0300 |
|---|---|---|
| committer | Juan Linietsky | 2017-12-24 09:32:12 -0300 |
| commit | 021f3c924be29cafe9d8d50bf00ecc6f13675e87 (patch) | |
| tree | 4623e6fa3be55751386d56792f7cc26dab210e27 /platform | |
| parent | 83182ea4a1e6d5c34dd137fdbd7ef9b2c5f33231 (diff) | |
| download | godot-021f3c924be29cafe9d8d50bf00ecc6f13675e87.tar.gz godot-021f3c924be29cafe9d8d50bf00ecc6f13675e87.tar.zst godot-021f3c924be29cafe9d8d50bf00ecc6f13675e87.zip | |
-Removed OpenMP support, replaced by a custom class.
-Disabled Opus, implementation is wrong.
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/osx/detect.py | 3 | ||||
| -rw-r--r-- | platform/windows/detect.py | 5 | ||||
| -rw-r--r-- | platform/x11/detect.py | 4 |
3 files changed, 0 insertions, 12 deletions
diff --git a/platform/osx/detect.py b/platform/osx/detect.py index 5b04ab882..2e686fbee 100644 --- a/platform/osx/detect.py +++ b/platform/osx/detect.py @@ -82,9 +82,6 @@ def configure(env): env['RANLIB'] = mpprefix + "/libexec/llvm-" + mpclangver + "/bin/llvm-ranlib" env['AS'] = mpprefix + "/libexec/llvm-" + mpclangver + "/bin/llvm-as" env.Append(CCFLAGS=['-D__MACPORTS__']) #hack to fix libvpx MM256_BROADCASTSI128_SI256 define - if env['tools'] and env['openmp']: - env.Append(CPPFLAGS=['-fopenmp']) - env.Append(LINKFLAGS=['-fopenmp']) else: # osxcross build root = os.environ.get("OSXCROSS_ROOT", 0) diff --git a/platform/windows/detect.py b/platform/windows/detect.py index e216868bd..3b8de2caf 100644 --- a/platform/windows/detect.py +++ b/platform/windows/detect.py @@ -191,8 +191,6 @@ def configure(env): if (env["use_lto"]): env.Append(CCFLAGS=['/GL']) env.Append(LINKFLAGS=['/LTCG']) - if env['tools'] and env['openmp']: - env.Append(CPPFLAGS=['/openmp']) env.Append(CCFLAGS=["/I" + p for p in os.getenv("INCLUDE").split(";")]) env.Append(LIBPATH=[p for p in os.getenv("LIB").split(";")]) @@ -270,9 +268,6 @@ def configure(env): env.Append(CCFLAGS=['-flto']) env.Append(LINKFLAGS=['-flto=' + str(env.GetOption("num_jobs"))]) - if env['tools'] and env['openmp']: - env.Append(CPPFLAGS=['-fopenmp']) - env.Append(LINKFLAGS=['-fopenmp']) ## Compile flags diff --git a/platform/x11/detect.py b/platform/x11/detect.py index 98ae9a865..cb45fed1b 100644 --- a/platform/x11/detect.py +++ b/platform/x11/detect.py @@ -265,9 +265,5 @@ def configure(env): env.Append(LINKFLAGS=['-m64', '-L/usr/lib/i686-linux-gnu']) - if env['tools'] and env['openmp']: - env.Append(CPPFLAGS=['-fopenmp']) - env.Append(LINKFLAGS=['-fopenmp']) - if env['use_static_cpp']: env.Append(LINKFLAGS=['-static-libstdc++']) |