asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #14654 from ColinKinloch/master

Browse source 
Fixed inconsistent use of tabs and spaces in indentation.
This commit is contained in:
Rémi Verschelde 2017-12-14 15:01:34 +01:00 committed by GitHub
commit 9fab381141
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.editorconfig
View file

@ -8,6 +8,10 @@ indent_style = tab
[*.{cpp,hpp,c,h,mm}]
trim_trailing_whitespace = true
[*.py]
indent_style = space
indent_size = 4
[.travis.yml]
indent_style = space
indent_size = 2

10
platform/windows/detect.py
View file

@ -188,8 +188,8 @@ def configure(env):
else:
VC_PATH = ""
if (env["openmp"]):
env.Append(CPPFLAGS=['/openmp'])
if (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(";")])
@ -267,9 +267,9 @@ def configure(env):
env.Append(CCFLAGS=['-flto'])
env.Append(LINKFLAGS=['-flto=' + str(env.GetOption("num_jobs"))])
if (env["openmp"]):
env.Append(CPPFLAGS=['-fopenmp'])
env.Append(LIBS=['gomp'])
if (env["openmp"]):
env.Append(CPPFLAGS=['-fopenmp'])
env.Append(LIBS=['gomp'])
## Compile flags

4
platform/x11/detect.py
View file

@ -266,8 +266,8 @@ def configure(env):
if (env["openmp"]):
env.Append(CPPFLAGS=['-fopenmp'])
env.Append(LIBS=['gomp'])
env.Append(CPPFLAGS=['-fopenmp'])
env.Append(LIBS=['gomp'])
if env['use_static_cpp']:
env.Append(LINKFLAGS=['-static-libstdc++'])