Jason Perkins
7f4bd53f70
Rollback PR #247 - support framework folders in gcc/clang
...
Rolled back the change and added a unit test to make sure we catch this in future
2015-10-27 09:54:57 -04:00
starkos
bf619ff08f
Merge pull request #324 from mversluys/master
...
OSX and Linux SSL support and OSX fixes
2015-10-27 09:36:55 -04:00
starkos
630f4bfa8f
Merge pull request #328 from starkos/rollback-pr239
...
Revert "improve determinism"
2015-10-26 16:01:31 -04:00
Jason Perkins
04840ec2f0
Revert "improve determinism"
...
This reverts commit 66358a2880
2015-10-26 15:59:07 -04:00
Matthew Versluys
1175f0df25
SSL support for Linux using OpenSSL
...
CURL_CA_BUNDLE is deteceted during premake.
Feels like the header that was generated by configure should be removed and move all curl build options into premake.
2015-10-26 10:36:35 -07:00
Matthew Versluys
192aa8216b
SSL Support on Mac
...
Utilizes Darwin SSL (rather than OpenSSL).
The configuration file that was built appears to be for Linux.
Had to remove the CURL_CA_BUNDLE for certificate lookup to work.
2015-10-24 13:53:04 -07:00
Matthew Versluys
1185a2fb46
Fixes for Mac OSX
...
--start-group and --end-group aren't available in the clang that ships with Xcode 7
Moved the build/link options for -mmacosx-version-min from the project to the solution so that the settings are applied to the contrib libraries.
Eliminates link spam that the libraries were built with newer versions of the compiler.
2015-10-24 13:42:54 -07:00
starkos
32151316a8
Merge pull request #306 from saberhawk/master
...
Fix sysincludedirs for GCC toolset
2015-10-21 13:57:48 -04:00
starkos
432f6f5e98
Merge pull request #313 from Blizzard/sln-utf8-fix
...
Solution files need a '\n\r' after the utf8 marker.
2015-10-19 16:31:48 -04:00
Tom van Dijck
6c5c8c8180
Solution files need a '\n\r' after the utf8 marker.
2015-10-19 13:19:49 -07:00
Manu Evans
e6d7571f65
Merge pull request #310 from LORgames/ssurtees/sln2005OverrideFix
...
sln2005 Override Fix
2015-10-15 11:55:53 +10:00
Sam Surtees
ad56a58f79
Fixed bug in sln2005 that prevented p.override from working on the sln2005.elements functions.
2015-10-14 23:09:22 +10:00
Jason Perkins
0752850219
Merge branch 'release-5.0.0-alpha6'
2015-10-11 10:11:03 -04:00
Jason Perkins
5f17669564
Prep support files for merge to dev
2015-10-11 10:10:15 -04:00
Jason Perkins
d37851b901
Tweak release script
2015-10-11 09:51:13 -04:00
Jason Perkins
6f8fbb7c7b
Update support files for release
2015-10-10 17:02:43 -04:00
Mark Sararu
0a3ce657a8
Fix include directories being escaped twice
2015-10-10 10:24:19 -07:00
Tom van Dijck
8085fe0736
Merge pull request #303 from Blizzard/macosx-fix
...
Mac OSX doesn't have lib64 dirs.
2015-10-09 10:04:53 -07:00
Tom van Dijck
ff7ca71cc6
Merge pull request #305 from Blizzard/fix-bootstrap
...
fix missing defines in bootstrap.mak
2015-10-07 12:13:55 -07:00
Tom van Dijck
42434ad8a8
missed linker settings.
2015-10-07 12:10:53 -07:00
Tom van Dijck
3e18d438f6
fix missing defines in bootstrap.mak
2015-10-07 12:05:38 -07:00
Tom van Dijck
d8ad705817
fix detoken.
2015-10-07 11:27:49 -07:00
Tom van Dijck
fc228bfabf
Mac OSX doesn't have lib64 dirs.
2015-10-07 11:26:41 -07:00
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
