diff options
| author | Colin Kinloch <colin@kinlo.ch> | 2017-12-14 12:52:11 +0000 |
|---|---|---|
| committer | Colin Kinloch <colin@kinlo.ch> | 2017-12-14 13:52:23 +0000 |
| commit | edb1df15eadb791ac9f44e0e15db9fe51cbcb1f5 (patch) | |
| tree | 950ac334bd801e090c942e9bae052a44ba865c81 | |
| parent | f3ad14224e27f2a25196575e3c43ebc792c90894 (diff) | |
Added indent_style to editorconfig, fixed inconsistent use of tabs and spaces in indentation.
| -rw-r--r-- | .editorconfig | 4 | ||||
| -rw-r--r-- | platform/windows/detect.py | 10 | ||||
| -rw-r--r-- | platform/x11/detect.py | 4 |
3 files changed, 11 insertions, 7 deletions
diff --git a/.editorconfig b/.editorconfig index b7ef43c340..ead5e14ca9 100644 --- a/.editorconfig +++ b/.editorconfig @@ -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 diff --git a/platform/windows/detect.py b/platform/windows/detect.py index 3f66207457..bc8be7f034 100644 --- a/platform/windows/detect.py +++ b/platform/windows/detect.py @@ -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 diff --git a/platform/x11/detect.py b/platform/x11/detect.py index fb3b7588d2..0f07e22e6b 100644 --- a/platform/x11/detect.py +++ b/platform/x11/detect.py @@ -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++']) |