starkos
|
9f9353eb27
|
Merge pull request #260 from tritao/framework
Rename "framework" to "dotnetframework".
|
2015-10-07 12:42:34 -04:00 |
|
Manu Evans
|
7994b16b5b
|
Merge pull request #299 from LORgames/ssurtees/submoduleUpdates
Updated submodules to the latest versions
|
2015-10-08 02:20:45 +10:00 |
|
Sam Surtees
|
18fbcf01f2
|
Updated submodules to the latest versions. Fixes #298.
|
2015-10-08 02:12:24 +10:00 |
|
Samuel Surtees
|
c0efdb2dd2
|
Merge pull request #297 from codemaster/malloc_fix
Fix malloc-defining header for clang compilation on Mac.
|
2015-10-07 19:30:57 +10:00 |
|
Andrew Kane
|
f624f8bbc8
|
Fix malloc-defining header for clang compilation on Mac.
This fixes the use of a non-standard/platform-specific malloc.h by
replacing it with the standard stdlib.h, which defines malloc.
|
2015-10-06 17:22:11 -07:00 |
|
Tom van Dijck
|
b883c7f45f
|
Merge pull request #276 from Blizzard/precompiled-embedding
Embed precompiled lua files, instead of source.
|
2015-10-06 10:39:39 -07:00 |
|
starkos
|
05279490df
|
Merge pull request #287 from kankaristo/gmake-utility
Add basic support for the 'Utility' kind in gmake
|
2015-10-06 13:35:56 -04:00 |
|
Tom van Dijck
|
9e1cfc7697
|
flip to default on for bytecode.
|
2015-10-05 15:13:50 -07:00 |
|
Tom van Dijck
|
a656792e48
|
Embed precompiled lua files, instead of source.
|
2015-10-05 12:41:11 -07:00 |
|
Tom van Dijck
|
e30b67103e
|
Merge pull request #294 from Blizzard/add-time-info
add time information.
|
2015-10-05 12:19:32 -07:00 |
|
Tom van Dijck
|
1f85fb09f5
|
Merge pull request #295 from Blizzard/move-lua
Move Lua into folder without version, so it's easier to update to a newer version.
|
2015-10-05 12:19:05 -07:00 |
|
Tom van Dijck
|
49d29e0b87
|
Merge pull request #261 from tritao/curl
Windows SSL support for HTTP
|
2015-10-05 10:16:02 -07:00 |
|
Tom van Dijck
|
78db372750
|
Merge pull request #269 from Blizzard/detoken-fix
Fix bug in recursive calls to detoken.
|
2015-10-05 10:14:42 -07:00 |
|
Tom van Dijck
|
91c98e615b
|
Move Lua into folder without version, so it's easier to update to a newer version.
|
2015-10-05 10:11:15 -07:00 |
|
Tom van Dijck
|
52ecf9e91c
|
add time information.
|
2015-10-05 09:39:33 -07:00 |
|
Tom van Dijck
|
b5c4108129
|
Merge pull request #277 from Blizzard/path-wildcards-to-c
path.wildcards -> C
|
2015-10-05 09:37:49 -07:00 |
|
Tom van Dijck
|
15b18b2375
|
Merge pull request #293 from Blizzard/error-handling-curl
Better error handling in curl.
|
2015-10-05 09:34:56 -07:00 |
|
Tom van Dijck
|
333b8d8856
|
better error handling in curl
|
2015-10-05 09:32:00 -07:00 |
|
Tom van Dijck
|
6c6b035251
|
fix some warnings.
|
2015-10-05 09:31:45 -07:00 |
|
Tom van Dijck
|
5d4a24a3d1
|
Merge pull request #291 from Blizzard/memory-opt-mergeFilters
context.mergeFilters doesn't need to do a deepcopy, because table.merge already copies everything.
|
2015-10-05 09:30:21 -07:00 |
|
Tom van Dijck
|
268843b57e
|
Merge pull request #290 from Blizzard/fix-additionalusing
fix m.additionalUsingDirectories
|
2015-10-05 09:27:02 -07:00 |
|
Tom van Dijck
|
0c21e59057
|
context.mergeFilters doesn't need to do a deepcopy, because table.merge already copies everything.
|
2015-10-05 09:26:41 -07:00 |
|
Tom van Dijck
|
6e6e30b413
|
Merge pull request #289 from Blizzard/add-wks-getrelative
add workspace.getrelative(sln, filename)
|
2015-10-05 09:21:49 -07:00 |
|
Tom van Dijck
|
811ac304d4
|
fix m.additionalUsingDirectories
|
2015-10-05 09:21:26 -07:00 |
|
Tom van Dijck
|
48c41dcb59
|
Merge pull request #288 from Blizzard/fix-bug-appendextension
fix bug in appendExtension.
|
2015-10-05 09:17:51 -07:00 |
|
Tom van Dijck
|
5c3504c7a7
|
add workspace.getrelative(sln, filename)
|
2015-10-05 09:17:39 -07:00 |
|
Tom van Dijck
|
8467be1612
|
fix bug in appendExtension.
|
2015-10-05 09:16:08 -07:00 |
|
Sami Kankaristo
|
c71562f072
|
Add test for gmake Utility projects
|
2015-10-03 12:06:39 +03:00 |
|
Sami Kankaristo
|
77efd0bab3
|
Add basic support for the 'Utility' kind in gmake
|
2015-10-01 05:34:49 +03:00 |
|
starkos
|
991561c600
|
Merge pull request #246 from Blizzard/fix-dependencies
Fix project dependencies.
|
2015-09-28 18:04:55 -04:00 |
|
starkos
|
e734bf6195
|
Merge pull request #284 from LORgames/ssurtees/configurationActions
Added configuration actions array to allow easy extension of actions
|
2015-09-28 11:49:16 -04:00 |
|
Sam Surtees
|
d99cba2f07
|
Converted vs2005 project configuration platforms to use call arrays.
|
2015-09-28 22:23:24 +10:00 |
|
Manu Evans
|
b7e27fbc25
|
Merge pull request #272 from Euclideon/custom_files_first
Changed dependency order for ${CUSTOMFILES}
|
2015-09-27 13:59:08 +10:00 |
|
Manu Evans
|
f035d0a68c
|
Merge pull request #273 from Euclideon/link_grouping
Group sibling libs for GCC/Clang
|
2015-09-24 08:59:19 +10:00 |
|
starkos
|
e3c800eb0a
|
Merge pull request #247 from Blizzard/support-framework-folders
support framework folders in gcc/clang
|
2015-09-21 19:38:19 -04:00 |
|
starkos
|
9c76d29b8c
|
Merge pull request #244 from Blizzard/lua-no-deprecated-api-use
Don't use deprecated LUA API's
|
2015-09-21 19:28:34 -04:00 |
|
Tom van Dijck
|
cf9b366ee7
|
path.wildcards -> C
|
2015-09-17 09:10:11 -07:00 |
|
starkos
|
847fc633ac
|
Merge pull request #242 from Blizzard/fix-path-join
Recognize more situations where '..' should not be trimmed.
|
2015-09-16 18:40:49 -04:00 |
|
Jason Perkins
|
2f2babde59
|
Merge branch 'LORgames-ssurtees/fixedEmptyProjectBug'
|
2015-09-16 18:35:55 -04:00 |
|
Jason Perkins
|
d623e47d2a
|
Merge branch 'ssurtees/fixedEmptyProjectBug' of https://github.com/LORgames/premake-core into LORgames-ssurtees/fixedEmptyProjectBug
# Conflicts:
# tests/actions/vstudio/vc2010/test_platform_toolset.lua
|
2015-09-16 18:35:25 -04:00 |
|
starkos
|
ae6a9ce579
|
Merge pull request #271 from starkos/rollback-263
Revert "Switch 'require' to use xpcall for error handling."
|
2015-09-16 18:00:59 -04:00 |
|
Sam Surtees
|
01dfaf611c
|
Added tests and file type testing helper function
|
2015-09-16 22:31:40 +10:00 |
|
Manu Evans
|
4c11977bd3
|
Fixed the tests.
|
2015-09-16 15:56:57 +10:00 |
|
Manu Evans
|
74d53e366d
|
${CUSTOMFILES} is often used to produce dependencies for the build, so it needs to be first.
|
2015-09-16 15:17:55 +10:00 |
|
Manu Evans
|
fb09112fc4
|
Wrap sibling dependencies in --start-group, --end-group (for GCC and Clang)
|
2015-09-16 15:17:39 +10:00 |
|
Jason Perkins
|
fd6e80aba5
|
Revert "Switch 'require' to use xpcall for error handling."
This reverts commit 6aad3ef432.
|
2015-09-15 18:50:13 -04:00 |
|
starkos
|
158a80c696
|
Merge pull request #239 from Blizzard/improve-determinism
improve determinism
|
2015-09-15 18:30:23 -04:00 |
|
Sam Surtees
|
0c497da65e
|
Empty projects no longer ignore platform toolset when there are no "cpp" files present. Fixes #93
|
2015-09-15 21:03:25 +10:00 |
|
starkos
|
d3d3d9e0a5
|
Merge pull request #263 from tritao/xpcall
Switch 'require' to use xpcall for error handling.
|
2015-09-12 14:37:17 -04:00 |
|
starkos
|
fcb06adcf4
|
Merge pull request #259 from starkos/rollback-162
Roll back pull request #162
|
2015-09-10 15:03:23 -04:00 |
|