aboutsummaryrefslogtreecommitdiff
path: root/SConstruct
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | | | | | | |
* | | | | | | | Cosmetic fixes to SCons buildsystemRémi Verschelde2015-11-011-25/+26
| |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Removed trailing spaces - Made sure all indentation is done using tabs (fixes #39) - Potentially fixed an identation issue for openssl check
* | | | | | | Add support for Opus audio formatGeorge Marques2015-10-021-0/+3
| | | | | | |
* | | | | | | fix build issue with ssl, closes #2384Juan Linietsky2015-08-231-3/+3
| | | | | | |
* | | | | | | Fixes compile bug for Android template on Windows.PeaceSells2015-07-241-4/+7
| |_|_|_|_|/ |/| | | | |
* | | | | | Setting build vs properties in scons.Peace Sells2015-06-211-0/+5
| | | | | |
* | | | | | Added Visual Studio project generation. Use "vsproj=yes" in command line. ↵Antony Jones2015-05-031-0/+46
| | | | | | | | | | | | | | | | | | | | | | | | This does not set up NMAKE properly.
* | | | | | Merge pull request #1531 from vkbsb/h5_canvas_polygon_fixJuan Linietsky2015-04-071-0/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | H5 canvas polygon fix
| * | | | | | Revert "Revert "Missed some things in prev commit.""V.VamsiKrishna2015-03-201-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 2e59788aa9be6dab49e06588fcb1cf812e55a0cf.
| * | | | | | Revert "Revert "Removing etc1 from build for javascript platform.""V.VamsiKrishna2015-03-201-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 9965e93f7eb7297490de597cc8ed8e18b4ba2872.
| * | | | | | Revert "Missed some things in prev commit."V.VamsiKrishna2015-03-201-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit d3280f91a13da6c106f95c289c095714c638d201.
| * | | | | | Revert "Removing etc1 from build for javascript platform."V.VamsiKrishna2015-03-201-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 41b729ccff74e5a9154bee7db0d36ffd74641eae.
| * | | | | | Missed some things in prev commit.V.VamsiKrishna2015-03-201-0/+2
| | | | | | |
| * | | | | | Removing etc1 from build for javascript platform.V.VamsiKrishna2015-03-201-0/+1
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Based on inputs from reduz 1) Made etc1 optional driver and default yes. 2) Reverted the hack in rg_etc1.cpp 3) Disabled etc1 for javascript plaform.
* / | | | | add scons extra suffix optionyg2f2015-04-011-0/+4
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | makes it possible to add a custom extra suffix to the base filename of all generated binary files. example : scons p=windows extra_suffix=yourBranchName or scons p=windows bits=32 extra_suffix=v20150401_1642 or scons p=windows extra_suffix=msvc2010_git20150401
* | | | / merges from okam repoJuan Linietsky2015-03-031-0/+4
| |_|_|/ |/| | |
* | | | SCons: colored compilationhurikhan2015-01-121-0/+4
| |_|/ |/| |
* | | -added new code completion guess locations, closes #1032Juan Linietsky2015-01-031-20/+0
| | | | | | | | | | | | -moved commandline fix to mingw-only, should fix #1064
* | | Fix for MinGW compilationLee Zher Huei2014-12-271-2/+22
| |/ |/|
* | Remove multiprocessing from imports in SConstructThomas Sigurdsen2014-12-031-1/+0
|/ | | | | Rationale: unused import, also prevented scons from building on my setup.
* -Much improvement to baked light bakerJuan Linietsky2014-10-271-0/+1
| | | | | | | -Fixed many bugs in stretch mode -Fixes to camera project and unproject as consequence of the above -added setget to script (documented in script doc) -more fixes to collada exporter for blender
* Build System ChangesJuan Linietsky2014-10-071-73/+67
| | | | | | | | | | | | | -=-=-=-=-=-=-=-=-=-= Build System: -Big clean up of SCons, changed how builds are done to a much cleaner method (check the Github Wiki for instructions). -Deactivated BlackBerry10 (sorry), if no mantainer found (or BlackBerry does not send us a Passort ;), platform will be removed as we have no longer devices to test. Engine: -Removed deprecated object and scene format (was in there just for compatibility, not in use since a long time). -Added ability to open scenes even if a node type was removed (will try to guess the closest type). -Removed deprecated node types.
* 3D Physics and Other StuffJuan Linietsky2014-09-021-2/+3
| | | | | | | | | | | | | | -=-=-=-=-=-=-=-=-=-=-=-=-= -New Vehicle (Based on Bullet's RaycastVehicle) - Vehiclebody/VehicleWheel. Demo will come soon, old vehicle (CarBody) will go away soon too. -A lot of fixes to the 3D physics engine -Added KinematicBody with demo -Fixed the space query API for 2D (demo will come soon). 3D is WIP. -Fixed long-standing bug with body_enter/body_exit for Area and Area2D -Performance variables now includes physics (active bodies, collision pairs and islands) -Ability to see what's inside of instanced scenes! -Fixed Blend Shapes (no bs+skeleton yet) -Added an Android JavaClassWrapper singleton for using Android native classes directly from GDScript. This is very Alpha!
* Small Issues & MaintenanceJuan Linietsky2014-08-011-1/+1
| | | | | | | | | -=-=-=-=-=-=-=-=-=-=-=-=-= -Begin work on Navigation Meshes (simple pathfinding for now, will improve soon) -More doc on theme overriding -Upgraded OpenSSL to version without bugs -Misc bugfixes
* Light Baker!Juan Linietsky2014-06-111-0/+1
| | | | | | -=-=-=-=-=-= -Support for lightmap baker, have fun figuring out how it works before tutorial is published.
* -Fixes to OpenSSL compilation (more)Juan Linietsky2014-05-011-1/+2
| | | | -Fix bug in GDScript, now static functions can call static functions.
* -Added OpenSSL and HTTPS supportJuan Linietsky2014-04-281-0/+6
| | | | | -Built-in version of the library for Windows, Android and iOS (other OSs use system one) -Small fixes all around
* Set multi-jobs build option defaul to nomarynate2014-03-171-1/+1
|