Commit Graph

1870 Commits

Author SHA1 Message Date
Jason Perkins
d35a5f5ebf Fix mapping of exception handler and rtti values in tool adapters 2015-06-23 16:52:17 -04:00
starkos
41dec88056 Merge pull request #114 from mindw/add_get_directory
Add file.directory token
2015-06-21 19:31:12 -04:00
starkos
d1a74ecf76 Merge pull request #106 from Blizzard/filterempty
adding table.filterempty to vstudio.path
2015-06-21 19:30:57 -04:00
starkos
0280d44efd Merge pull request #104 from Blizzard/normalize-fix
filter out /./ in path.join and path.normalize
2015-06-21 19:30:45 -04:00
starkos
fe1f9b4531 Merge pull request #102 from Blizzard/exceptionhandling
add new exceptionhandling and rtti API's, deprecate the corresponding flags.
2015-06-21 19:28:27 -04:00
starkos
8d30db02e4 Merge pull request #118 from starkos/module-load-tests
Embedded modules should now return "should load" test function from _preload.lua
2015-06-18 16:01:24 -04:00
Jason Perkins
3714abefde Embedded modules should now return "should load" test function from their _preload.lua script
Each _preload.lua should end by returning a function of the form `function (cfg) … end`, which should itself return true if the module is required by the provided configuration. For the D language module, this might look like `return function (cfg) return cfg.language == "D" end`
2015-06-17 15:48:47 -04:00
Jason Perkins
8f6d8e1d61 A bit of clean up on release support files 2015-06-16 17:20:21 -04:00
Jason Perkins
e533d748b6 Update CHANGES and CONTRIBUTORS 2015-06-16 16:37:35 -04:00
Tom van Dijck
8d0b2565b5 convert exceptionhandling, rtti and editandcontinue flags from boolean to "tri-states". 2015-06-16 08:44:18 -07:00
Tom van Dijck
307e04ed88 add new exceptionhandling and rtti API's, deprecate the corresponding flags. 2015-06-16 08:25:39 -07:00
Gabi Davar
eace6d5d59 Add file.directory token
Useful for buildrules which require the directory of the file separate from its basename (protobuf 2.x).
Example:

``` lua

       -- One or more commands to run (required)
       protobuf_base = path.getabsolute(path.join(os.getcwd(), 'Third-Party/nanopb'))

       buildcommands {
            protobuf_base .. '/bin/protoc.exe -o%{cfg.objdir}/%{file.basename}.pb --proto_path=%{file.directory} %{file.abspath}',
```
2015-06-14 10:18:43 +03: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
cf4d189368 adding table.filterempty to vstudio.path 2015-06-08 11:48:02 -07:00
Tom van Dijck
570da6fbea setup premake to run tests from visual studio by default. 2015-06-08 11:15:34 -07:00
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
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