diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2016-11-01 00:37:24 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-01 00:37:24 +0100 |
| commit | 7e3aa4bd5e500d35401f5f2b15f1da65af12b26d (patch) | |
| tree | 2d074bb474b4b093c849ad2f6317dcc4ae5784f5 /modules/squish | |
| parent | 681575fa7123592897090c6cce44402c4e45baeb (diff) | |
| parent | f34151ff0f91e8f0df8eaf829334b2205eb7da3c (diff) | |
Merge pull request #6985 from akien-mga/python-pep8
Apply PEP8 to all python files using autopep8
Diffstat (limited to 'modules/squish')
| -rw-r--r-- | modules/squish/SCsub | 32 | ||||
| -rw-r--r-- | modules/squish/config.py | 13 |
2 files changed, 23 insertions, 22 deletions
diff --git a/modules/squish/SCsub b/modules/squish/SCsub index 3fdc587652..462b6a05cf 100644 --- a/modules/squish/SCsub +++ b/modules/squish/SCsub @@ -6,24 +6,24 @@ Import('env_modules') env_squish = env_modules.Clone() # Thirdparty source files -if (env["squish"] != "system"): # builtin - thirdparty_dir = "#thirdparty/squish/" - thirdparty_sources = [ - "alpha.cpp", - "clusterfit.cpp", - "colourblock.cpp", - "colourfit.cpp", - "colourset.cpp", - "maths.cpp", - "rangefit.cpp", - "singlecolourfit.cpp", - "squish.cpp", - ] +if (env["squish"] != "system"): # builtin + thirdparty_dir = "#thirdparty/squish/" + thirdparty_sources = [ + "alpha.cpp", + "clusterfit.cpp", + "colourblock.cpp", + "colourfit.cpp", + "colourset.cpp", + "maths.cpp", + "rangefit.cpp", + "singlecolourfit.cpp", + "squish.cpp", + ] - thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources] + thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources] - env_squish.add_source_files(env.modules_sources, thirdparty_sources) - env_squish.Append(CPPPATH = [thirdparty_dir]) + env_squish.add_source_files(env.modules_sources, thirdparty_sources) + env_squish.Append(CPPPATH=[thirdparty_dir]) # Godot source files env_squish.add_source_files(env.modules_sources, "*.cpp") diff --git a/modules/squish/config.py b/modules/squish/config.py index d28d9c702e..cc8f098010 100644 --- a/modules/squish/config.py +++ b/modules/squish/config.py @@ -1,10 +1,11 @@ def can_build(platform): - return True + return True + def configure(env): - # Tools only, disabled for non-tools - # TODO: Find a cleaner way to achieve that - if (env["tools"] == "no"): - env["module_squish_enabled"] = "no" - env.disabled_modules.append("squish") + # Tools only, disabled for non-tools + # TODO: Find a cleaner way to achieve that + if (env["tools"] == "no"): + env["module_squish_enabled"] = "no" + env.disabled_modules.append("squish") |