Commit Graph

3593 Commits

Author SHA1 Message Date
WorldofBay
8ead541af6
do not clear _isIncludingExternal in nested calls 2019-02-21 15:13:04 +01:00
Samuel Surtees
3dbbc32a88
Merge pull request #1248 from tritao/roslyn_csc
Default to Roslyn-based `csc` compiler on all platforms.
2019-02-20 00:27:13 +10:00
Joao Matos
4464c4291b Default to Roslyn-based csc compiler on all platforms. 2019-02-18 16:36:09 +00:00
Samuel Surtees
73f14baaba
Merge pull request #1247 from tritao/csversion_dotnet
Added support for `csversion` API to dotnet toolset.
2019-02-18 23:19:13 +10:00
Joao Matos
d0ab1edf67 Added support for csversion API to dotnet toolset. 2019-02-18 12:37:21 +00:00
Sam Surtees
1d24f9994b Fixed issue with detoken not handling deferred joins correctly 2019-02-14 23:14:34 +10:00
WorldofBay
213057ff2e
2 new tests for canLink 2019-02-07 15:10:58 +01:00
WorldofBay
b888c61634
allow linking of mixed c++ assemblies 2019-02-07 14:53:58 +01:00
Samuel Surtees
cda4f94e28
Merge pull request #1239 from macsforme/xcode_startproject
Implemented the startproject option for xcode
2019-02-07 19:59:41 +10:00
Joshua Bodine
0d928d6093 Implemented the startproject option for xcode by copying the functionality from vs2005. 2019-02-06 21:02:26 -07:00
Samuel Surtees
339a5f6f83
Merge pull request #1236 from CosmicRey/master
Added support for Dx12 shader models
2019-02-01 16:16:20 +10:00
Reynald Brassard
fea2be1909 Added support for Dx12 shader models 2019-01-31 22:02:46 -08:00
Thomas Desveaux
00c8d53c53
Merge pull request #1231 from LORgames/ssurtees/xcodeFix
Fixed issue with per-configuration build commands not returning errors correctly
2019-01-21 13:24:11 +01:00
Sam Surtees
ab02e3c4f8 Fixed issue with per-configuration build commands not returning errors correctly 2019-01-21 20:04:31 +10:00
Sam Surtees
8568b607ba Generated makefiles no longer error when a configuration can be missing 2019-01-21 01:46:44 +10:00
Sam Surtees
3c809fb847 Added Win64 as a recognized platform 2019-01-21 01:25:13 +10:00
Samuel Surtees
ada0d6c361
Merge pull request #1224 from WorldofBay/patch-1
add missing local
2019-01-13 23:02:44 +10:00
WorldofBay
394f7667ca
add missing local
fix #1210
2019-01-11 16:14:19 +01:00
Samuel Surtees
1d469fc518
Merge pull request #1067 from ratzlaff/xcode_debugformat
Add 'Default', 'Dwarf' and 'SplitDwarf' arguments to 'debugformat'
2019-01-11 12:59:39 +10:00
Samuel Surtees
698f343ea7
Merge pull request #1220 from ifarbod/fix-androidproj-apilevel
Implement the androidapilevel() API in Android packaging projects
2019-01-10 22:19:32 +10:00
iFarbod
652abbfa8e
Remove the androidAPILevel() duplicate definition
As requested by @samsinsane.
2019-01-10 15:27:23 +03:30
Samuel Surtees
e05e66a4fc
Merge pull request #1221 from WorldofBay/patch-1
add nil check to fileconfig.hasFileSetting (gmake)
2019-01-10 18:41:09 +10:00
WorldofBay
70705b84f7
add nil check to fileconfig.hasFileSetting (gmake) 2019-01-10 09:03:43 +01:00
iFarbod
3cb523056c
Implement the androidapilevel() API in Android packaging projects 2019-01-10 02:07:06 +03:30
Samuel Surtees
46bffb2f6a
Merge pull request #1218 from Dingobloo/xctest
Add support & tests for XCTest sharedlibtype
2019-01-09 16:15:54 +10:00
Ross Brackstone
c0ceb0f26d Added support & tests for XCTest sharedlibtype 2019-01-09 14:12:44 +10:00
Samuel Surtees
ffc1596a23
Merge pull request #1206 from pintodragon/feature/codelite_update
Updated code lite to properly add LD_LIBRARY_PATH is set if libdirs is set
2018-12-23 23:59:54 +10:00
Justin Chrysler
80a85aed7d Updated code lite to properly add LD_LIBRARY_PATH is set if libdirs is set 2018-12-21 19:29:27 -05:00
Samuel Surtees
6e380c0242
Merge pull request #1203 from tempura-sukiyaki/vsandroid-javacompile
Add support for JavaCompile in vsandroid
2018-12-06 18:17:40 +10:00
tempura-sukiyaki
0002511d08 Add support for JavaCompile in vsandroid 2018-12-06 16:47:55 +09:00
Samuel Surtees
0f0c1d134e
Merge pull request #1202 from Blizzard/file_name
Support %{file.name} token in VS
2018-12-05 16:18:08 +10:00
Manu Evans
f898eb376b Support %{file.name} token in VS. 2018-12-04 18:55:30 -08:00
Samuel Surtees
6fc0497d6a
Merge pull request #1197 from LORgames/ssurtees/makefileFixes
Added missing elements in Visual Studio Makefile projects
2018-11-30 11:19:21 +10:00
Sam Surtees
62ae78976b Added missing elements in Visual Studio Makefile projects
Fixes #670
2018-11-21 00:53:00 +10:00
Samuel Surtees
52f3c575ba
Merge pull request #1194 from WorldofBay/patch-2
Move rule property string expansion into modules
2018-11-18 23:33:15 +10:00
Ben Ratzlaff
85ed6bbda1 Handle 'Full' and 'FastLink' arguments to 'symbols'. Add associated gmake and gmake2 tests 2018-11-17 18:45:08 -07:00
Ben Ratzlaff
da90c1ffd0 Add 'Default', 'Dwarf' and 'SplitDwarf' inputs to 'debugformat' 2018-11-17 18:45:08 -07:00
WorldofBay
de1398af25 Move rule property expansion into modules
Reuse code in gmake2 module
Adjust vs2010 test for fixed behaviour
Add vs2010 test for custom separator
2018-11-16 11:21:41 +01:00
Samuel Surtees
85d0b3e34c
Merge pull request #1189 from tdesveauxPKFX/host/fix_normalize_tokens
Host path.normalize: Fix normalization for paths containing tokens
2018-11-13 17:59:39 +10:00
Samuel Surtees
a7c9952665
Merge pull request #1193 from ratzlaff/xcode_id_test
Add tests for xcode id generator
2018-11-13 17:33:22 +10:00
Ben Ratzlaff
ce6ff58da2 Add tests for xcode id generator 2018-11-12 21:27:24 -07:00
Thomas Desveaux
491051a273
Merge pull request #1191 from ratzlaff/fix_obj_collisions
Fix objname collisions
2018-11-12 19:49:59 +01:00
ds
db0e27fb63
Update path.lua
added *.c++ extension
2018-11-11 21:52:36 +03:00
Ben Ratzlaff
8d139aea31 Fix objname collisions 2018-11-09 23:08:27 -07:00
tdesveaux
a1d7e8657c Host path.normalize: Fix normalization for paths containing tokens 2018-11-04 18:01:29 +01:00
Samuel Surtees
ed483dd9bc
Merge pull request #1181 from premake/release-5.0-alpha13
Release 5.0 alpha13
2018-10-28 14:17:37 +10:00
Thomas Desveaux
e7721ba149 Post-release: Set PREMAKE_VERSION to dev 2018-10-22 13:49:27 +02:00
Thomas Desveaux
fb9264ff40 README: Update Commit since last release shield 2018-10-22 13:44:28 +02:00
Thomas Desveaux
54c3f9bb16 Add merged PRs since alpha12 to CHANGES.txt 2018-10-22 13:44:16 +02:00
Thomas Desveaux
0818876332 Options: Set compilers category for cc, dc and dotnet 2018-10-22 13:44:07 +02:00