George Marques
8cb09bf9d0
Fix Android build detection on Windows
...
(cherry picked from commit 4bdbafabce
)
2016-10-17 20:43:03 +02:00
Emmanuel Leblond
a5fe7ffbcd
Add CC parameter to allow use of custom C compiler
...
(cherry picked from commit cfd17de230
)
2016-10-09 17:21:33 +02:00
volzhs
40d3234304
Add android_add_default_config for config.py
...
usage : env.android_add_default_config("applicationId 'com.godot.game'")
2016-07-07 04:03:50 +09:00
Juan Linietsky
5065e46381
Change method of storing folding, solves problems with inheritance, closes #3395
2016-06-28 13:10:15 -03:00
Juan Linietsky
fb9d1498bf
Cleaner way to enable ptrcall
2016-06-26 11:59:25 -03:00
Ariel Manzur
10c512e46d
added "arch" parameter, made iphone use it to build isim
2016-06-23 07:41:54 +02:00
Juan Linietsky
94a6ff3d7a
-make freetype build for all platforms the same, default as builtin except on x11.
...
closes #5119
2016-06-09 21:28:07 -03:00
Pedro J. Estébanez
ad0af9d273
Keep the default environment variables as set by SCons
2016-06-06 13:49:28 +02:00
Aleksandar Danilovic
ca876191e5
Fix MS Visual Studio build settings
...
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-28 17:15:12 +02:00
marcelofg55
eeb83982e2
Added 'fat' option for bits param on scons for osx, this will produce a fat binary that contains both 32 bits and 64 bits binaries
2016-05-20 17:31:30 -03:00
Ariel Manzur
baaa74f215
cloning env for builtin_openssl _and_ openssl :)
2016-05-06 22:43:22 -03:00
Rémi Verschelde
f938793e78
Ignore invalid folders in `platform`
...
Fixes #4479
2016-04-29 18:58:37 +02:00
Rémi Verschelde
0a5472e697
Remove trailing spaces
2016-04-02 20:26:12 +02:00
Maxwell Huang-Hobbs
32391ffd73
inherit PKG_CONFIG_PATH from environment
2016-03-30 10:44:58 -04:00
Juan Linietsky
caddcca4f4
-Many fixes to windows build system with Mingw on Windows. Fixes #2690
2016-01-25 00:21:04 -03:00
Juan Linietsky
401622cc22
-Removed ANT build system for Android, as it was deprecated by Google
...
-Added new Gradle build system, as it is the required build system
2016-01-08 13:36:44 -03:00
Juan Linietsky
eff81965af
Merge pull request #2956 from est31/add_system_wide_export_path
...
Add way to look for templates at system wide level too
2015-12-08 17:04:24 -03:00
Juan Linietsky
da113fe40d
-Upgraded webp to a MUCH newer version. Hoping it fixes some bugs in the 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
2015-12-04 10:18:28 -03:00
est31
e1d02e4831
Make the setting unix-only.
...
For this, put the detection into the OS class and its subclass.
2015-11-30 02:35:59 +01:00
est31
15f6d3cebf
Add way to look for templates at system wide level too
...
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
2015-11-30 01:36:08 +01:00
Juan Linietsky
b987d2113b
0theora compilation fixes
2015-11-25 00:28:03 -03:00
Juan Linietsky
ccd40f76e8
-work in progress resourceparser and .tscn parser. Still non-functional
...
-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
2015-11-24 10:42:05 -03:00
Juan Linietsky
dd09215c90
Revert "libao audio driver"
2015-11-19 20:05:26 -03:00
Juan Linietsky
43ce972ddb
Merge pull request #903 from a12n/libao
...
libao audio driver
2015-11-19 19:31:56 -03:00
Anton Yabchinskiy
3b9868d2e4
Merge branch 'master' of github.com:okamstudio/godot
2015-11-02 20:25:01 +03:00
Rémi Verschelde
399b1b0474
Cosmetic fixes to SCons buildsystem
...
- Removed trailing spaces
- Made sure all indentation is done using tabs (fixes #39 )
- Potentially fixed an identation issue for openssl check
2015-11-01 20:53:26 +01:00
George Marques
6e87314d83
Add support for Opus audio format
2015-10-02 14:25:38 -03:00
Juan Linietsky
700fdf5c0c
fix build issue with ssl, closes #2384
2015-08-23 20:54:13 -03:00
Anton Yabchinskiy
dc8df8a91a
Merge branch 'master' of github.com:okamstudio/godot
2015-07-29 23:01:36 +03:00
PeaceSells
9983ceecf2
Fixes compile bug for Android template on Windows.
2015-07-24 13:12:23 -06:00
Peace Sells
6edbab0a9f
Setting build vs properties in scons.
2015-06-21 14:21:24 -06:00
Antony Jones
2a4da03f10
Added Visual Studio project generation. Use "vsproj=yes" in command line. This does not set up NMAKE properly.
2015-05-03 15:18:56 -06:00
Juan Linietsky
b135cdbf05
Merge pull request #1531 from vkbsb/h5_canvas_polygon_fix
...
H5 canvas polygon fix
2015-04-07 20:22:58 -03:00
yg2f
7ea3482c38
add scons extra suffix option
...
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
2015-04-01 17:04:41 +02:00
V.VamsiKrishna
beab10ab9b
Revert "Revert "Missed some things in prev commit.""
...
This reverts commit 2e59788aa9
.
2015-03-20 11:48:21 +05:30
V.VamsiKrishna
eb3c88b3dd
Revert "Revert "Removing etc1 from build for javascript platform.""
...
This reverts commit 9965e93f7e
.
2015-03-20 11:47:56 +05:30
V.VamsiKrishna
2e59788aa9
Revert "Missed some things in prev commit."
...
This reverts commit d3280f91a1
.
2015-03-20 11:12:59 +05:30
V.VamsiKrishna
9965e93f7e
Revert "Removing etc1 from build for javascript platform."
...
This reverts commit 41b729ccff
.
2015-03-20 11:12:13 +05:30
V.VamsiKrishna
d3280f91a1
Missed some things in prev commit.
2015-03-20 11:06:28 +05:30
V.VamsiKrishna
41b729ccff
Removing etc1 from build for javascript platform.
...
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.
2015-03-20 10:18:13 +05:30
Anton Yabchinskiy
43713810de
Merge branch 'master' of https://github.com/okamstudio/godot
2015-03-10 11:44:40 +03:00
Juan Linietsky
4d2198110b
merges from okam repo
2015-03-03 14:39:13 -03:00
Anton Yabchinskiy
fa38e9b838
Merge branch 'master' of github.com:okamstudio/godot
2015-01-17 18:27:08 +03:00
hurikhan
f9a4e6890b
SCons: colored compilation
2015-01-12 12:54:17 +08:00
Anton Yabchinskiy
a7875c586a
Merge branch 'master' of github.com:okamstudio/godot
2015-01-05 23:56:24 +03:00
Juan Linietsky
6b5b95bb4e
-added new code completion guess locations, closes #1032
...
-moved commandline fix to mingw-only, should fix #1064
2015-01-03 13:03:13 -03:00
Lee Zher Huei
645a038568
Fix for MinGW compilation
2014-12-27 16:42:37 +00:00
Anton Yabchinskiy
d45be7d9f4
Merge branch 'master' of http://github.com/okamstudio/godot
2014-12-04 16:35:00 +03:00
Thomas Sigurdsen
c981f5409f
Remove multiprocessing from imports in SConstruct
...
Rationale: unused import, also prevented scons from building on my
setup.
2014-12-03 17:36:29 +01:00
Anton Yabchinskiy
05f6c73020
Add 'ao' build option
2014-11-22 13:37:40 +03:00