Commit Graph

204 Commits

Author SHA1 Message Date
starkos
9f9353eb27 Merge pull request #260 from tritao/framework
Rename "framework" to "dotnetframework".
2015-10-07 12:42:34 -04:00
Jason Perkins
d623e47d2a Merge branch 'ssurtees/fixedEmptyProjectBug' of https://github.com/LORgames/premake-core into LORgames-ssurtees/fixedEmptyProjectBug
# Conflicts:
#	tests/actions/vstudio/vc2010/test_platform_toolset.lua
2015-09-16 18:35:25 -04:00
Sam Surtees
01dfaf611c Added tests and file type testing helper function 2015-09-16 22:31:40 +10:00
Sam Surtees
0c497da65e Empty projects no longer ignore platform toolset when there are no "cpp" files present. Fixes #93 2015-09-15 21:03:25 +10:00
starkos
fcb06adcf4 Merge pull request #259 from starkos/rollback-162
Roll back pull request #162
2015-09-10 15:03:23 -04:00
triton
5952d054e5 Rename "framework" to "dotnetframework".
"framework" is a very generic term and hard to tell what it's actually about.

Keeps "framework" around for backwards compatibility.
2015-09-10 02:58:52 +01:00
starkos
b5ee3ac021 Merge pull request #169 from TurkeyMan/llvm_toolset
Support LLVM platform toolset for MSC; Clang in Visual Studio.
2015-09-09 15:06:53 -04:00
Jason Perkins
5cd081cf65 Roll back pull request #162
As discussed in the conversion on the request, and on issue #151.
2015-09-09 14:22:43 -04:00
Jason Perkins
c3d2e226a3 Rename solution to workspace in test suites 2015-09-03 18:03:39 -04:00
Manu Evans
28ebe8fce7 string.explode() gains 'maxTokens' argument. 2015-09-01 22:46:10 +10:00
aleksijuvani
48131e0598 Update unit tests for extension settings change 2015-08-31 22:23:15 +03:00
aleksijuvani
35e5a3d3a0 Update unit tests for extension targets change 2015-08-31 22:13:41 +03:00
starkos
ba3e30f510 Merge pull request #234 from starkos/more-workspace-renames
More workspace renames
2015-08-30 11:10:34 -04:00
Jason Perkins
14525e8161 Changes names in core test suites 2015-08-28 16:16:14 -04:00
Sam Surtees
5d6d05c31d Added ignoreDefaultLibraries API for Visual Studio 2010+ projects. 2015-08-25 20:33:46 +10:00
Sam Surtees
b5ccf23105 The links API, for visual studio, no longer appends .lib if an extension already exists. Fixes #87 2015-08-24 23:51:48 +10:00
Manu Evans
04a7cd1546 Silence warnings about arguments unknown to Clang, fixed a mistake 2015-08-02 12:34:28 +10:00
Manu Evans
eab093302c Support LLVM platform toolset for MSC; Clang in Visual Studio. 2015-08-02 12:34:27 +10:00
leeonix
a52c947838 update test_compile_settings.lua 2015-08-01 09:28:07 +08:00
leeonix
dd8c5f1818 Merge remote-tracking branch 'premake-src/master' 2015-08-01 09:21:57 +08:00
leeonix
e8a7ce64ff update test_compile_settings.lua 2015-07-22 15:14:06 +08:00
Jason Perkins
de7b6e001d Code cleanup; finish converting to new indentation-aware output APIs 2015-07-15 16:52:56 -04:00
Jason Perkins
86d40be605 Fix unit tests broken by the previous commit 2015-07-05 12:51:36 -04:00
starkos
9e1b733e78 Merge pull request #138 from Blizzard/targetdir-default-fix
fix targetdir default.
2015-07-05 12:30:36 -04:00
Tom van Dijck
31e3588d54 fix unit-tests. 2015-07-02 07:14:26 -07:00
rhuvendiek
2014046021 Add unit test for MIDL generator. 2015-07-01 16:52:53 +02:00
Jason Perkins
f59651f3f6 Deprecate SEH flag; add value to exceptionhandling() 2015-06-23 19:03:28 -04:00
Jason Perkins
313a7c31ce Replace usages of NoExceptions and NoRTTI flags with exceptionhandling() and rtti() 2015-06-23 16:53:10 -04:00
Tom van Dijck
8d0b2565b5 convert exceptionhandling, rtti and editandcontinue flags from boolean to "tri-states". 2015-06-16 08:44:18 -07:00
Tom van Dijck
307e04ed88 add new exceptionhandling and rtti API's, deprecate the corresponding flags. 2015-06-16 08:25:39 -07:00
Tom van Dijck
678616b068 fix for /O2 not liking /RTC1 2015-06-10 16:32:09 -07:00
starkos
b23fcc0e2b Merge pull request #12 from Blizzard/pr6
/O2 is incompatible with /RTC1
2015-05-25 19:42:29 -04:00
Jason Perkins
304c091431 Merge remote-tracking branch 'origin/master' into vstudio-system-includes 2015-05-19 15:55:47 -04:00
Tom van Dijck
e821e1f1da fix unit-tests 2015-05-18 08:43:12 -07:00
Jason Perkins
7eb03dfa27 Add syslibdirs and VC 2010+ implementation 2015-05-17 17:53:55 -04:00
Jason Perkins
8048890507 Merge branch 'master' of https://github.com/amc522/premake-core into amc522-master
# Conflicts:
#	src/actions/vstudio/vs2010_vcxproj_user.lua
2015-05-17 12:01:04 -04:00
Jason Perkins
ee1f165c8a Add sysincludedirs() and VC 2010+ implementation 2015-05-13 15:41:29 -04:00
Jason Perkins
15fd9fd43b Translate rule var paths for Visual Studio projects and make relative to project 2015-05-08 16:30:47 -04:00
Aaron
431c158a65 Fixed test for debugcommand for vc2010 action 2015-05-08 12:24:49 -04:00
Jason Perkins
2df200eb2d Re-standardize all project APIs to Lua's all-lowercase style
See [this discussion topic](https://groups.google.com/forum/#!topic/premake-development/W1rRPcMmM0k)
2015-05-05 14:46:00 -04:00
Manu Evans
f01d7f726c Merge pull request #48 from starkos/vs-platform-toolset
Modify toolset() to accept an option version number
2015-04-29 21:26:59 +10:00
Jason Perkins
32183f039f Modify toolset() to accept an option version number.
toolset("gcc")   -- specifies GCC with no specific version
toolset("gcc-4.8")   -- GCC version 4.8
toolset("msc-100")  -- MSC with platform toolset v100
toolset("v100")  -- same as above
2015-04-28 18:50:56 -04:00
Jason Perkins
400f0fccdb New API buildlog() to specify build log file path; implemented for Visual Studio 2010+ 2015-04-28 16:30:23 -04:00
Jason Perkins
17f1843c71 Finish renaming architectures away from x32/x64
A number of tests were relying on the fact that x32/x64 were being converted implicitly to x86/x86_64. If/when we retire those symbols, all of those tests would break. Renamed them now to avoid having to sort it out later. Also fixed up comments to keep everything consistent.
2015-04-13 18:27:11 -04:00
Manu Evans
07e90323cd Changed x32/x64 to explicit architecture names for clarity.
Aliases should probably be deprecated.
2015-04-13 21:41:08 +10:00
Jason Perkins
0869ac5cb2 Implement AVX2 for Visual Studio 2013 2015-03-26 10:22:55 -04:00
Jason Perkins
c8cc548bb0 Merge latest from default branch 2015-03-11 16:20:37 -04:00
Jason Perkins
058f1a4916 Modernize the VC# user file exporter 2015-03-11 15:52:51 -04:00
Jason Perkins
a0408ebb98 Only output VC'201x .user file if there is something to put in it 2015-03-11 14:40:12 -04:00
Jason Perkins
e4a1ff2638 Merged in TurkeyMan/premake-dev/specific_warnings (pull request #152)
Added api's for control of specific warnings.
2015-03-10 17:14:22 -04:00