AuroraPipeline/fuck-premake-old2
Archived
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity
2,423 Commits 1 Branch 0 Tags 32 MiB
c4e4389f33
Commit Graph

2423 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tom van Dijck
a0a96edbcd Merge pull request #373 from Blizzard/fix-homedir-bug 
Fix a bug in 'premake_init'
 2015-12-18 09:56:50 -08:00
Tom van Dijck
b01dde9889 Prevent a null pointer from being pushed, which will causes issues later on 
in 'build_premake_path' on this line 'lua_concat(L, lua_gettop(L) - top);'.
 2015-12-18 09:51:43 -08:00
Samuel Surtees
ae2e8e585e Merge pull request #369 from Blizzard/fix-scripts-c 
Move scripts.c one up, so bootstrap.mak doesn't include it.
 2015-12-18 15:16:26 +10:00
Samuel Surtees
bd944bf86d Merge pull request #368 from Blizzard/travis-osx 
build on travis osx.
 2015-12-18 13:59:27 +10:00
Tom van Dijck
535e40db5f Allow the pathVars to return a table that specifies explicitly that a token represents a relative or absolute path. 2015-12-17 16:13:35 -08:00
Jason Perkins
3c1f106ebb Restore development version 2015-12-17 17:37:07 -05:00
Jason Perkins
3cae827c3d Update version number for release 2015-12-17 17:37:07 -05:00
Jason Perkins
9edfe480bc Captured changes since alpha6 2015-12-17 17:37:07 -05:00
Tom van Dijck
91f477aae6 Move scripts.c one up, so bootstrap.mak doesn't include it. 2015-12-17 12:56:56 -08:00
Tom van Dijck
89242f125c build on travis osx. 2015-12-17 12:43:36 -08:00
Tom van Dijck
9f7ebdced2 make "premake.checkVersion" use Semantic Versioning 
http://semver.org/
 2015-12-17 10:55:43 -08:00
starkos
4f8551b7d0 Merge pull request #366 from starkos/vs-target-machine-take-3 
Adds the missing resource file test on PR #365
 2015-12-16 19:53:47 -05:00
Jason Perkins
a7fa9b9142 Adds the missing resource file test on PR #365 2015-12-16 19:50:37 -05:00
Tom van Dijck
d056c744a7 Merge pull request #365 from starkos/vs-target-machine-take-2 
LGTM
 2015-12-16 13:58:54 -08:00
Jason Perkins
79f453a285 Emit <TargetMachine> element to fix LNK4068 warnings in Visual Studio 2010+ 2015-12-16 16:25:37 -05:00
Tom van Dijck
7ee817b9a8 Merge pull request #304 from Blizzard/more-detoken-fixes 
More fixes for detoken.
 2015-12-15 09:30:15 -08:00
Tom van Dijck
760859825b Merge pull request #342 from Blizzard/update-curl 
Update to Curl 7.45.0
 2015-12-15 09:29:22 -08:00
Manu Evans
b4bc07f4ed Merge pull request #353 from starkos/rollback-link-groups 
Rollback link groups (-Wl,--start-group, -Wl,--end-group)
 2015-12-04 10:53:02 +10:00
Jason Perkins
4b629acda0 Rollback link groups (-Wl,--start-group, -Wl,--end-group) 
The --start-group and --end-group flags cause issues for anyone using alternate linkers with GCC or Clang. We need to come up with a better solution.
 2015-12-03 07:04:00 -05:00
starkos
32f806758d Merge pull request #347 from tritao/gmake-response-paths 
Fixed C# GNU Make backend response files to deal with platform path separators
 2015-12-02 13:59:18 -05:00
Jason Perkins
6fc7a6920d Revert "Add targetMachine property." 
This reverts commit d38f9a9292.
 2015-11-30 18:14:37 -05:00
Joao Matos
fb99262b4c Fixed C# GNU Make backend response files to deal with platform path separators. 
Obsoletes pull request #292.
 2015-11-27 23:46:06 +00:00
Samuel Surtees
026daa9b68 Merge pull request #345 from tritao/symbolic-links 
Fixed os.isdir to work with Windows symbolic links.
 2015-11-25 13:00:18 +10:00
triton
5a6bb85027 Fixed os.isdir to work with Windows symbolic links. 2015-11-24 17:38:23 +00:00
ardneran
8173d84781 Added frameworkdirs option. 
This should now support FRAMEWORK_SEARCH_PATHS in xcode_common.lua. This will allow frameworks to exist in non sdk paths.
 2015-11-08 23:32:38 -05:00
Manu Evans
1f8c426fdb Merge pull request #343 from noresources/compile-warning-fix 
fix compilation warnings (linux)
 2015-11-08 11:17:22 +10:00
Renaud Guillard
3ac4a03442 fix compilation warning in http.c (missing initializer for field ‘errorBuffer’ of ‘CurlCallbackState’) 2015-11-07 17:09:56 +01:00
Renaud Guillard
42b6cfd859 fix compilation warning :ignoring return value of "fread", declared with attribute warn_unused_result 2015-11-07 16:09:56 +01:00
starkos
82c85e30ca Merge pull request #341 from Blizzard/targetmachine 
Add targetMachine property.
 2015-11-04 15:12:20 -05:00
Tom van Dijck
61c73497db Update to Curl 7.45.0 2015-11-04 11:23:24 -08:00
Tom van Dijck
d38f9a9292 Add targetMachine property. 2015-11-03 13:59:03 -08:00
starkos
816cc1a878 Merge pull request #340 from Blizzard/largeaddressaware 
add "LargeAddressAware" api.
 2015-11-03 16:30:45 -05:00
Tom van Dijck
68b714ad6f add "LargeAddressAware" api. 2015-11-03 13:27:57 -08:00
Tom van Dijck
22bccd9400 fix error reporting in detoken.lua 2015-11-03 09:44:36 -08:00
Samuel Surtees
3fb3916fa5 Merge pull request #338 from noresources/ignore-eclipse-files 
ignore eclipse project files
 2015-11-01 15:53:18 +10:00
Renaud Guillard
c01a411d8d ignore eclipse project files 2015-10-31 11:10:33 +01:00
starkos
cfec692c4c Merge pull request #332 from starkos/rollback-pr247 
Rollback PR #247 - support framework folders in gcc/clang
 2015-10-28 19:06:06 -04:00
Jason Perkins
7f4bd53f70 Rollback PR #247 - support framework folders in gcc/clang 
Rolled back the change and added a unit test to make sure we catch this in future
 2015-10-27 09:54:57 -04:00
starkos
bf619ff08f Merge pull request #324 from mversluys/master 
OSX and Linux SSL support and OSX fixes
 2015-10-27 09:36:55 -04:00
starkos
630f4bfa8f Merge pull request #328 from starkos/rollback-pr239 
Revert "improve determinism"
 2015-10-26 16:01:31 -04:00
Jason Perkins
04840ec2f0 Revert "improve determinism" 
This reverts commit 66358a2880.
 2015-10-26 15:59:07 -04:00
Matthew Versluys
1175f0df25 SSL support for Linux using OpenSSL 
CURL_CA_BUNDLE is deteceted during premake.
Feels like the header that was generated by configure should be removed and move all curl build options into premake.
 2015-10-26 10:36:35 -07:00
Matthew Versluys
192aa8216b SSL Support on Mac 
Utilizes Darwin SSL (rather than OpenSSL).
The configuration file that was built appears to be for Linux.
Had to remove the CURL_CA_BUNDLE for certificate lookup to work.
 2015-10-24 13:53:04 -07:00
Matthew Versluys
1185a2fb46 Fixes for Mac OSX 
--start-group and --end-group aren't available in the clang that ships with Xcode 7
Moved the build/link options for -mmacosx-version-min from the project to the solution so that the settings are applied to the contrib libraries.
Eliminates link spam that the libraries were built with newer versions of the compiler.
 2015-10-24 13:42:54 -07:00
starkos
32151316a8 Merge pull request #306 from saberhawk/master 
Fix sysincludedirs for GCC toolset
 2015-10-21 13:57:48 -04:00
starkos
432f6f5e98 Merge pull request #313 from Blizzard/sln-utf8-fix 
Solution files need a '\n\r' after the utf8 marker.
 2015-10-19 16:31:48 -04:00
Tom van Dijck
6c5c8c8180 Solution files need a '\n\r' after the utf8 marker. 2015-10-19 13:19:49 -07:00
Manu Evans
e6d7571f65 Merge pull request #310 from LORgames/ssurtees/sln2005OverrideFix 
sln2005 Override Fix
 2015-10-15 11:55:53 +10:00
Sam Surtees
ad56a58f79 Fixed bug in sln2005 that prevented p.override from working on the sln2005.elements functions. 2015-10-14 23:09:22 +10:00
Jason Perkins
0752850219 Merge branch 'release-5.0.0-alpha6' 2015-10-11 10:11:03 -04:00