godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-06 12:20:30 +00:00
Code Releases Wiki Activity

openmp: Don't try to link GCC's implementation on Clang

Browse Source 
Also disable openmp build on Travis, breaks on Trusty's Clang.
Group deps more naturally.
This commit is contained in:
Rémi Verschelde
2017-12-14 17:59:18 +01:00
parent b872439eef
commit ab9cda1497
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
.travis.yml
View File

@@ -48,14 +48,14 @@ addons:
- pkg-config - pkg-config
- libx11-dev - libx11-dev
- libxcursor-dev - libxcursor-dev
- libasound2-dev - libxi-dev
- libfreetype6-dev
- libgl1-mesa-dev
- libglu1-mesa-dev
- libssl-dev
- libxinerama-dev - libxinerama-dev
- libxrandr-dev - libxrandr-dev
- libxi-dev - libgl1-mesa-dev
- libglu1-mesa-dev
- libasound2-dev
- libfreetype6-dev
- libssl-dev
# For cross-compiling to Windows. # For cross-compiling to Windows.
#- binutils-mingw-w64-i686 #- binutils-mingw-w64-i686
@@ -90,5 +90,5 @@ script:
- if [ "$STATIC_CHECKS" = "yes" ]; then - if [ "$STATIC_CHECKS" = "yes" ]; then
sh ./misc/travis/clang-format.sh; sh ./misc/travis/clang-format.sh;
else else
scons -j2 CC=$CC CXX=$CXX platform=$GODOT_TARGET TOOLS=$TOOLS verbose=yes progress=no; scons -j2 CC=$CC CXX=$CXX platform=$GODOT_TARGET TOOLS=$TOOLS verbose=yes progress=no openmp=no;
fi fi

3
platform/x11/detect.py
View File

@@ -265,8 +265,9 @@ def configure(env):
env.Append(LINKFLAGS=['-m64', '-L/usr/lib/i686-linux-gnu']) env.Append(LINKFLAGS=['-m64', '-L/usr/lib/i686-linux-gnu'])
if (env["openmp"]): if env["openmp"]:
env.Append(CPPFLAGS=['-fopenmp']) env.Append(CPPFLAGS=['-fopenmp'])
if not env['use_llvm']:
env.Append(LIBS=['gomp']) env.Append(LIBS=['gomp'])
if env['use_static_cpp']: if env['use_static_cpp']: