summaryrefslogtreecommitdiff
path: root/SConstruct
AgeCommit message (Collapse)Author
2016-11-01style: Fix PEP8 blank lines issues in Python filesRémi Verschelde
Done with `autopep8 --select=E3,W3`, fixes: - E301 - Add missing blank line. - E302 - Add missing 2 blank lines. - E303 - Remove extra blank lines. - E304 - Remove blank line following function decorator. - E309 - Add missing blank line. - W391 - Remove trailing blank lines.
2016-11-01style: Fix PEP8 whitespace issues in Python filesRémi Verschelde
Done with `autopep8 --select=E2,W2`, fixes: - E201 - Remove extraneous whitespace. - E202 - Remove extraneous whitespace. - E203 - Remove extraneous whitespace. - E211 - Remove extraneous whitespace. - E221 - Fix extraneous whitespace around keywords. - E222 - Fix extraneous whitespace around keywords. - E223 - Fix extraneous whitespace around keywords. - E224 - Remove extraneous whitespace around operator. - E225 - Fix missing whitespace around operator. - E226 - Fix missing whitespace around operator. - E227 - Fix missing whitespace around operator. - E228 - Fix missing whitespace around operator. - E231 - Add missing whitespace. - E231 - Fix various deprecated code (via lib2to3). - E241 - Fix extraneous whitespace around keywords. - E242 - Remove extraneous whitespace around operator. - E251 - Remove whitespace around parameter '=' sign. - E261 - Fix spacing after comment hash. - E262 - Fix spacing after comment hash. - E265 - Format block comments. - E271 - Fix extraneous whitespace around keywords. - E272 - Fix extraneous whitespace around keywords. - E273 - Fix extraneous whitespace around keywords. - E274 - Fix extraneous whitespace around keywords. - W291 - Remove trailing whitespace. - W293 - Remove trailing whitespace.
2016-11-01style: Start applying PEP8 to Python files, indentation issuesRémi Verschelde
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-10-30Merge pull request #6490 from zaps166/webm-prRémi Verschelde
Add WebM support
2016-10-30Merge pull request #6959 from RandomShaper/fix-big-libsRémi Verschelde
Adopt simpler strategy for big libs on Windows
2016-10-30scons: Move lib splitting method to methods.pyRémi Verschelde
Apparently it might still be necessary for some console ports.
2016-10-26fix bug introduced by #6501yg2f
( @Akien : this PR is for current HEAD only, not to be cherry-picked for 2.1.1 ) this is manual revertion of #6501 which introduced a bug that prevented scons from detecting Mingw under Windows when MSVC was installed. (thanks to @vnen for finding this) AND it fixes the actual bug that prevented scons from detecting MSVC standalone compiler ( a confusions between ``VSINSTALLDIR`` and ``VCINSTALLDIR`` ) The freeware Standalone MSVC C++ Build Tools are available here : http://landinghub.visualstudio.com/visual-cpp-build-tools
2016-10-23Add WebM moduleBłażej Szczygieł
Use already existing libraries: libvorbis and libopus. Also use newly added libraries: libvpx, libwebm, libsimplewebm.
2016-10-22"CCFLAGS" are for C and C++ compilerBłażej Szczygieł
2016-10-22Merge pull request #6881 from vnen/msvc-project-outputRémi Verschelde
Fix output binary paths for VS project generation
2016-10-22Merge pull request #6858 from zaps166/gcc-color-outputRémi Verschelde
SCons: Use colored output if available, change "colored"->"verbose"
2016-10-22Merge pull request #6857 from zaps166/disable-asserts-in-releaseRémi Verschelde
Disable asserts in release mode
2016-10-20Fix output binary paths for VS project generationGeorge Marques
2016-10-18Merge pull request #6855 from vnen/xaudio2-driverRémi Verschelde
Isolate XAudio2 driver
2016-10-17Isolate XAudio2 driverGeorge Marques
Now it's possible to compile for Windows platform if wanted. It's supported only for Windows 8 or later, so it's not enabled by default.
2016-10-17SCons: Use colored output if available, change "colored"->"verbose"Błażej Szczygieł
2016-10-17Disable asserts in release modeBłażej Szczygieł
2016-10-17Merge pull request #6850 from akien-mga/pr-scsub-shebangRémi Verschelde
SCsub: Add python shebang as a hint for syntax highlighting
2016-10-17SCsub: Add python shebang as a hint for syntax highlightingRémi Verschelde
Also switch existing shebangs to "better" /usr/bin/env python.
2016-10-16Theora: Don't compile unnecessary files, rename "x86_opt_*"Błażej Szczygieł
2016-10-15freetype: Make it a module and split thirdparty libraryRémi Verschelde
Comment out the weird workaround for building on Windows at it might not be needed anymore. Testing needed to confirm.
2016-10-15zlib: Split thirdparty files, simplify scons optionRémi Verschelde
2016-10-15glew: Split thirdparty files and isolate envRémi Verschelde
Not fully happy about the way this one interacts with the various platforms. Maybe the platform_config.h should be generated by the SCsub instead of passing a define just to know where is the header.
2016-10-15squish: Move to a module and split thirdparty libRémi Verschelde
2016-10-15mpc: Move to a module and split thirdparty libmpcdecRémi Verschelde
2016-10-15theora: Move to a module and split thirdparty libRémi Verschelde
Same rationale as the previous commits.
2016-10-15openssl: Move to a module and split thirdparty libRémi Verschelde
Same rationale as the previous commits.
2016-10-15ogg/vorbis/opus: Make them modules and unbundle thirdparty libsRémi Verschelde
Took the opportunity to undo the Godot changed made to the opus source. The opus module should eventually be built in its own environment to avoid polluting others with too many include dirs and defines. TODO: Fix the platform/ stuff for opus.
2016-10-15webp: Make it a module and unbundle libwebp thirdparty filesRémi Verschelde
Note that there are two Godot-specific changes made to libwebp for the javascript/HTML5 platform. They are documented in the README.md.
2016-10-15dds/etc1/pbm/pvr: Make those modules and split thirdparty filesRémi Verschelde
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 :)
2016-10-15enet: Split enet thirdparty files and allow unbundlingRémi Verschelde
Building against shared libraries only implemented for Linux X11 so far. TODO: Document Godot's modifications of upstream enet.
2016-10-15jpg: Make it a module and split jpgd thirdparty filesRémi Verschelde
Similar rationale as in previous commit.
2016-10-15png: Split library to thirdparty dir and allow unbundlingRémi Verschelde
Uses the new structure agreed upon in #6157, but the thirdparty/ folder does not behave following a logic similar to that of modules/ yet. The png driver can't be moved to a module as discussed in #6157, as it's required by core together with a few other ImageLoader implementations (see drivers/register_driver_types.cpp:register_core_driver_types()) Dropped the possibility to disable PNG support, it's a core component of Godot.
2016-10-13Remove speex support, it is obsoleted by opusRémi Verschelde
As mentioned by upstream, Xiph.Org [0]: > The Speex codec has been obsoleted by Opus. It will continue to be > available, but since Opus is better than Speex in all aspects, > users are encouraged to switch. [0] http://www.speex.org/
2016-10-09Fix Android build detection on WindowsGeorge Marques
2016-10-03Merge pull request #6501 from ↵Rémi Verschelde
SuperUserNameMan/windows_compile_with_standalone_msvc scons detects standalone MSVC on Windows
2016-09-25Add CC parameter to allow use of custom C compilerEmmanuel Leblond
2016-09-16scons detects standalone MSVC on Windowsyg2f
Under Windows, Scons is now capable of detecting and compiling with standalone MSVC compilers (aka "Visual C++ Build Tools"). http://landinghub.visualstudio.com/visual-cpp-build-tools Tried with version 2015, and native x86 and x64 compilers under Windows 10 pro 64 and Windows 8.1 64, with the default Win8 SDK provided by the "Visual C++ Build Tools" web-installer. Follow the same compiling instructions than for compiling with Visual Studio, except that Visual Studio is no more required. KNOWN ISSUES : - ``methods.detect_visual_c_compiler_version()`` will emit a warning message on computers where the ``VSINSTALLDIR`` environement variable is not present. But it should compile just fine and still automatically detects the 32 or 64 bits according to the compiler you picked. TODO : - eventually, update ``platform/winrt/dectet.py`` with function ``methods.msvc_is_detected()`` and try to compile winrt/UWP with these standalone compilers (if you did not select Win10 SDK when installing the standalone tools, you can run it again). - update doc to make users aware of "Visual C++ Build Tools" aka "stadalone MSVC". - eventually, update ``methods.detect_visual_c_compiler_version()``
2016-07-07Add android_add_default_config for config.pyvolzhs
usage : env.android_add_default_config("applicationId 'com.godot.game'")
2016-06-28Change method of storing folding, solves problems with inheritance, closes #3395Juan Linietsky
2016-06-26Cleaner way to enable ptrcallJuan Linietsky
2016-06-23added "arch" parameter, made iphone use it to build isimAriel Manzur
2016-06-09-make freetype build for all platforms the same, default as builtin except ↵Juan Linietsky
on x11. closes #5119
2016-06-06Keep the default environment variables as set by SConsPedro J. Estébanez
2016-05-28Fix MS Visual Studio build settingsAleksandar Danilovic
NMake was not setup by the vsproj=yes compilation parameter. After attempting other possible options, this is the best fix for our current requirements. Compiling via NMake is implementing an alternative to SCons, so this fix escapes out of NMake environment while also supporting different target builds and IDE error list integration. Also sets -j setting to 2 so that it's easy for people to change it to a propper value and speed it up a bit for those that do not. Adds two missing .gitignore Visual Studio temp files present in Visual Studio's .gitignore.
2016-05-20Added 'fat' option for bits param on scons for osx, this will produce a fat ↵marcelofg55
binary that contains both 32 bits and 64 bits binaries
2016-05-06cloning env for builtin_openssl _and_ openssl :)Ariel Manzur
2016-04-29Ignore invalid folders in `platform`Rémi Verschelde
Fixes #4479
2016-04-02Remove trailing spacesRémi Verschelde
2016-03-30inherit PKG_CONFIG_PATH from environmentMaxwell Huang-Hobbs