Commit Graph

2621 Commits

Author SHA1 Message Date
Tom van Dijck
0a7b45ce17 bring os.getversion() on par with the present (#688)
* bring os.getversion() on par with the present

* Use non-deprecated API's for Windows.

* Use Apple official names for MacOSX.
2017-02-01 09:19:13 -08:00
Tom van Dijck
6f7d0c16da intrinsics api. (#683)
* intrinsics api.

* add options to msc.lua
2017-02-01 09:06:31 -08:00
Tom van Dijck
8015673f40 functionlevellinking api. (#681)
* functionlevellinking api.

* add options to msc.lua
2017-02-01 08:57:32 -08:00
Tom van Dijck
b76bef918d floatingpointexceptions api. (#684)
* floatingpointexceptions api.

* generate options for msc
2017-02-01 08:53:49 -08:00
Tom van Dijck
94a5bb08a0 Fix for issue https://github.com/premake/premake-core/issues/669 (#689) 2017-02-01 08:49:38 -08:00
Tom van Dijck
ac2919e74c stringpooling api. (#682)
* stringpooling api.

* add options to msc.lua
2017-02-01 08:47:50 -08:00
Tom van Dijck
aae8917042 Merge pull request #687 from tvandijck/os_regkey
Windows Registry
2017-01-31 13:11:21 -08:00
Tom van Dijck
9336b1d9df rename os_getreg to os_getWindowsRegistry 2017-01-30 09:29:01 -08:00
Tom van Dijck
51be6befcf Merge pull request #679 from TurkeyMan/debug_detect
Better detect debug build
2017-01-27 08:47:12 -08:00
Manu Evans
1d2a8f44c1 Better detect debug build 2017-01-24 14:48:27 +10:00
Tom van Dijck
5f02759402 Merge pull request #678 from macsforme/xcode-string-literals
Escape string literals passed to defines() for Xcode
2017-01-23 09:42:57 -08:00
Joshua Bodine
34c844e14b String literals passed to defines() must be escaped for Xcode. 2017-01-21 18:52:01 -07:00
Tom van Dijck
ebd07a7f0b Merge pull request #675 from Blizzard/update-semver
update semver.lua
2017-01-20 14:16:37 -08:00
Tom van Dijck
c677896dd9 update semver.lua 2017-01-20 11:20:56 -08:00
Tom van Dijck
9ff8668c13 Merge pull request #668 from UmbraSoftware/fixmakej
Fix sporadic failures when using make -j#
2017-01-20 09:34:20 -08:00
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