Commit Graph

3075 Commits

Author SHA1 Message Date
Tom van Dijck
651f9fd790 Merge pull request #804 from Blizzard/update-lua
Update to Lua 5.3.4
2017-06-19 12:12:48 -07:00
Tom van Dijck
971f7b58dc Fix os.outputof for lua 5.3.4 2017-06-19 12:11:49 -07:00
Tom van Dijck
7d503ad511 Define TRUE/FALSE if not already defined. 2017-06-19 12:11:49 -07:00
Tom van Dijck
5663d25857 fix rare xcode test failure. 2017-06-19 12:11:49 -07:00
Tom van Dijck
d7a3e3c29a Reapply local changes to Lua 5.3.4 2017-06-19 12:11:49 -07:00
Tom van Dijck
7b9ff9f840 Update to Lua 5.3.4 2017-06-19 12:11:49 -07:00
Tom van Dijck
f30463e6d6 Attempt at colors on linux 2017-06-19 03:00:59 -07:00
Tom van Dijck
e007c344a8 Merge pull request #808 from Blizzard/rtti-per-file
Added per file rtti generation for Visual Studio
2017-06-18 15:12:59 -07:00
Tom van Dijck
b22de644b7 Merge pull request #801 from ricka-github/master
Groups in XCode workspace working.
2017-06-18 15:12:34 -07:00
Tom van Dijck
b86a9e4802 Merge pull request #806 from Blizzard/add-issemver
Add premake.isSemVer function
2017-06-18 15:11:32 -07:00
Tom van Dijck
be91850928 Merge pull request #807 from Blizzard/tt-support
Added visual studio support for dot net .tt files
2017-06-18 15:11:04 -07:00
Tom van Dijck
4619b18053 add test 2017-06-18 15:09:50 -07:00
Tom van Dijck
0e1db71d7c add test 2017-06-18 14:55:20 -07:00
bwhittle
3eede41a93 Added visual studio support for dot net .tt files (#90) 2017-06-18 14:45:19 -07:00
Tom van Dijck
d9faf2ea3f Merge pull request #810 from Blizzard/masm-seh
Added masm handling of seh exception handling for VS2010 and above
2017-06-18 14:42:27 -07:00
Tom van Dijck
0f98798025 Merge pull request #815 from Blizzard/errors-in-red
Errors in red.
2017-06-18 14:41:54 -07:00
Tom van Dijck
12622af3ad add test 2017-06-18 14:38:21 -07:00
Tom van Dijck
a1227fcf90 newer msbuilds require explicit platform. 2017-06-18 14:18:24 -07:00
Tom van Dijck
a767d08747 Get color from term.errorColor. 2017-06-18 14:18:24 -07:00
Tom van Dijck
d0daa08f88 Errors in red. 2017-06-18 14:18:24 -07:00
Tom van Dijck
f4c8fe4dc5 Merge pull request #812 from Blizzard/cpp-dialect-vs2015+
Add support for cppdialect in VS2015 & VS2017 actions.
2017-06-18 12:49:52 -07:00
Tom van Dijck
b65a2b6d64 Merge pull request #813 from Blizzard/encode-pretty
Add json.encode_pretty wrapper.
2017-06-18 12:49:29 -07:00
Tom van Dijck
8e083bba09 Merge pull request #814 from Blizzard/premake-info
Add premake.info message function.
2017-06-18 12:49:10 -07:00
Tom van Dijck
b1b8ccf0d8 Merge pull request #817 from premake/tvandijck-patch-gmake2-preload
A few gmake2 fixes due to it moving into a module.
2017-06-14 16:39:40 -07:00
Tom van Dijck
13a3423f61 A few gmake2 fixes due to it moving into a module. 2017-06-14 15:47:48 -07:00
Tom van Dijck
3f225eb7f2 Merge pull request #803 from Blizzard/gmake2-module
Gmake2 module
2017-06-14 13:18:35 -07:00
James Touton
a6cf05295a Fixed C++17 flag to work with current versions of Clang. 2017-06-14 13:14:34 -07:00
Tom van Dijck
0936e3a25b Add premake.info message function. 2017-06-14 13:08:38 -07:00
Tom van Dijck
dfc5fd64c3 Add json.encode_pretty wrapper. 2017-06-14 13:06:23 -07:00
Tom van Dijck
5251432aec Add support for cppdialect in VS2015 & VS2017 actions. 2017-06-14 13:04:59 -07:00
R. Blaine Whittle
9fadce2c69 Fix to masm support for SEH to work on a per file basis 2017-06-14 12:59:16 -07:00
R. Blaine Whittle
f14090974a Added masm handling of seh exception handling for VS2010 and above 2017-06-14 12:59:09 -07:00
R. Blaine Whittle
3ff5343769 Added per file rtti generation for VS 2017-06-14 12:56:04 -07:00
Tom van Dijck
c235647f16 Add 'premake.isSemVer' method. 2017-06-14 12:51:41 -07:00
Tom van Dijck
1268d8eb4c Filter out non-semver version when doing a require. 2017-06-14 12:51:29 -07:00
Tom van Dijck
0a442f78ca A few fixes from our Blizzard Fork. 2017-06-13 14:46:49 -07:00
Tom van Dijck
6907f6785c Merge pull request #718 from Blizzard/add-notset-characterset
Adding support for NotSet characterset in VS2010+ (#79)
2017-06-13 14:25:13 -07:00
Tom van Dijck
9d4fa01146 Merge pull request #617 from Blizzard/fix-rules-xml
fix switch/separator in rules_xml
2017-06-13 14:24:52 -07:00
Tom van Dijck
3016d51e28 Add --insecure option for SSL curl requests. 2017-06-13 13:37:21 -07:00
Tom van Dijck
21631dd0e9 Adding tests, and fixing a few typos. 2017-06-13 12:11:54 -07:00
Tom van Dijck
d7b6f77abc fix switch/separator in rules_xml 2017-06-13 11:59:05 -07:00
Tom van Dijck
34bb100e75 Merge pull request #781 from Blizzard/criteria-tables
Allow filters to be written as tables:
2017-06-13 11:48:28 -07:00
Tom van Dijck
ef5828404c ASCII instead of NotSet, and add more tests. 2017-06-13 11:46:35 -07:00
Jacob Repp
cc107a4da4 Adding support for NotSet characterset in VS2010+ (#79) 2017-06-13 11:34:58 -07:00
Tom van Dijck
b66994d7d0 Merge pull request #802 from aleksijuvani/suppress-mkdir-warning
Suppress mkdir warning on Windows if the folder already exists
2017-06-13 11:20:10 -07:00
Tom van Dijck
230efba691 Adding gmake2 module 2017-06-13 09:51:58 -07:00
Tom van Dijck
80c7ed3099 [core] Add utility methods for rule and table. 2017-06-13 08:56:06 -07:00
Tom van Dijck
6841eb1752 [core] Allow filters to be written as:
```lua
filter {
    files  = { "**.c" },
    system = "windows"
}
```
2017-06-13 08:39:47 -07:00
Tom van Dijck
6437cfddd9 Merge pull request #788 from Blizzard/os-tags
Provide a way to 'tag' systems, and filter on those tags.
2017-06-13 08:32:42 -07:00
Tom van Dijck
bbae65fc0c Merge pull request #798 from noresources/fix-pch-gmake
create object directory before generating precompiled header
2017-06-13 08:31:41 -07:00