Commit Graph

3665 Commits

Author SHA1 Message Date
starkos
78e25096a7 Merge branch 'release/v5.0.0-alpha15' 2020-04-23 14:59:18 -04:00
starkos
dd934f7308 Restore dev version 2020-04-23 14:59:07 -04:00
starkos
ffa8778a14 Update support files for 5.0-alpha15 release 2020-04-23 14:32:38 -04:00
Samuel Surtees
012c3418b2
Merge pull request #1427 from premake/release-improvements
Fix up and improve the release docs and script
2020-04-22 22:58:55 +10:00
starkos
760417a348 Fix up and improve the release docs and script 2020-04-21 17:01:55 -04:00
Samuel Surtees
07ab4ccee4
Merge pull request #1424 from starkos/fix/vs2017-system-latest
Fix systemversion("latest") on VS2017
2020-04-16 02:26:46 +10:00
starkos
71156f3ec4
Merge pull request #1422 from LORgames/ssurtees/githubActions
Added GitHub Actions
2020-04-15 09:10:54 -04:00
starkos
a38135d712 Fix systemversion("latest") on VS2017 2020-04-15 09:02:37 -04:00
Sam Surtees
55d5196243 Added GitHub Actions 2020-04-10 01:14:05 +10:00
starkos
3b5f6e60c7 Merge remote-tracking branch 'starkos/feature/vs-enablewarnings' 2020-04-07 10:00:26 -04:00
starkos
ae5d93a1a8 Enable enablewarnings() for MSC 2020-04-06 18:01:36 -04:00
starkos
4c11d6e123 Merge remote-tracking branch 'LORgames/ssurtees/objectiveC' 2020-04-06 17:37:49 -04:00
starkos
9def08f1d6
Merge pull request #1420 from premake/fix/bootstrap-mingw
Fix MinGW builds of Premake
2020-04-01 09:29:05 -04:00
Jason Perkins
19034686aa Restore "version.lib" pragma for os.getversion
I'm not sure why this is still needed, since "version" has also been added to the `premake5.lua` config for Windows builds. But it's failing the CI builds, so restoring for now.
2020-03-31 16:19:42 -04:00
Jason Perkins
ac874b91a4 Fix remaining MinGW build issues 2020-03-31 16:19:42 -04:00
tdesveaux
f29f8b2030 Fix MinGW64 build 2020-03-31 16:19:42 -04:00
tdesveaux
987bae9859 os_stat: Use _stat instead of _stat64i32
`stat64i32` is undefined when building with mingw32
2020-03-31 16:19:42 -04:00
Samuel Surtees
7cad09ed18
Merge pull request #1419 from starkos/fix/issue-1411
Fix #1411: Remove "|"  from Codelite config names
2020-03-31 18:22:37 +10:00
Sam Surtees
a4bba42013 Added support for Objective-C and Objective-C++ in xcode and gmake2
- Added unit tests for Objective-C and Objective-C++
2020-03-31 18:14:26 +10:00
starkos
ecaebbad06 Fix #1411: Remove "|" from Codelite config names 2020-03-30 15:57:52 -04:00
Samuel Surtees
c4f36032cc
Merge pull request #1415 from englercj/c++-ext-support
Add .c++ extension support to a few spots it was missing
2020-03-28 18:55:42 +10:00
Chad Engler
92888e8c33 Add .c++ to a few spots it was missing 2020-03-27 18:50:41 -07:00
starkos
5b2f92c9ce
Merge pull request #1404 from Mikhael-Danilov/master
Place all generated files in separate GENERATED list, so they all can…
2020-03-22 13:09:09 -04:00
Mikhael Danilov
7c0c02acfd Place all generated files in separate GENERATED list, so they all can be cleaned by clean target. 2020-03-17 22:21:13 +03:00
starkos
6ca121993b
Merge pull request #1403 from redorav/master
Add build steps to Visual Studio
2020-03-05 18:50:50 -05:00
redorav
8c985b253a
Merge branch 'master' into master 2020-02-27 19:47:35 +00:00
Emilio López
4ca4a1d0a0 Add build steps to Visual Studio 2020-02-27 19:45:56 +00:00
Samuel Surtees
24458c6a25
Merge pull request #1406 from starkos/fix-deferred-join-delimiter
Change deferred join delimiter to non-printable character
2020-02-26 19:06:36 +10:00
tempura-sukiyaki
40e3fbf5ea Change deferred join delimiter to non-printable character
This is a squashed and rebased version of #1384, authored by @tempura-sukiyaki. Changes the deferred join path delimiter to a non-printable character to avoid conflicts with the pipe symbol in paths.
2020-02-25 18:53:26 -05:00
Samuel Surtees
0a9844891d
Merge pull request #1402 from yuyoyuppe/fix_1172
Remove checkFunc from Resource files
2020-02-18 23:12:34 +10:00
yuyoyuppe
374618b908
Remove checkFunc from Resource files 2020-02-18 14:29:37 +03:00
Samuel Surtees
789c0ac343
Merge pull request #1401 from starkos/fix-pr-1013
Remove commands optimization which breaks tokens
2020-02-14 16:58:49 +10:00
starkos
ed92aba9c2 Remove commands optimization which breaks tokens
When a build command contains a token which references a configuration, ex. `{cfg.platform}`, the platform optimizations removed by this commit would cause a crash: "Attempt to index a nil value (global 'cfg')".

Fixes #1013
2020-02-13 20:04:24 -05:00
starkos
80b8c1fedf
Merge pull request #1396 from LORgames/ssurtees/linkgroupsFix
Fixed bug with linkgroups only working on Premake projects
2020-02-12 20:28:50 -05:00
Sam Surtees
f8a88c362c Fixed bug with linkgroups only working on Premake projects 2020-02-09 01:10:07 +10:00
Samuel Surtees
a640f86d5b
Merge pull request #1395 from LORgames/ssurtees/normalizeFix
Fixed edge case in path.normalize
2020-02-04 22:45:01 +10:00
Sam Surtees
9128498bf9 Fixed edge case in path.normalize 2020-02-02 16:30:44 +10:00
starkos
63a1e5ff3b
Merge pull request #1386 from ClxS/netcore_publish
Initial support for generating netcore and netstandard projects
2020-01-08 21:00:56 -05:00
Carl
53accacd3e
Merge branch 'master' into netcore_publish 2020-01-08 10:46:06 +00:00
Samuel Surtees
237258b096
Merge pull request #1385 from tempura-sukiyaki/fix-pull-request-template
Fix pull request template
2020-01-07 15:40:01 +10:00
Carl
148bd00268 Fixed test failures 2020-01-05 20:25:40 +00:00
Carl
33e5be812c
Initial netcore support (#2) 2020-01-05 19:59:51 +00:00
tempura-sukiyaki
07cf24caf1 Fix pull request template 2020-01-06 04:27:42 +09:00
Samuel Surtees
09ee833493
Merge pull request #1362 from LORgames/ssurtees/androidTestFix
Fixed inconsistencies in Android VS project test
2019-11-16 16:02:45 +10:00
@starkos
cd6fa6a0ab
Merge pull request #1365 from r-a-sattarov/master
E2K: fixed build by MCST lcc compiler
2019-11-15 10:15:46 -05:00
r-a-sattarov
2d7de21634
Merge branch 'master' into master 2019-11-10 17:55:06 +03:00
Samuel Surtees
fe962f898c
Merge pull request #1360 from sp-jordi-vilalta/feature/fix-os-return
Fix the return value of some os functions
2019-11-11 00:07:15 +10:00
r-a-sattarov
907c83d840 E2K: fixed build by MCST lcc compiler
- fixed build by MCST lcc compiler on MCST Elbrus 2000 architecture when using Curl
- strip UTF-8 BOM for compability with MCST lcc compiler < 1.24
2019-11-10 14:31:01 +03:00
@starkos
af3509fbef
Merge pull request #1361 from LORgames/ssurtees/simplifyTest
Simplified unit test to resolve path issues
2019-11-08 10:06:21 -05:00
Sam Surtees
448fb5c697 Fixed inconsistencies in Android VS project test 2019-11-07 02:34:38 +10:00