Commit Graph

3668 Commits

Author SHA1 Message Date
Renaud Guillard
7f67a3ba67
Fix typo
Co-authored-by: Samuel Surtees <11887457+samsinsane@users.noreply.github.com>
2021-03-07 16:02:57 +01:00
Renaud Guillard
d9f15aec7c os.outputof: add a second argument to select which stream to output
local o, e = os.outputof(cmd, streams)

    Where streams could be one of
    - "output" Only return standard output stream content
    - "error" Only return standard error stream content
    - "both" (default) Return both streams content
2021-01-25 19:18:48 +01:00
Samuel Surtees
1b7d93e6d3
Merge pull request #1576 from pkurth/master
Mesh and amplification shader type for Visual Studio
2021-01-13 07:56:08 +10:00
Philipp Kurth
de9e1fc8ca Mesh and amplification shader type for Visual Studio 2021-01-12 18:11:17 +01:00
Samuel Surtees
9b8b035a8a
Merge pull request #1571 from cos-public/usefullpaths-vs-property
useFullPaths config property for Visual Studio projects
2020-12-24 18:45:42 +10:00
cos
4b442fb009 useFullPaths config property for Visual Studio projects 2020-12-18 02:27:35 +02:00
Samuel Surtees
831076d364
Merge pull request #1566 from ratzlaff/bootstrap_executable
Set execute bit on Bootstrap.bat
2020-12-09 15:47:03 +10:00
Ben Ratzlaff
0669ad57e1 Set execute bit on Bootstrap.bat 2020-12-08 19:31:55 -07:00
Samuel Surtees
0f54214cf7
Merge pull request #1565 from ClxS/AllowUnsafeBlocks-net5-fix
AllowUnsafeBlocks will now be a project level property in new format
2020-12-08 11:06:52 +10:00
Samuel Surtees
cada88b037
Merge pull request #1564 from ClxS/net5-support
Improved net version check to also support net5.0 and beyond
2020-12-08 11:05:38 +10:00
Carl
2e4df1f347 AllowUnsafeBlocks will now be a project level property in new format C# projects
Fixes #1549
2020-12-07 21:17:19 +00:00
Carl
7af525d706 Simplified net platform check to include net[x] 2020-12-07 20:09:36 +00:00
starkos
67f5bd12ff
Merge pull request #1562 from xenia-project/remove-moduledownloader
Remove moduledownloader to avoid RCE.
2020-11-27 14:45:15 -05:00
Rick Gibbed
21c9985f09 Remove moduledownloader to avoid RCE. Closes #1381. 2020-11-25 16:42:25 -06:00
Samuel Surtees
6e7f35f6dd
Merge pull request #1560 from dpeter99/master
Added newer shader versions
2020-11-22 05:16:53 +10:00
dpeter99
eb717674e3 Added newer shader versions
- Added 6.4 and 6.5 shader versions
2020-11-21 14:59:08 +01:00
starkos
4138c3e7b9
Merge pull request #1552 from JoelLinn/fix-msc-flags
Fix MSC LTO, runtime, subsystem
2020-11-10 08:36:32 -05:00
Joel Linn
0163b86628 msc Fix several flags.
- Link-time optimizations now sets cl and ld flags.
- Run-Time selection now adheres to `runtime` setting.
- Set Subsystem for WindowedApp
2020-11-09 17:27:45 +01:00
Samuel Surtees
f51aad1cd0
Merge pull request #1554 from JoelLinn/fix-lto-clang
clang Use `llvm-ar` linker when LTO flag is set.
2020-11-09 21:50:49 +10:00
Joel Linn
e473d40832 clang Use llvm-ar linker when LTO flag is set.
It is required for some clang features like `-flto`. Still defaults to `ar` if the `LinkTimeOptimization` flag is not set.
2020-11-04 20:34:41 +01:00
starkos
1aeb39dfce
Merge pull request #1551 from nickclark2016/issues/1545
Added NetCore to CLR API
2020-11-04 10:53:02 -05:00
Nick Clark
efaffca16d
Merge branch 'master' into issues/1545 2020-10-29 23:20:42 -04:00
Samuel Surtees
82e50368dc
Merge pull request #1540 from noresources/xcode-improvements
Xcode improvements
2020-10-30 11:42:29 +10:00
nickclark2016
712431f36e Added NetCore to CLR API, added corresponding unit test 2020-10-29 20:45:52 -04:00
Samuel Surtees
fb5f340025
Merge pull request #1542 from premake/improve-contrib-resources
Improve the user contribution resources
2020-10-25 11:01:52 +10:00
starkos
76359f4c53 Add tips for new contributors; improve issue templates 2020-10-24 14:20:13 -04:00
Renaud Guillard
dfb93e1640 xcode4 sysincludedirs support update
* Use the new Xcode 9+ setting SYSTEM_HEADER_SEARCH_PATHS settings instead of HEADER_SEARCH_PATHS
* Update test
2020-10-23 09:59:04 +02:00
Renaud Guillard
5d06e68d45 xcode4 syslibdirs support
* Merge libdirs and syslibdirs to LIBRARY_SEARCH_PATHS setting
* Add test
2020-10-23 09:58:34 +02:00
starkos
c6580ff1ce
Merge pull request #1534 from nickclark2016/issues/1526
Added Ability to Disable JMC in Visual Studio
2020-10-16 12:23:50 -04:00
nickclark2016
aaba74715f Added disable for Just My Code debugging 2020-10-12 11:15:55 -04:00
Samuel Surtees
0bf4fb6d09
Merge pull request #1532 from starkos/exclude-net-tests
Disable network tests; add --test-all flag to enable
2020-10-08 12:08:00 +10:00
starkos
0c792a0ff3 Disable network tests; add --test-all flag to enable
Hides the automated tests that require calls out to the network behind a new `--test-all` flag. Allows for faster TDD iterations for new development, and tests can now be run even when offline.
2020-10-07 09:31:15 -04:00
Samuel Surtees
4de75e9d4a
Merge pull request #1530 from LORgames/ssurtees/cleanup
Remove unused code in vs2010_vcxproj.lua
2020-10-02 23:38:44 +10:00
Samuel Surtees
ed01eef77f
Merge pull request #1529 from LORgames/ssurtees/nmakeBuildOptions
NMake projects can now specify buildoptions and cppdialect
2020-10-02 23:38:29 +10:00
Samuel Surtees
e5570876c0
Merge pull request #1528 from LORgames/ssurtees/tokens
Added COPYFILE and COPYDIR tokens
2020-10-02 23:38:17 +10:00
Samuel Surtees
0ed41a75bf
Merge pull request #1527 from LORgames/ssurtees/ciCleanup
Removed old CI build files
2020-10-02 23:34:52 +10:00
Sam Surtees
7e0d37c84b Remove unused code in vs2010_vcxproj.lua 2020-10-02 17:01:03 +10:00
Sam Surtees
3e5e95e034 NMake projects can now specify buildoptions and cppdialect 2020-10-02 16:40:28 +10:00
Sam Surtees
802435304f Added COPYFILE and COPYDIR tokens 2020-10-02 16:24:34 +10:00
Sam Surtees
67d06f00dd Removed old CI build files 2020-10-02 15:57:24 +10:00
starkos
796f517511
Merge pull request #1525 from Jarod42/OneConfigurationSelectedInCodelite
[Codelite] Only active (i.e. unique) configuration should be selected.
2020-09-30 10:07:14 -04:00
Jarod42
d9c478e92c Only active (i.e. unique) configuration should be selected.
Select first one.
`"defaultConfiguration"` seems not yet implemented.
2020-09-29 14:16:07 +02:00
Samuel Surtees
57f805fb21
Merge pull request #1523 from nickclark2016/master
Added C++1z and C++2a dialect options for XCode
2020-09-27 09:21:50 +10:00
nickclark2016
9379f284ee Added C++1z and C++2a dialect options for XCode 2020-09-26 11:35:19 -04:00
Samuel Surtees
96a3432529
Merge pull request #1515 from cos-public/conformance-mode-flag
ConformanceMode flag implemented for >= vs2017
2020-09-24 08:36:38 +10:00
Samuel Surtees
6b545b9cf8
Merge pull request #1522 from nickclark2016/master
Fixed external library linking for Clang in VS2019+
2020-09-24 08:31:01 +10:00
nickclark2016
6a01e51df0 Fixed external library link names for clang in VS2019+ 2020-09-22 18:37:57 -04:00
cos
3fe03f5b79 conformanceMode config property 2020-09-21 14:38:38 +03:00
cos
6104f3a8a5 ConformanceMode flag implemented for >= vs2017 2020-09-21 14:38:38 +03:00
Samuel Surtees
15a07510ab
Merge pull request #1519 from nickgravelyn/xcode-metal-shaders
Add Metal shader files as source code
2020-09-14 18:01:01 +10:00