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

21 lines
530 B
Text
Raw Normal View History

SCsub: Add python shebang as a hint for syntax highlighting Also switch existing shebangs to "better" /usr/bin/env python. (cherry picked from commit fc8ccd5b8c8b779bffd0f4d7f22f2f964c939163)
2016-10-17 08:50:25 +02:00
#!/usr/bin/env python
dds/etc1/pbm/pvr: Make those modules and split thirdparty files They are not particularly packaged in Linux distros so we do not facilitate unbundling via SCons. There could be done if/when there is interest. Also s/pnm/pbm/, long-lived typo :) (cherry picked from commit b1e8889d969f5f88539c47c2afac6c9ea2a2dc11)
2016-10-11 20:44:26 +02:00
Import('env')
Import('env_modules')
modules: Clone env in each module This allows to pass include paths and flags only to a given thirdparty library, thus preventing conflicts between their files (e.g. between opus and openssl which both provide modes.h. This also has the nice effect of making the compilation command smaller for each module as it no longer related to all other modules, only the final linking brings them together. This however requires adding manually the ogg include path in opus and vorbis when building against the builtin ogg, since it is no longer in the global env. Also simplified template 'thirdparty_<module>_sources' to 'thirdparty_sources'. "Core" modules like cscript, gdscript, gridmap, ik and virtual_script still use the main env_modules, but it could be changed if need be. (cherry picked from commit da09c6131bcdace7e8e62c3dabc62890e9564c97) Obviously removed the parts about enet and visual_script.
2016-10-13 18:54:00 +02:00
env_etc1 = env_modules.Clone()
dds/etc1/pbm/pvr: Make those modules and split thirdparty files They are not particularly packaged in Linux distros so we do not facilitate unbundling via SCons. There could be done if/when there is interest. Also s/pnm/pbm/, long-lived typo :) (cherry picked from commit b1e8889d969f5f88539c47c2afac6c9ea2a2dc11)
2016-10-11 20:44:26 +02:00
# Thirdparty source files
# Not unbundled so far since not widespread as shared library
thirdparty_dir = "#thirdparty/rg-etc1/"
modules: Clone env in each module This allows to pass include paths and flags only to a given thirdparty library, thus preventing conflicts between their files (e.g. between opus and openssl which both provide modes.h. This also has the nice effect of making the compilation command smaller for each module as it no longer related to all other modules, only the final linking brings them together. This however requires adding manually the ogg include path in opus and vorbis when building against the builtin ogg, since it is no longer in the global env. Also simplified template 'thirdparty_<module>_sources' to 'thirdparty_sources'. "Core" modules like cscript, gdscript, gridmap, ik and virtual_script still use the main env_modules, but it could be changed if need be. (cherry picked from commit da09c6131bcdace7e8e62c3dabc62890e9564c97) Obviously removed the parts about enet and visual_script.
2016-10-13 18:54:00 +02:00
thirdparty_sources = [
style: Start applying PEP8 to Python files, indentation issues Done with `autopep8 --select=E1`, fixes: - E101 - Reindent all lines. - E112 - Fix under-indented comments. - E113 - Fix over-indented comments. - E115 - Fix under-indented comments. - E116 - Fix over-indented comments. - E121 - Fix a badly indented line. - E122 - Fix a badly indented line. - E123 - Fix a badly indented line. - E124 - Fix a badly indented line. - E125 - Fix indentation undistinguish from the next logical line. - E126 - Fix a badly indented line. - E127 - Fix a badly indented line. - E128 - Fix a badly indented line. - E129 - Fix a badly indented line.
2016-11-02 22:26:55 +01:00
"rg_etc1.cpp",
dds/etc1/pbm/pvr: Make those modules and split thirdparty files They are not particularly packaged in Linux distros so we do not facilitate unbundling via SCons. There could be done if/when there is interest. Also s/pnm/pbm/, long-lived typo :) (cherry picked from commit b1e8889d969f5f88539c47c2afac6c9ea2a2dc11)
2016-10-11 20:44:26 +02:00
]
modules: Clone env in each module This allows to pass include paths and flags only to a given thirdparty library, thus preventing conflicts between their files (e.g. between opus and openssl which both provide modes.h. This also has the nice effect of making the compilation command smaller for each module as it no longer related to all other modules, only the final linking brings them together. This however requires adding manually the ogg include path in opus and vorbis when building against the builtin ogg, since it is no longer in the global env. Also simplified template 'thirdparty_<module>_sources' to 'thirdparty_sources'. "Core" modules like cscript, gdscript, gridmap, ik and virtual_script still use the main env_modules, but it could be changed if need be. (cherry picked from commit da09c6131bcdace7e8e62c3dabc62890e9564c97) Obviously removed the parts about enet and visual_script.
2016-10-13 18:54:00 +02:00
thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources]
dds/etc1/pbm/pvr: Make those modules and split thirdparty files They are not particularly packaged in Linux distros so we do not facilitate unbundling via SCons. There could be done if/when there is interest. Also s/pnm/pbm/, long-lived typo :) (cherry picked from commit b1e8889d969f5f88539c47c2afac6c9ea2a2dc11)
2016-10-11 20:44:26 +02:00
modules: Clone env in each module This allows to pass include paths and flags only to a given thirdparty library, thus preventing conflicts between their files (e.g. between opus and openssl which both provide modes.h. This also has the nice effect of making the compilation command smaller for each module as it no longer related to all other modules, only the final linking brings them together. This however requires adding manually the ogg include path in opus and vorbis when building against the builtin ogg, since it is no longer in the global env. Also simplified template 'thirdparty_<module>_sources' to 'thirdparty_sources'. "Core" modules like cscript, gdscript, gridmap, ik and virtual_script still use the main env_modules, but it could be changed if need be. (cherry picked from commit da09c6131bcdace7e8e62c3dabc62890e9564c97) Obviously removed the parts about enet and visual_script.
2016-10-13 18:54:00 +02:00
env_etc1.add_source_files(env.modules_sources, thirdparty_sources)
env_etc1.Append(CPPPATH = [thirdparty_dir])
dds/etc1/pbm/pvr: Make those modules and split thirdparty files They are not particularly packaged in Linux distros so we do not facilitate unbundling via SCons. There could be done if/when there is interest. Also s/pnm/pbm/, long-lived typo :) (cherry picked from commit b1e8889d969f5f88539c47c2afac6c9ea2a2dc11)
2016-10-11 20:44:26 +02:00
# Godot source files
modules: Clone env in each module This allows to pass include paths and flags only to a given thirdparty library, thus preventing conflicts between their files (e.g. between opus and openssl which both provide modes.h. This also has the nice effect of making the compilation command smaller for each module as it no longer related to all other modules, only the final linking brings them together. This however requires adding manually the ogg include path in opus and vorbis when building against the builtin ogg, since it is no longer in the global env. Also simplified template 'thirdparty_<module>_sources' to 'thirdparty_sources'. "Core" modules like cscript, gdscript, gridmap, ik and virtual_script still use the main env_modules, but it could be changed if need be. (cherry picked from commit da09c6131bcdace7e8e62c3dabc62890e9564c97) Obviously removed the parts about enet and visual_script.
2016-10-13 18:54:00 +02:00
env_etc1.add_source_files(env.modules_sources, "*.cpp")
Reference in a new issue Copy permalink