Commit Graph

1961 Commits

Author SHA1 Message Date
starkos
b1cbb27914 Merge pull request #61 from Blizzard/deprecated-args
Fixes for lua deprecated 'arg' usage.
2015-05-17 12:02:33 -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
dfba2f2543 Merge branch 'pr16' of https://github.com/Blizzard/premake-core into Blizzard-pr16
# Conflicts:
#	src/actions/vstudio/vs2010_vcxproj.lua
2015-05-17 11:57:47 -04:00
Jason Perkins
ee1f165c8a Add sysincludedirs() and VC 2010+ implementation 2015-05-13 15:41:29 -04:00
StiX
08b498e629 Silenced xcopy on success output 2015-05-13 19:41:48 +02:00
Jason Perkins
514d01631a Update to latest Xcode module 2015-05-12 12:14:59 -04:00
tdijck
75fcb73bf5 allow tokens in vpaths 2015-05-11 10:23:30 -07:00
tdijck
010397c15e Fixes for lua deprecated 'arg' usage. 2015-05-11 10:18:17 -07:00
starkos
f1ff69cf8d Merge pull request #26 from Blizzard/pr5
fix 'off by one' error for emtpy scripts in embed.lua
2015-05-10 10:29:36 -04:00
starkos
9a15907ef5 Merge pull request #21 from Blizzard/pr15
add or bring back premake.action.supportsconfig
2015-05-10 10:28:37 -04:00
starkos
d1029ce29b Merge pull request #20 from Blizzard/pr14
paths from config.getlinks are already project relative.
2015-05-10 10:28:08 -04:00
starkos
5751dd791a Merge pull request #19 from Blizzard/pr13
fix bug in io.open override
2015-05-10 10:27:29 -04:00
starkos
dc3127432b Merge pull request #18 from Blizzard/pr12
64-bit compiler doesn't like SSE/SSE2 flags, they are implied.
2015-05-10 10:26:18 -04:00
starkos
5432ac8a55 Merge pull request #17 from Blizzard/pr11
fix bug in oven.bubbleFields not expanding tokenized strings.
2015-05-10 10:21:22 -04:00
Manu Evans
c2b982885a Merge pull request #60 from starkos/fix-rule-var-paths
Fix rule var paths
2015-05-09 10:54:53 +10:00
Jason Perkins
1b9c2893c2 Consolidate VS translate-and-make-relative behavior to a single call 2015-05-08 17:08:41 -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
29bcf2a5db Removed the check to see if the debugcommand path is absolute. 2015-05-08 14:52:14 -04:00
starkos
a7495d19ae Merge pull request #50 from premake/monodevelop
Added MonoDevelop/Xamarin submodule.
2015-05-08 14:22:58 -04:00
Aaron
431c158a65 Fixed test for debugcommand for vc2010 action 2015-05-08 12:24:49 -04:00
Aaron
2c81ff7ec2 Forcing debugcommand for vs201x to be an absolute path 2015-05-08 01:59:13 -04:00
Manu Evans
bc9f636414 Added MonoDevelop/Xamarin submodule. 2015-05-08 11:01:54 +10:00
Manu Evans
df1dfd4cfc Merge pull request #56 from starkos/fix-external-casing
Fix external casing
2015-05-08 10:41:50 +10:00
starkos
120bf0ad73 Merge pull request #58 from starkos/fix-writefile-ifnotequal
Fix writefile ifnotequal
2015-05-07 16:36:54 -04:00
Tom van Dijck
23bda444c6 move filterEmpty into table, lowercase.
fix path.translate issue.
2015-05-07 13:14:18 -07:00
Jason Perkins
443ee4321c Fix attribution in support docs 2015-05-07 16:12:04 -04:00
tdijck
480e98c1d5 add bindirs 2015-05-07 13:02:57 -07:00
Jason Perkins
e1b7d5a30b Fix supporting documentation 2015-05-07 15:44:42 -04:00
Jason Perkins
96431eabac Fix a type mismatch warning from Clang 2015-05-07 15:41:58 -04:00
starkos
f233bd7ed7 Merge pull request #16 from Blizzard/pr10
add os.writefile_ifnotequal
2015-05-07 15:39:27 -04:00
Jason Perkins
a0881cbcff Fix usages of old external function casing 2015-05-07 15:37:32 -04:00
Jason Perkins
df2fb37c6b Fix casing on generated external container functions (i.e. externalproject) 2015-05-07 15:07:27 -04:00
Manu Evans
613cd3faa1 Merge pull request #53 from starkos/fix-api-case
Re-standardize all project APIs to Lua's all-lowercase style
2015-05-06 14:46:03 +10: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
starkos
1503a14fbd Merge pull request #51 from premake/codelite
Added CodeLite submodule
2015-05-03 19:32:13 -04:00
starkos
f7114cef2a Merge pull request #44 from dcourtois/robust_module_loader
modules are now correctly loaded in all situations
2015-05-03 19:30:10 -04:00
Jason Perkins
6e03ac1068 Merge branch 'release' 2015-05-03 19:20:01 -04:00
Jason Perkins
e222f3f11d Clone submodules after release branch checkout 2015-05-03 18:56:29 -04:00
Manu Evans
bb9b6bcb6e Added CodeLite submodule. 2015-05-01 19:27:03 +10:00
starkos
c7e0e66aa2 Merge pull request #49 from starkos/fix-main-overrides
Allow premake.override() to work with the premake.main call arrays
2015-04-30 16:11:54 -04:00
Jason Perkins
75962df437 Allow premake.override() to work with functions in the premake.main call arrays 2015-04-30 14:42:25 -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
Manu Evans
45b9e20a43 Merge pull request #47 from starkos/vs-build-log
New API: buildlog()
2015-04-29 15:39:50 +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
1ff1fab337 Merge branch 'release-5.0-alpha2' into release 2015-04-27 17:33:35 -04:00
Jason Perkins
3a5b852470 Ported packaging script from Hg to Git 2015-04-27 17:32:59 -04:00
Jason Perkins
9566bb3de8 Merge branch 'release-5.0-alpha2' into release 2015-04-27 17:00:08 -04:00
Jason Perkins
6c8162f6ef Updated CHANGES and CONTRIBUTORS from commit logs 2015-04-27 16:57:48 -04:00
Manu Evans
ff4689b3c0 Merge pull request #35 from TurkeyMan/debugger_selection
More debugging api's
2015-04-17 09:46:33 +10:00