Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
godot
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
community
godot
Commits
edb1df15
Commit
edb1df15
authored
Dec 14, 2017
by
Colin Kinloch
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added indent_style to editorconfig, fixed inconsistent use of tabs and spaces in indentation.
parent
f3ad1422
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
7 deletions
+11
-7
.editorconfig
.editorconfig
+4
-0
detect.py
platform/windows/detect.py
+5
-5
detect.py
platform/x11/detect.py
+2
-2
No files found.
.editorconfig
View file @
edb1df15
...
...
@@ -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
platform/windows/detect.py
View file @
edb1df15
...
...
@@ -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
...
...
platform/x11/detect.py
View file @
edb1df15
...
...
@@ -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++'
])
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment