Commit Graph

1749 Commits

Author SHA1 Message Date
tdijck
e4cab4f0fe adding contrib libs (curl, zlib and libzip) 2015-04-14 09:29:38 -07: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
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
Manu Evans
14edfa4d77 Cleanup the Hg litter. 2015-04-03 13:03:53 +10:00
Manu Evans
99b02d9ecd Added an 'fpu' option, to select software/hardware FPU (used by arm, mips, etc) 2015-04-03 12:53:46 +10:00
Manu Evans
a37df953b5 Added 'endian' option to select target endian (arm, ppc, mips) 2015-04-03 12:53:37 +10:00
Manu Evans
e7a05b69a0 Merge pull request #1 from premake/travis
Added xcode submodule.
Added .travis.yml to integrate with Travis-CI and get all the PR's building.
2015-04-03 12:42:42 +10:00
Manu Evans
391060d389 Travis integration 2015-04-03 12:36:34 +10:00
Manu Evans
7093058647 Added xcode submodule 2015-04-03 12:36:34 +10:00
Jason Perkins
bd51df5d85 WE'VE MOVED TO GITHUB! Come join us at https://github.com/premake/premake-core
If you need help moving a private Mercurial fork of Premake to git, see https://github.com/premake/premake-core/wiki/Migrating-From-BitBucket
2015-04-02 16:31:57 -04:00
Jason Perkins
f01709afa1 Roll back embedded script compression with LuaSrcDiet 2015-04-01 13:42:15 -04:00
Jason Perkins
67bb8488d0 Back out exclude patterns on os.match() 2015-04-01 13:36:01 -04:00
Jason Perkins
5672a02792 Backout changeset 589733d6e9dc0e521bbf90a51dc1ef251b0fe46b 2015-04-01 13:35:12 -04:00
tdijck
ad0e4f03b4 Adding VS 2015 support. 2015-03-31 11:56:37 -07:00
tdijck
cac5baecbc Add C++11, C++14 flags for GCC & Clang 2015-03-31 11:55:13 -07:00
tdijck
3eb49baad4 deprecate ReleaseRuntime flag, use 'runtime "Release"' instead.: 2015-03-31 11:50:51 -07:00
tdijck
4d514e53f8 add verbosef 2015-03-31 11:50:25 -07:00
tdijck
71a286da8c strip ../ in path.normalize 2015-03-31 11:49:47 -07:00
tdijck
a8087f4b8f add string.sha1 function 2015-03-31 11:48:49 -07:00
Jason Perkins
878d108367 Merged in ben_ratzlaff/premake-dev (pull request #146)
Implement 'RelativeLinks" flag to effect makefile creation to use -l and -L instead of linking against the full path of a dynamic object library
2015-03-29 17:46:35 -04:00
Jason Perkins
2c8facae20 Merged in dcourtois/premake-dev/issue_265 (pull request #159)
fixed issue #265
2015-03-29 17:28:10 -04:00
Jason Perkins
34bf41ea9d Merged in tbasnoopy/premake-dev/extension replace (pull request #148)
add replaceextension function for paths
2015-03-29 17:25:44 -04:00