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
4af5c2a0
Unverified
Commit
4af5c2a0
authored
Aug 29, 2018
by
Rémi Verschelde
Committed by
GitHub
Aug 29, 2018
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #21553 from bmwiedemann/sort
Sort list of input files
parents
b6c17016
83b856c0
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
3 deletions
+4
-3
SConstruct
SConstruct
+1
-1
SCsub
editor/SCsub
+2
-1
methods.py
methods.py
+1
-1
No files found.
SConstruct
View file @
4af5c2a0
...
@@ -23,7 +23,7 @@ platform_exporters = []
...
@@ -23,7 +23,7 @@ platform_exporters = []
platform_apis
=
[]
platform_apis
=
[]
global_defaults
=
[]
global_defaults
=
[]
for
x
in
glob
.
glob
(
"platform/*"
):
for
x
in
sorted
(
glob
.
glob
(
"platform/*"
)
):
if
(
not
os
.
path
.
isdir
(
x
)
or
not
os
.
path
.
exists
(
x
+
"/detect.py"
)):
if
(
not
os
.
path
.
isdir
(
x
)
or
not
os
.
path
.
exists
(
x
+
"/detect.py"
)):
continue
continue
tmppath
=
"./"
+
x
tmppath
=
"./"
+
x
...
...
editor/SCsub
View file @
4af5c2a0
...
@@ -76,7 +76,8 @@ if env['tools']:
...
@@ -76,7 +76,8 @@ if env['tools']:
# Fonts
# Fonts
flist
=
glob
.
glob
(
path
+
"/../thirdparty/fonts/*.ttf"
)
flist
=
glob
.
glob
(
path
+
"/../thirdparty/fonts/*.ttf"
)
flist
.
append
(
glob
.
glob
(
path
+
"/../thirdparty/fonts/*.otf"
))
flist
.
extend
(
glob
.
glob
(
path
+
"/../thirdparty/fonts/*.otf"
))
flist
.
sort
()
env
.
Depends
(
'#editor/builtin_fonts.gen.h'
,
flist
)
env
.
Depends
(
'#editor/builtin_fonts.gen.h'
,
flist
)
env
.
CommandNoCache
(
'#editor/builtin_fonts.gen.h'
,
flist
,
run_in_subprocess
(
editor_builders
.
make_fonts_header
))
env
.
CommandNoCache
(
'#editor/builtin_fonts.gen.h'
,
flist
,
run_in_subprocess
(
editor_builders
.
make_fonts_header
))
...
...
methods.py
View file @
4af5c2a0
...
@@ -13,7 +13,7 @@ def add_source_files(self, sources, filetype, lib_env=None, shared=False):
...
@@ -13,7 +13,7 @@ def add_source_files(self, sources, filetype, lib_env=None, shared=False):
if
isbasestring
(
filetype
):
if
isbasestring
(
filetype
):
dir_path
=
self
.
Dir
(
'.'
)
.
abspath
dir_path
=
self
.
Dir
(
'.'
)
.
abspath
filetype
=
glob
.
glob
(
dir_path
+
"/"
+
filetype
)
filetype
=
sorted
(
glob
.
glob
(
dir_path
+
"/"
+
filetype
)
)
for
path
in
filetype
:
for
path
in
filetype
:
sources
.
append
(
self
.
Object
(
path
))
sources
.
append
(
self
.
Object
(
path
))
...
...
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