Commit Graph

1843 Commits

Author SHA1 Message Date
Tom van Dijck
fc9c8d224d oops.. remove out paths. 2015-06-08 11:12:17 -07:00
Tom van Dijck
c3c2045d92 filter out /./ in path.join and path.normalize 2015-06-08 11:08:08 -07:00
starkos
65a69d6546 Merge pull request #97 from moomalade/calling_convention
Add Visual Studio calling convention support
2015-06-07 08:56:42 -04:00
starkos
4638c266a6 Merge pull request #84 from Blizzard/solution-filter
add "system" to the filter for solutions, so we can do system specific solution configurations.
2015-06-07 08:55:48 -04:00
Manu Evans
57eb8528e6 Merge pull request #98 from moomalade/fix_category_typo
Fix typo in support for 'category' option field
2015-06-06 14:44:02 +10:00
Tim Wharton
957195fcc3 Fix typo in support for 'category' option field 2015-06-06 04:47:49 +01:00
Tim Wharton
fbd2d5d707 Add Visual Studio calling convention support
Add callingconvention directive, possible values are: Cdecl, FastCall, StdCall or VectorCall.
2015-06-06 04:44:04 +01:00
Manu Evans
7965886fb0 Update D submodule reference (fixes _preload.lua not working like I thought). 2015-06-04 23:47:55 +10:00
Tom van Dijck
983a4e530b add "system" to the filter for solutions, so we can do system specific solution configurations. 2015-05-26 10:09:50 -07:00
starkos
01abeaa99e Merge pull request #82 from Blizzard/option-defaults-and-categories
add option default and category support.
2015-05-25 19:43:20 -04:00
starkos
32ce857e8c Merge pull request #83 from TurkeyMan/dlang_module
Added D language submodule
2015-05-25 19:43:03 -04:00
starkos
b23fcc0e2b Merge pull request #12 from Blizzard/pr6
/O2 is incompatible with /RTC1
2015-05-25 19:42:29 -04:00
starkos
5d66d7695f Merge pull request #79 from starkos/remove-extra-list-sorts
Restore ordering of include file search paths
2015-05-21 08:01:34 -04:00
Manu Evans
3a40a7a4b1 Added D language submodule. 2015-05-21 14:26:48 +10:00
Manu Evans
a279ea6c74 Merge pull request #80 from starkos/fix-path-join-with-vars
Prevent environment variables from being trimmed out by path.join()
2015-05-21 14:16:28 +10:00
Tom van Dijck
74978881fa add option default and category support. 2015-05-20 17:25:18 -07:00
Jason Perkins
aafdc11626 Prevent environment variables from being trimmed out by ".." sequences in path.join() 2015-05-20 18:15:41 -04:00
Jason Perkins
24f232ce13 Restore ordering of include file search paths 2015-05-20 17:09:48 -04:00
starkos
d16b2f952f Merge pull request #76 from starkos/vstudio-system-includes
Add system include and library search paths
2015-05-20 16:20:03 -04:00
Manu Evans
e095efe21c Merge pull request #70 from Blizzard/path-join-optimize
Performance improvement by handling edge .. directories during path join
2015-05-20 11:55:39 +10:00
Jason Perkins
4d708b2580 Add sysincludedir() support to makefiles 2015-05-19 15:56:37 -04:00
Jason Perkins
304c091431 Merge remote-tracking branch 'origin/master' into vstudio-system-includes 2015-05-19 15:55:47 -04:00
Jason Perkins
c83634c105 Add support for sysincludedirs() and syslibdirs() to GCC, Clang, and MSC adapters 2015-05-19 15:55:11 -04:00
Jason Perkins
7d586a6b02 Bit of cleanup on GCC tool adapter 2015-05-19 14:13:15 -04:00
Manu Evans
f6fdb77b52 Merge pull request #75 from Blizzard/build-status
Add TravisCI build status on main page.
2015-05-19 11:50:53 +10:00
Tom van Dijck
7af7027fa6 Add TravisCI build status on main page. 2015-05-18 18:44:07 -07:00
Manu Evans
4087f924cf Merge pull request #71 from Blizzard/fix-architecture-check
fix architecture check.
2015-05-19 11:40:33 +10:00
Tom van Dijck
f994bcf448 fix architecture. 2015-05-18 18:16:58 -07:00
Tom van Dijck
6f20d21328 performance improvement by handling edge .. directories during path join 2015-05-18 18:08:36 -07:00
Tom van Dijck
e821e1f1da fix unit-tests 2015-05-18 08:43:12 -07:00
tdijck
588a1567bf /O2 is incompatible with /RTC1 2015-05-18 08:35:34 -07:00
Jason Perkins
7eb03dfa27 Add syslibdirs and VC 2010+ implementation 2015-05-17 17:53:55 -04:00
starkos
9bad3bd55b Merge pull request #66 from akaStiX/UpstreamMaster
Silenced xcopy on success output
2015-05-17 12:03:26 -04:00
starkos
fac7f87431 Merge pull request #62 from Blizzard/tokens-in-vpaths
allow tokens in vpaths
2015-05-17 12:02:47 -04:00
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