aboutsummaryrefslogtreecommitdiff
path: root/SConstruct (follow)
Commit message (Collapse)AuthorAgeFilesLines
* scons: Move lib splitting method to methods.pyRémi Verschelde2016-10-311-0/+1
| | | | | | Apparently it might still be necessary for some console ports. (cherry picked from commit e34a5324c884960735b3f743956b3a052574d6ee)
* "CCFLAGS" are for C and C++ compilerBłażej Szczygieł2016-10-311-1/+1
| | | | (cherry picked from commit ace18d28d2cc02c0b59b9d90b3f6f578d2617ed8)
* Fix output binary paths for VS project generationGeorge Marques2016-10-301-3/+3
| | | | (cherry picked from commit c8093678a08df8e5dc3878e6136cfab131a65227)
* SCons: Use colored output if available, change "colored"->"verbose"Błażej Szczygieł2016-10-301-3/+5
| | | | (cherry picked from commit 2bf4553fe056c1fab5367dfae62426d3c7cf8168)
* Disable asserts in release modeBłażej Szczygieł2016-10-301-0/+2
| | | | (cherry picked from commit 639ea563e059007675e3fe8071fd24d882da29ba)
* SCsub: Add python shebang as a hint for syntax highlightingRémi Verschelde2016-10-301-0/+2
| | | | | | Also switch existing shebangs to "better" /usr/bin/env python. (cherry picked from commit fc8ccd5b8c8b779bffd0f4d7f22f2f964c939163)
* Theora: Don't compile unnecessary files, rename "x86_opt_*"Błażej Szczygieł2016-10-301-3/+2
| | | | (cherry picked from commit 4ffa8f224d8d57520bd4953d67291c83152cd5e5)
* freetype: Make it a module and split thirdparty libraryRémi Verschelde2016-10-301-9/+1
| | | | | | | Comment out the weird workaround for building on Windows at it might not be needed anymore. Testing needed to confirm. (cherry picked from commit edbc0c0d0bed169b3c07ef0f504b97936f0dab37)
* zlib: Split thirdparty files, simplify scons optionRémi Verschelde2016-10-301-4/+0
| | | | (cherry picked from commit cbf52606f4928df46fc89d37d781bad782f0616e)
* glew: Split thirdparty files and isolate envRémi Verschelde2016-10-301-0/+1
| | | | | | | | 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. (cherry picked from commit 36738ddda4f732fff7bbfb7b4605a47a0bd7c045)
* squish: Move to a module and split thirdparty libRémi Verschelde2016-10-301-4/+1
| | | | (cherry picked from commit 8311a78df5cdf257297c1ec7493cb098dc76f010)
* mpc: Move to a module and split thirdparty libmpcdecRémi Verschelde2016-10-301-4/+1
| | | | (cherry picked from commit 5c12c9e69b85023934dc85f3aada03da150556be)
* theora: Move to a module and split thirdparty libRémi Verschelde2016-10-301-9/+1
| | | | | | Same rationale as the previous commits. (cherry picked from commit cfcc8a20e862b758c32bd3f152186e6df0591a24)
* openssl: Move to a module and split thirdparty libRémi Verschelde2016-10-301-6/+1
| | | | | | | | Same rationale as the previous commits. (cherry picked from commit 422196759f93df249db38619f136cabd5dcf42cd) Removed the winrt-specific parts.
* ogg/vorbis/opus/speex: Make them modules and unbundle thirdparty libsRémi Verschelde2016-10-301-10/+7
| | | | | | | | | | | | | | | 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. (cherry picked from commit d9a291f6411f2e571c181da0ac89f550ba73f681) speex module was only added while cherry-picking, as speex is removed in the master branch but we don't want to break compatibility in 2.1.x. Unbundling wasn't done as the module uses the internal speex_free, so it would require some more work.
* webp: Make it a module and unbundle libwebp thirdparty filesRémi Verschelde2016-10-301-5/+1
| | | | | | | | Note that there are two Godot-specific changes made to libwebp for the javascript/HTML5 platform. They are documented in the README.md. (cherry picked from commit ee3cf211c6fd4d1e30617467cdbbe945798a68b3)
* dds/etc1/pbm/pvr: Make those modules and split thirdparty filesRémi Verschelde2016-10-301-11/+1
| | | | | | | | | | 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)
* jpg: Make it a module and split jpgd thirdparty filesRémi Verschelde2016-10-301-3/+0
| | | | | | Similar rationale as in previous commit. (cherry picked from commit 16ba665db6bbd7f15aadc35fda87d69d0b220bf7)
* png: Split library to thirdparty dir and allow unbundlingRémi Verschelde2016-10-301-3/+1
| | | | | | | | | | | | | | 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. (cherry picked from commit 5fef84a1358310304cb1114924525ec4df794b49)
* Fix Android build detection on WindowsGeorge Marques2016-10-171-1/+1
| | | | (cherry picked from commit 4bdbafabce5aea47d131473a0b46830c401cc251)
* Add CC parameter to allow use of custom C compilerEmmanuel Leblond2016-10-091-1/+2
| | | | (cherry picked from commit cfd17de23098297d076def400cd6d506700a5f03)
* Add android_add_default_config for config.pyvolzhs2016-07-071-0/+2
| | | | usage : env.android_add_default_config("applicationId 'com.godot.game'")
* Change method of storing folding, solves problems with inheritance, closes #3395Juan Linietsky2016-06-281-0/+4
|
* Cleaner way to enable ptrcallJuan Linietsky2016-06-261-1/+4
|
* added "arch" parameter, made iphone use it to build isimAriel Manzur2016-06-231-1/+4
|
* -make freetype build for all platforms the same, default as builtin except ↵Juan Linietsky2016-06-091-1/+10
| | | | | | on x11. closes #5119
* Keep the default environment variables as set by SConsPedro J. Estébanez2016-06-061-8/+3
|
* Fix MS Visual Studio build settingsAleksandar Danilovic2016-05-281-7/+18
| | | | | | | | | | | | | | | | | 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.
* Added 'fat' option for bits param on scons for osx, this will produce a fat ↵marcelofg552016-05-201-1/+3
| | | | binary that contains both 32 bits and 64 bits binaries
* cloning env for builtin_openssl _and_ openssl :)Ariel Manzur2016-05-061-4/+4
|
* Ignore invalid folders in `platform`Rémi Verschelde2016-04-291-1/+1
| | | | Fixes #4479
* Remove trailing spacesRémi Verschelde2016-04-021-1/+1
|
* inherit PKG_CONFIG_PATH from environmentMaxwell Huang-Hobbs2016-03-301-1/+6
|
* -Many fixes to windows build system with Mingw on Windows. Fixes #2690Juan Linietsky2016-01-251-0/+5
|
* -Removed ANT build system for Android, as it was deprecated by GoogleJuan Linietsky2016-01-081-9/+16
| | | | -Added new Gradle build system, as it is the required build system
* Merge pull request #2956 from est31/add_system_wide_export_pathJuan Linietsky2015-12-081-0/+1
|\ | | | | Add way to look for templates at system wide level too
| * Make the setting unix-only.est312015-11-301-1/+1
| | | | | | | | For this, put the detection into the OS class and its subclass.
| * Add way to look for templates at system wide level tooest312015-11-301-0/+1
| | | | | | | | | | | | | | | | Useful for everybody wanting to package godot. Fixes #1026. -> Retain the old behaviour: path in error msg only when exporting. -> User templates override system templates
* | -Upgraded webp to a MUCH newer version. Hoping it fixes some bugs in the ↵Juan Linietsky2015-12-041-0/+1
|/ | | | | | process. Keeping old version just in case for now. -Added ability to convert xml and tscn scenes to binary on export, makes loading of larger scenes faster
* 0theora compilation fixesJuan Linietsky2015-11-251-0/+4
|
* -work in progress resourceparser and .tscn parser. Still non-functionalJuan Linietsky2015-11-241-2/+5
| | | | | -fixed theora so it can compile theoralib but not theora -fixed generation of windows icon in .rc, which didn't previously work in 32 bits
* Revert "libao audio driver"Juan Linietsky2015-11-191-1/+0
|
* Merge pull request #903 from a12n/libaoJuan Linietsky2015-11-191-0/+1
|\ | | | | libao audio driver
| * Merge branch 'master' of github.com:okamstudio/godotAnton Yabchinskiy2015-11-021-7/+13
| |\
| * \ Merge branch 'master' of github.com:okamstudio/godotAnton Yabchinskiy2015-07-291-0/+58
| |\ \
| * \ \ Merge branch 'master' of https://github.com/okamstudio/godotAnton Yabchinskiy2015-03-101-0/+4
| |\ \ \
| * \ \ \ Merge branch 'master' of github.com:okamstudio/godotAnton Yabchinskiy2015-01-171-0/+4
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' of github.com:okamstudio/godotAnton Yabchinskiy2015-01-051-2/+2
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' of http://github.com/okamstudio/godotAnton Yabchinskiy2014-12-041-1/+0
| |\ \ \ \ \ \
| * | | | | | | Add 'ao' build optionAnton Yabchinskiy2014-11-221-0/+1
| | | | | | | |