summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #24 from jwillemsen/masterACE+TAO-6_4_1Johnny Willemsen2016-10-061-0/+3
|\
| * On Android we also have to set RTI_LINUX as defineJohnny Willemsen2016-10-061-0/+3
|/
* Logging my changes from last week in the ChangeLog, since that's where the ch...Adam Mitz2016-09-261-0/+12
* Merge pull request #23 from mitza-oci/masterAdam Mitz2016-09-232-16/+38
|\
| * Allow CommandHelper::get_output to return more detailed dependency info.Adam Mitz2016-09-222-11/+38
| * ProjectCreator patch from Chad Elliott 2016-9-9Adam Mitz2016-09-221-5/+0
|/
* Merge pull request #20 from jwillemsen/masterACE+TAO-6_4_0Johnny Willemsen2016-05-231-1/+1
|\
| * Change MultiProcessorCompilation to put the value passed into the generated f...Johnny Willemsen2016-05-231-1/+1
* | Merge pull request #19 from jwillemsen/masterACE+TAO-6_3_4Johnny Willemsen2016-04-015-15/+28
|\ \ | |/
| * Layout changeJohnny Willemsen2016-04-011-2/+1
| * Add vc15Johnny Willemsen2016-04-015-14/+28
* | Merge pull request #18 from jwillemsen/masterJohnny Willemsen2016-04-017-0/+139
|\ \ | |/
| * Update to vc15Johnny Willemsen2016-04-011-1/+1
| * Update vc14 to vc15Johnny Willemsen2016-04-017-0/+139
|/
* Mon Mar 7 19:40:37 UTC 2016 Chad Elliott <elliott_c@ociweb.com>Chad Elliott2016-03-073-2/+26
* Wed Feb 17 19:19:40 UTC 2016 Chad Elliott <elliott_c@ociweb.com>Chad Elliott2016-02-172-3/+13
* Merge pull request #17 from jwillemsen/masterJohnny Willemsen2016-01-311-4/+4
|\
| * Make sure the install dir is also created when it doesn't exist yet and set t...Johnny Willemsen2016-01-311-4/+4
* | Merge pull request #16 from jwillemsen/masterJohnny Willemsen2016-01-291-1/+1
|\ \ | |/
| * Add quotes around the argument to cmd /c to handle cases where the command it...Johnny Willemsen2016-01-291-1/+1
* | Merge pull request #15 from hilljh82/masterJames H. Hill2015-10-162-4/+4
|\ \
| * | Testing potential fix for building static tools on LinuxJames H. Hill2015-10-161-2/+2
| * | Fixed errors in configuration for Pin build 71313James H. Hill2015-10-162-5/+3
| * | Removed -lelf -ldwarf flagsJames H. Hill2015-10-161-1/+3
| * | Fixed LDLIBS gnuace on linuxJames H. Hill2015-10-161-1/+1
| * | Merge remote-tracking branch 'public/master'James H. Hill2015-10-167-16/+33
| |\ \ | |/ / |/| |
* | | Merge pull request #14 from jwillemsen/masterJohnny Willemsen2015-09-212-2/+2
|\ \ \ | | |/ | |/|
| * | Merge branch 'master' of git://github.com/DOCGroup/MPCJohnny Willemsen2015-09-210-0/+0
| |\ \ | |/ / |/| |
* | | Merge pull request #13 from jwillemsen/masterJohnny Willemsen2015-09-181-3/+3
|\ \ \
* \ \ \ Merge pull request #12 from jwillemsen/masterACE+TAO+CIAO-6_3_3Johnny Willemsen2015-09-162-3/+3
|\ \ \ \
| | | * | Make it possible to set WholeProgramOptimization to another value then just trueJohnny Willemsen2015-09-211-1/+1
| | | * | Corrected tool versionJohnny Willemsen2015-09-211-1/+1
| | |/ /
| | * | Make sure we don't add duplicate source filesJohnny Willemsen2015-09-181-3/+3
| |/ /
| * | Document that vc14 is Visual Studio 2015Johnny Willemsen2015-09-162-3/+3
|/ /
* | Merge pull request #11 from jwillemsen/jwi-msbuild-callbatchJohnny Willemsen2015-09-151-1/+1
|\ \
| * \ Merge branch 'master' into jwi-msbuild-callbatchJohnny Willemsen2015-09-151-2/+2
| |\ \ | |/ / |/| |
* | | Merge pull request #10 from jwillemsen/jwi-prevent-duplicatesJohnny Willemsen2015-09-151-2/+2
|\ \ \
| * | | Prevent duplicate source files within a projectJohnny Willemsen2015-09-151-2/+2
* | | | Merge pull request #9 from jwillemsen/masterJohnny Willemsen2015-09-141-0/+1
|\ \ \ \ | |/ / /
| | * | Add another invocation of cmd /c to the templatJohnny Willemsen2015-09-151-1/+1
| | * | Use cmd /c to invoke our custom commands, that way multiple custom commands e...Johnny Willemsen2015-09-151-1/+1
| |/ /
| * | Set correct toolsversion for msvc14Johnny Willemsen2015-09-141-0/+1
|/ /
* | Tue Sep 8 13:16:45 UTC 2015 Chad Elliott <elliott_c@ociweb.com>Chad Elliott2015-09-082-4/+11
* | Merge pull request #8 from DOCGroup/wireshark-vc11-12-14Adam Mitz2015-09-031-1/+10
|\ \
| * | Updated wireshark.mpb for compatibility with vc11, vc12, vc14Adam Mitz2015-09-031-1/+10
|/ /
* | Merge pull request #7 from hilljh82/masterJames H. Hill2015-08-292-7/+5
|\ \
* \ \ Merge pull request #6 from hilljh82/masterJames H. Hill2015-08-281-2/+2
|\ \ \
| | | * Resolved conflicts for mergeJames H. Hill2015-10-162-8/+6
| | | |\ | | | |/ | | |/|
| | * | Deprecated support for version prior to 71313 since directory structure changedhilljh822015-08-291-1/+1
| | * | Deprecated support for version prior to 71313 since directory structure changedhilljh822015-08-291-6/+4
| |/ /