summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Revert "Don't use expand, just add the new variables to the paths, in some wa...revert-77-jwi-inclibdirJohnny Willemsen2018-11-022-4/+22
* Merge pull request #77 from jwillemsen/jwi-inclibdirJohnny Willemsen2018-11-022-22/+4
|\
| * Don't use expand, just add the new variables to the paths, in some way the ch...Johnny Willemsen2018-11-022-22/+4
|/
* Merge pull request #76 from jwillemsen/jwi-inclibdirJohnny Willemsen2018-11-013-5/+23
|\
| * Introduce new SSL_INCDIR/SSL_LIBDIR and XERCESC_INCDIR/XERCESC_LIBDIR to spec...Johnny Willemsen2018-11-013-5/+23
* | Merge pull request #72 from mitza-oci/masterACE+TAO-6_5_2Adam Mitz2018-09-141-2/+1
|\ \ | |/ |/|
| * qt5 with -type gnuace: provide workaround in case no PIC flag is defined (suc...Adam Mitz2018-09-141-2/+1
|/
* Merge pull request #71 from jwillemsen/jwi-qt5-fc28Johnny Willemsen2018-09-131-3/+10
|\
| * Add support for QT5_SUFFIX, on some linux distributions the qt5 binaries have...Johnny Willemsen2018-09-131-3/+10
|/
* Merge pull request #70 from iguessthislldo/igtd/qt5Adam Mitz2018-09-101-5/+13
|\
| * Qt5: Optional bin and lib variablesFred Hornsey2018-09-101-4/+12
| * Qt5: Correct Varible for PIC SettingFred Hornsey2018-09-101-1/+1
* | Merge pull request #69 from iguessthislldo/igtd/qt5Adam Mitz2018-09-079-1/+84
|\ \ | |/
| * qt5_core.mpb: s/QT5_DIR/QTDIR/g and simplify PICFred Hornsey2018-09-061-10/+7
| * qt5_core.mpb: s/windows/microsoft/gFred Hornsey2018-09-041-1/+1
| * Qt5: s/lit_libs/libs/gFred Hornsey2018-09-048-8/+8
| * Added qt4 to global.featuresFred Hornsey2018-08-311-1/+2
| * Responses to comments in PR #69Fred Hornsey2018-08-312-8/+5
| * Avoid Winsock 1 Header when using Qt5Fred Hornsey2018-08-301-1/+8
| * Qt5 Build SupportFred Hornsey2018-08-2810-0/+81
|/
* Merge pull request #68 from jwillemsen/jwi-clangndds-warningsACE+TAO-6_5_1Johnny Willemsen2018-08-032-2/+2
|\
| * Fixed spelling errorsJohnny Willemsen2018-08-032-2/+2
|/
* Merge pull request #66 from jwillemsen/jwi-clangndds-warningsJohnny Willemsen2018-08-011-0/+3
|\
| * When using clang on Linux disable some warnings on the RTI generaterd code, i...Johnny Willemsen2018-08-011-0/+3
* | Merge pull request #60 from LukeMouse/fix2015Johnny Willemsen2018-06-281-1/+1
|\ \
| * | fix sln generate script for vs 2015lukemouse2018-06-281-1/+1
|/ /
* | Merge pull request #59 from jwillemsen/jwi-mpcdocufixJohnny Willemsen2018-06-221-1/+1
|\ \ | |/ |/|
| * Fixed typo in docuJohnny Willemsen2018-06-221-1/+1
|/
* Merge pull request #52 from mitza-oci/masterACE+TAO-6_5_0Latest_ACETAO_MinorAdam Mitz2018-05-213-7/+12
|\
| * vc10: "None" files don't need to be ExcludedFromBuildAdam Mitz2018-04-171-7/+1
| * Set default Windows SDK version to the one that VS2017 installs.Adam Mitz2018-03-281-0/+1
* | Wed May 16 14:43:23 UTC 2018 Chad Elliott <elliott_c@ociweb.com>Chad Elliott2018-05-162-0/+35
|/
* Merge pull request #51 from jwillemsen/masterACE+TAO-6_4_8Johnny Willemsen2018-03-211-1/+1
|\
| * Reduced xsc defaults, not used for all projects, will update OpenDDS/DAnCE to...Johnny Willemsen2018-03-211-1/+1
* | Merge pull request #49 from jwillemsen/masterACE+TAO-6_4_7Johnny Willemsen2018-01-231-1/+1
|\ \ | |/
| * Fixed typo in documentationJohnny Willemsen2018-01-231-1/+1
|/
* Merge pull request #48 from iguessthislldo/masterAdam Mitz2018-01-193-28/+46
|\
| * wireshark.mpb: Changes for PRFrederick Hornsey2018-01-182-16/+20
| * wireshark.mpb: Out-of-source options made OS genericFrederick Hornsey2018-01-173-28/+42
* | Merge pull request #47 from iguessthislldo/masterAdam Mitz2018-01-153-5/+44
|\ \ | |/
| * Merge remote-tracking branch 'upstream/master'Fred Hornsey2018-01-152-0/+7
| |\ | |/ |/|
* | Thu Jan 11 18:43:46 UTC 2018 Adam Mitz <mitza@ociweb.com>Adam Mitz2018-01-112-0/+7
| * Changelog for Wireshark 2Frederick Hornsey2018-01-151-0/+9
| * Wireshark 2 removed requires statmentFred Hornsey2018-01-101-1/+0
| * wireshark.mpb Line Endings FixFrederick Hornsey2018-01-051-72/+72
| * Changes for WS2 PRFred Hornsey2018-01-042-9/+23
| * Wireshark 2 comment and additional libFrederick Hornsey2018-01-021-4/+4
| * Support for Wireshark 2 on WindowsFrederick Hornsey2018-01-021-43/+60
|/
* Merge pull request #45 from mathersm/vc10-language-standardACE+TAO-6_4_6Johnny Willemsen2017-12-032-0/+4
|\
| * Added ISO C++ Standard setting to vc10 templateMichael Mathers2017-09-092-0/+4