Commit Graph

1870 Commits

Author SHA1 Message Date
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
Damien Courtois
b59266f42e modules are now correctly loaded in all situations 2015-04-15 12:21:00 +02:00
Manu Evans
4ce26b3c9e Support selection between different debuggers.
Specify the debugger binaries, args to run with.
Specify path remaps:
  It's typical to remap path embedded in dwarf (as the exe was built) to the location of the source on your own pc.
2015-04-14 19:56:05 +10:00
starkos
17d77d4d3c Merge pull request #40 from starkos/finish-renaming-archs
Finish renaming architectures away from x32/x64
2015-04-13 18:41:39 -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
starkos
545b2901f0 Merge pull request #34 from TurkeyMan/override_clean
Made the clean functions overridable
2015-04-13 13:00:00 -04:00
starkos
bf6e97ada8 Merge pull request #36 from TurkeyMan/explicit_arch
Added aliases for explicit architectures
2015-04-13 12:49:04 -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
Manu Evans
13bf58372a Made the clean functions overridable. 2015-04-10 15:16:45 +10:00
starkos
f07b28b1c0 Merge pull request #5 from TurkeyMan/manu/endian
Add new endian() project API
2015-04-09 15:52:40 -04:00
starkos
168f91f3f4 Merge pull request #4 from TurkeyMan/manu/fpu
Add new fpu() project API
2015-04-09 15:12:37 -04:00
starkos
053f7b6740 Merge pull request #3 from TurkeyMan/manu/pic
Add new pic() api
2015-04-09 14:43:46 -04:00
starkos
de47325370 Merge pull request #31 from starkos/path-normalize-fix
Fix handling of "../../.." sequences in path.normalize()
2015-04-09 12:20:11 -04:00
starkos
881c196ab4 Merge pull request #32 from TurkeyMan/vs20xx_override
Allow for overriding generateSolution and generateProject
2015-04-09 12:18:36 -04:00
Manu Evans
48db64e9a9 Added pic (position independent code) api, used all over the place. 2015-04-10 01:12:53 +10:00
Manu Evans
1ba7404392 Allow for overriding generateSolution and generateProject. 2015-04-09 16:02:46 +10:00
starkos
b27005d4aa Merge pull request #15 from Blizzard/pr9
add table.tostring
2015-04-08 18:07:07 -04:00
Jason Perkins
614cea1c98 Fix handling of "../../.." sequences in path.normalize() 2015-04-08 18:01:43 -04:00
Manu Evans
af5724d2fb Merge pull request #30 from fzwoch/xcode
update xcode submdoule revision
2015-04-08 23:12:35 +10:00
Florian Zwoch
f56cd061d8 update xcode revision 2015-04-08 10:09:27 +02:00
tdijck
9b2c8c3c9a fix 'off by one' error for emtpy scripts. 2015-04-06 16:36:37 -07:00
Tom van Dijck
fad5160197 add or bring back premake.action.supportsconfig 2015-04-06 16:32:21 -07:00
Tom van Dijck
8cf5b03b47 paths from config.getlinks are already project relative. 2015-04-06 16:31:53 -07:00
Tom van Dijck
dd87f019d0 fix bug in io.open override 2015-04-06 16:31:22 -07:00
Tom van Dijck
01821e8e64 64-bit compiler doesn't like SSE/SSE2 flags, they are implied. 2015-04-06 16:30:49 -07:00
Tom van Dijck
48d3405684 fix bug in oven.bubbleFields not expanding tokenized strings. 2015-04-06 16:30:14 -07:00
tdijck
4723ca7ac8 add os.writefile_ifnotequal 2015-04-06 16:29:14 -07:00
Tom van Dijck
1a880e5422 add table.tostring
Conflicts:
	src/base/table.lua
2015-04-06 16:28:28 -07:00
Jason Perkins
1738c13263 Merge branch 'pr8' of https://github.com/Blizzard/premake-core 2015-04-06 17:07:20 -04:00
starkos
f9d31fe0c2 Merge pull request #13 from Blizzard/pr7
Add C++11, C++14 flags for GCC & Clang
2015-04-06 16:55:44 -04:00
starkos
47aa42ee09 Merge pull request #24 from premake/editorconfig
Added .editorconfig file (http://editorconfig.org/)
2015-04-06 15:46:46 -04:00
Manu Evans
4776e159e2 Merge pull request #25 from starkos/gitignore-modules
Add modules to .gitignore
2015-04-06 09:49:01 +10:00
Jason Perkins
713c03fc10 Add modules to .gitignore
Prevents private or in-progress modules from appearing in pending changes, makes it a little easier to work against core.
2015-04-05 12:51:03 -04:00
Manu Evans
117a67200c Added .editorconfig file (http://editorconfig.org/)
I keep having to fix my accidental insertion of spaces >_<
This configures lots of common editors to treat tabs properly according to the project.
2015-04-05 09:33:46 +10:00
Jason Perkins
4f511b2960 Merge branch 'cleanup-hg' of https://github.com/premake/premake-core 2015-04-04 11:29:40 -04:00
Jason Perkins
76cad937c3 Merge branch 'pr4' of https://github.com/Blizzard/premake-core 2015-04-04 11:24:01 -04:00
Jason Perkins
1478c4064b Merge branch 'pr3' of https://github.com/Blizzard/premake-core 2015-04-04 11:20:50 -04:00
Jason Perkins
0557e38efd Merge branch 'pr2' of https://github.com/Blizzard/premake-core 2015-04-04 11:17:24 -04:00
Jason Perkins
0a9754eff7 Merge branch 'pr1' of https://github.com/Blizzard/premake-core 2015-04-04 11:13:45 -04:00
Manu Evans
1873aa77af Surprisingly, the source code has referenced to .hg* files... 2015-04-03 13:30:46 +10:00