AuroraPipeline/premake
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases 1 Wiki Activity
2,806 Commits 1 Branch 1 Tag 32 MiB
be91850928
Commit Graph

2806 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tom van Dijck
be6ecbecf2 Merge pull request #672 from Blizzard/toolset-fix 
Fix issue with msc.getlinks and vstudio.getLinks returning different results when 'explicit' is true.
 2017-01-20 09:32:55 -08:00
Tom van Dijck
1b776d8f6b Merge pull request #673 from Blizzard/token-fix 
Add additional tokens to fileconfig and vs2010+.
 2017-01-20 09:32:20 -08:00
Tom van Dijck
0e765b5e2f Merge pull request #644 from macsforme/fix-xcode-dependson 
Don't treat "dependson" libraries as "links" libraries in Xcode
 2017-01-19 16:47:46 -08:00
Tom van Dijck
dfcabc13f5 Merge pull request #639 from nta/bootstrap-msbuild 
Add MSBuild target to Bootstrap.mak
 2017-01-19 16:45:10 -08:00
Tom van Dijck
164e86d55b Add additional tokens to fileconfig and vs2010+. 2017-01-19 12:38:32 -08:00
Tom van Dijck
7edd2e7c99 Fix issue with msc.getlinks and vstudio.getLinks returning different results when 'explicit' is true. 2017-01-19 10:55:58 -08:00
Jason Perkins
a1056a55bf Merge branch 'release-5.0-alpha11' 2017-01-13 09:12:12 -05:00
Jason Perkins
a3ef3354ac Restore development version 2017-01-13 09:11:58 -05:00
Jason Perkins
609f16eb42 Update changes and version for 5.0-alpha11 release 2017-01-11 10:41:55 -05:00
Michael Savage
ea76aa24f7 squash: fix C++ tests 2017-01-05 16:34:30 +02:00
Michael Savage
fe4456d608 squash: don't generate TARGETDIR/OBJDIR rules 2017-01-05 16:34:15 +02:00
Michael Savage
a4bfb70876 squash: tidy up the mkdirs 2017-01-05 16:33:51 +02:00
Michael Savage
d42c5fc422 Fix sporadic failures when using make -j# 2017-01-05 13:43:10 +02:00
Tom van Dijck
160350d622 Merge pull request #659 from resetnow/master 
Add C11 flag support for GCC
 2017-01-04 08:46:04 -08:00
Tom van Dijck
3352ffaf54 Merge pull request #653 from raedwulf/fix-premake4 
Fix premake4.lua bootstrap build script
 2017-01-04 08:42:32 -08:00
Joshua Bodine
b6ce517d99 Use better terminology for marking items to be excluded from Xcode build. 2017-01-03 16:45:02 -07:00
Joshua Bodine
47e3bd444e Fixed the xcode "dependson" linking issue in a more efficient way. 2017-01-02 21:45:49 -07:00
Joshua Bodine
38181e259c Fixed an issue where libraries listed under "dependson" would be linked into the executable in Xcode. 2017-01-02 20:09:12 -07:00
Justin O'Dell
7bad45325f Windows Registry 
- Added a new os command `getreg` which takes a registry path and returns the value or nil
 2016-12-28 07:43:54 -08:00
Vlad Ivanov
b551d9fc99 Add C11 flag support for GCC 2016-12-23 09:43:57 +03:00
Jason Perkins
64930e9390 Merge pull request #654 from starkos/no-defines-includes-when-none 
Omit NMake defines and include dirs when kind is "None"
 2016-12-20 10:26:42 -05:00
Jason Perkins
1f5976e3ed Omit NMake defines and include dirs when kind is "None" 
"None" projects, by definiton, are never built, so these settings are unnecessary. Omit them so that changes to their value will not cause the generated project to change.
 2016-12-19 10:09:30 -05:00
Tai Chi Minh Ralph Eastwood
6f1aaf469a Fix premake4.lua bootstrap build script 2016-12-17 16:44:17 +00:00
Samuel Surtees
682920013f Merge pull request #649 from jstewart-amd/master 
Fix VS2015 sln file icon
 2016-12-15 16:46:04 +10:00
Jason Stewart
c34eee3e05 Fix VS2015 sln icon 
This is a minor fix to make the correct sln icon appear in Windows. The
Icon Handler for sln files is apparently quite picky.

VS2015 sln files contain this:
# Visual Studio 14

Not this:
# Visual Studio 2015

Having 2015 instead of 14 does not appear to cause any major issues. But
you get the generic sln file icon in Explorer instead of the
VS2015-specific one.
 2016-12-14 13:48:57 -05:00
Tom van Dijck
5bf562d5ae Merge pull request #645 from Blizzard/vs2017-support 
Add 'vs2017' target.
 2016-12-13 08:59:13 -08:00
Jason Perkins
4af604ffb6 Merge pull request #643 from starkos/fix-vs-file-path-map 
Fix VS mapping for `file.path` tokens
 2016-12-08 09:34:01 -05:00
Tom van Dijck
58ba0d8bd7 Merge pull request #648 from starkos/fix-outdated-xcode 
Fix out-of-date sources in the Xcode module
 2016-12-07 09:47:33 -08:00
Jason Perkins
e2e2841fc7 Fix out-of-date sources in the Xcode module 
I must not have been on the latest revision when I merged the Xcode module into core. This catches things back up to the state of the submodule repository.
 2016-12-06 13:52:20 -05:00
Tom van Dijck
be7d8a2e4c Add 'vs2017' target. 2016-12-01 12:41:38 -08:00
Jason Perkins
acfde92a79 Fix VS mapping for file.path tokens 
The `%{file.path}` token is an alias of `%{file.relpath}`, and should map to the same VS symbol. Specifically, it should be the relative path including the file name, and not just the path.
 2016-11-30 14:18:37 -05:00
Tom van Dijck
aa9762bfed Merge pull request #641 from starkos/fix-shared-flags 
Fix bugs introduced by shared compiler flags
 2016-11-29 10:00:40 -08:00
Jason Perkins
0731044ae7 Fix bugs introduced by shared compiler flags 
Fix a few spots where the shared compiler flag changes (PR #623) caused things to misbehave.

- Fixed duplicate flags in VC 200x external compiler options
- Added missing C and CXX flag maps to Clang adapter
- Reworked SNC adapter to follow same shared flags approach
 2016-11-29 11:29:32 -05:00
NTAuthority
f069ff732e Add MSBuild target to Bootstrap.mak 2016-11-28 03:43:49 +01:00
Samuel Surtees
1ed7b0c3fe Merge pull request #637 from starkos/fix-vs2015-link-symbols 
Fix VS'15 <GenerateDebugInformation> to match Update 3
 2016-11-25 18:12:30 +10:00
Samuel Surtees
17a3986da2 Merge pull request #636 from starkos/fix-msc-flags 
Fix MSC flags broken by PR #623
 2016-11-24 20:19:13 +10:00
Jason Perkins
9017431249 Fix VS'15 <GenerateDebugInformation> to match Update 3 2016-11-23 16:00:05 -05:00
Jason Perkins
c6e400916e Fix MSC flags broken by PR #623 2016-11-23 15:50:45 -05:00
Samuel Surtees
4a0cebf0af Merge pull request #619 from Blizzard/per-file-config-C# 
Add support in csproj backend to add files to certain configurations.
 2016-11-23 14:05:38 +10:00
Tom van Dijck
f7d98519a8 Merge pull request #635 from robertop/parallel-make 
Makefile generation - Don't force serial compilation for all projects
 2016-11-22 10:48:02 -08:00
Tom van Dijck
5bb7c54e3f Add support in csproj backend to add files to certain configurations. 2016-11-22 09:45:02 -08:00
Roberto Perpuly
b5d7f944b3 Makefile generation - Don't force serial compilation for all projects 
Only restrict parallel compilation when using precompiled
headers. Currently, the generated makefile has a `.NOTPARALLEL`
target, which means that make will ignore parallel builds, even
for projects which can build in parallel just fine.
 2016-11-22 09:22:32 -08:00
Tom van Dijck
24f2da8842 Merge pull request #623 from mikisch81/gcc-add-c90-c99-flags 
Added C90 and C99 flags to gcc
 2016-11-22 09:12:07 -08:00
Tom van Dijck
94ab7bbb64 Merge pull request #634 from starkos/fix-default-rule-var-kinds 
Default rule variables to string when `kind` is not set
 2016-11-22 09:09:55 -08:00
Tom van Dijck
5c1d86ab78 Merge pull request #628 from aleksijuvani/no-link-objects-flag 
Add NoLinkObjects flag
 2016-11-22 09:08:02 -08:00
Michael Schwarcz
3bc5e9623e Merge branch 'master' into gcc-add-c90-c99-flags 2016-11-22 15:44:44 +02:00
aleksijuvani
f337abb776 Add tests for linkbuildoutputs API 2016-11-22 13:50:26 +02:00
aleksijuvani
b1825c9ccd Always output LinkObjects for Visual Studio if specified 2016-11-22 13:36:20 +02:00
aleksijuvani
bceebd082c Change NoLinkObjects flag to a linkbuildoutputs API 2016-11-22 00:18:08 +02:00
aleksijuvani
e47ba372c8 Add NoLinkObjects flag 
The default behaviour is to link .obj files if a custom build command
outputs them, but there are some cases where we don't want this to
happen, such as when dealing with Wavefront .obj model files.

This commit will prevent the automatic linking of .obj files that have
this new flag.

When an obj file is outputted by a custom build command, this prevents
the linker from linking it. This is necessary, for example, when
dealing with obj model files.
 2016-11-22 00:18:08 +02:00