Commit Graph

1859 Commits

Author SHA1 Message Date
Tom van Dijck
b874b79597 filter out /./ in path.join and path.normalize 2015-07-09 15:05:33 +02:00
Tom van Dijck
812d374a87 add inlining API. 2015-07-09 15:05:31 +02:00
Damien Courtois
b228a68919 fixed incorrect backslashes escaping outside of tokens 2015-07-07 14:43:31 +02:00
Damien Courtois
f5d7ef1a5b fixed a crash when a token contains non-escaped backslashes, and added a unit test 2015-06-15 18:15:03 +02:00
Manu Evans
701c5a8c65 Merge pull request #113 from starkos/issue-107
Fix issue #107: map "Win32" to the x86 architecture for Visual Studio projects
2015-06-14 10:52:52 +10:00
Jason Perkins
26333a3b7b Fix issue #107: map "Win32" to the x86 architecture for Visual Studio projects 2015-06-13 15:54:19 -04:00
starkos
7983320ec6 Merge pull request #112 from starkos/deterministic-flag-maps
Make application of flag mappings deterministic (and potentially prioritized)
2015-06-13 15:09:54 -04:00
starkos
a1af0f02ce Merge pull request #110 from moomalade/bootstrap
Bootstrap Makefile
2015-06-13 13:47:30 -04:00
Manu Evans
2851751963 Merge pull request #99 from moomalade/make_cc_override
Enable Makefile environment overrides for CC,CXX and AR.
2015-06-13 10:43:04 +10:00
Jason Perkins
575ca32f5f Make application of flag mappings deterministic (and potentially prioritized) 2015-06-12 18:12:27 -04:00
starkos
aeeb67d838 Merge pull request #108 from Blizzard/basicruntimefix
stricter fix for /O2 not liking /RTC1, only when using the debug runtime.
2015-06-12 18:03:14 -04:00
Tim Wharton
3782314585 Change Travis CI to use bootstrap process
Adds both osx and linux as CI targets.
2015-06-12 20:12:23 +01:00
Tim Wharton
d536aa67e7 Add support for MinGW as a host bootstrap platform. 2015-06-11 19:26:59 +01:00
Tim Wharton
42b3ca2c51 Add bootstrap Makefile create premake initial executable
On a fresh clone, Bootstrap.mak can be used to prepare the initial premake executable on Windows, OSX and Linux.
2015-06-11 19:26:59 +01:00
Tom van Dijck
678616b068 fix for /O2 not liking /RTC1 2015-06-10 16:32:09 -07:00
Manu Evans
913245013e Merge pull request #105 from Blizzard/auto-test
setup premake to run tests from visual studio by default.
2015-06-09 09:50:10 +10:00
Tom van Dijck
570da6fbea setup premake to run tests from visual studio by default. 2015-06-08 11:15:34 -07:00
Tim Wharton
45401aa57b Enable Makefile environment overrides for CC,CXX and AR.
Check if CC, CXX or AR are their default values before assigning them their premake defaults.
If they are not at their default values, they have been overriden in the environment and we should leave them alone.

Overriding toolchains from the command line is useful when swapping between compilers.
For example: `CC=gcc-4.8.1 make -C build`
2015-06-08 04:46:16 +01: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