Merge pull request #19 from jwillemsen/masterACE+TAO-6_3_4

More vc15 changes

5 files changed, 28 insertions, 15 deletions

diff --git a/config/pin_base.mpb b/config/pin_base.mpb
index 2af0a49d..b58f09fe 100644
--- a/config/pin_base.mpb
+++ b/config/pin_base.mpb
@@ -13,7 +13,7 @@ project {
     compile_flags += /Oy
   }
 
-  specific (vc10, vc11, vc12, vc14) {
+  specific (vc10, vc11, vc12, vc14, vc15) {
     runtime_library = MultiThreaded
     ImageHasSafeExceptionHandlers = false
 
@@ -67,8 +67,7 @@ feature(ia32) {
   libpaths += $(PIN_ROOT)/ia32/lib \
               $(PIN_ROOT)/ia32/lib-ext \
               $(PIN_ROOT)/extras/xed-ia32/lib \
-	      $(PIN_ROOT)/extras/components/lib/ia32
-
+              $(PIN_ROOT)/extras/components/lib/ia32
 
   macros += TARGET_IA32 HOST_IA32
   avoids += intel64
diff --git a/config/pintool.mpb b/config/pintool.mpb
index 65a7575c..a9ffc668 100644
--- a/config/pintool.mpb
+++ b/config/pintool.mpb
@@ -41,7 +41,7 @@ feature (ia32) {
     link_options += /ENTRY:Ptrace_DllMainCRTStartup@12
   }
 
-  specific (vc10, vc11, vc12, vc14) {
+  specific (vc10, vc11, vc12, vc14, vc15) {
     EntryPointSymbol = Ptrace_DllMainCRTStartup@12
   }
 }
@@ -51,7 +51,7 @@ feature (intel64) {
     link_options += /ENTRY:Ptrace_DllMainCRTStartup
   }
 
-  specific (vc10, vc11, vc12, vc14) {
+  specific (vc10, vc11, vc12, vc14, vc15) {
     EntryPointSymbol = Ptrace_DllMainCRTStartup
   }
 }
diff --git a/config/winapp.mpb b/config/winapp.mpb
index af63e6e5..1c7fe111 100644
--- a/config/winapp.mpb
+++ b/config/winapp.mpb
@@ -5,7 +5,7 @@ project {
   } else {
     subsystem = 2
   }
-  specific(vc10, vc11, vc12, vc14) {
+  specific(vc10, vc11, vc12, vc14, vc15) {
     subsystem = Windows
   }
 }
diff --git a/config/wireshark.mpb b/config/wireshark.mpb
index 807f8b44..cfcbb91e 100644
--- a/config/wireshark.mpb
+++ b/config/wireshark.mpb
@@ -16,7 +16,7 @@ project : glib {
   }
   specific(vc10) {
     macros      += MSC_VER_REQUIRED=1600
-  }  
+  }
   specific(vc11) {
     macros      += MSC_VER_REQUIRED=1700
   }
diff --git a/docs/html/MakeProjectCreator.html b/docs/html/MakeProjectCreator.html
index 792d7b33..822a469f 100644
--- a/docs/html/MakeProjectCreator.html
+++ b/docs/html/MakeProjectCreator.html
@@ -499,7 +499,19 @@
                   </td>
 
                   <td rowspan="1" colspan="1">
-                    <p class="Tbl-Body">Visual Studio 2014.</p>
+                    <p class="Tbl-Body">Visual Studio 2015.</p>
+                  </td>
+                </tr>
+
+                <tr>
+                  <td rowspan="1" colspan="1">
+                    <p class="TblCode">
+                      <em class="TableCode">vc15</em>
+                    </p>
+                  </td>
+
+                  <td rowspan="1" colspan="1">
+                    <p class="Tbl-Body">Visual Studio 15.</p>
                   </td>
                 </tr>
 
@@ -1813,7 +1825,8 @@ class="XRef">the -workers_port option</a>,
           "Code">em3</em>, <em class="Code">vc6</em>, <em class=
           "Code">vc7</em>, <em class="Code">vc71</em>, <em class="Code">vc8</em>,
           <em class="Code">vc9</em>, <em class="Code">vc10</em>, <em class="Code">vc11</em>,
-              <em class="Code">vc12</em> and <em class="Code">vc14</em> project types. If this environment
+              <em class="Code">vc12</em>, <em class="Code">vc14</em> and
+              <em class="Code">vc15</em> project types. If this environment
               variable is set, MPC will generate inter-project dependencies for
               libraries within a single workspace. This is usually not desired
               since adding these dependencies in a static workspace has the side
@@ -1969,7 +1982,7 @@ class="XRef">the -workers_port option</a>,
 
                 <p class="Code">
                   &nbsp;&nbsp;exclude(vc6, vc7, vc71, vc8, vc9,
-                  vc10, vc11, vc12, vc14, nmake) {
+                  vc10, vc11, vc12, vc14, vc15, nmake) {
                 </p>
 
                 <p class="Code">&nbsp;&nbsp;&nbsp;&nbsp;this_directory</p>
@@ -2576,7 +2589,8 @@ class="Code">specific</em> clause.
                             <em class="Code">vc7</em>, <em class="Code">vc71</em>,
                             <em class="Code">vc8</em>, <em class="Code">vc9</em>,
                             <em class="Code">vc10</em>, <em class="Code">vc11</em>,
-                            <em class="Code">vc12</em>, and <em class="Code">vc14</em> project types.
+                            <em class="Code">vc12</em>, <em class="Code">vc14</em>,
+                            and <em class="Code">vc15</em> project types.
                           </p>
                         </td>
                       </tr>
@@ -3222,8 +3236,8 @@ class="Code">specific</em> clause.
               "Code">gnuace</em>, <em class="Code">vc6</em>, <em class=
               "Code">vc7</em>, <em class="Code">vc71</em>, <em class="Code">vc8</em>,
               <em class="Code">vc9</em>, <em class="Code">vc10</em>, <em class="Code">vc11</em>,
-              <em class="Code">vc12</em>, and
-                  <em class="Code">vc14</em> project types.
+              <em class="Code">vc12</em>, <em class="Code">vc14</em>, and
+              <em class="Code">vc15</em> project types.
                 </p>
 
                 <p class="Body">
@@ -8083,7 +8097,7 @@ class="Code">specific</em> clause.
                           7.10 is return for vc71 and 8.00 is returned for vc8,
                           9.00 is returned for vc9, 10.00 is returned for vc10,
                           11.00 is returned for vc11, 12.0 is returned for vc12,
-                          14.0 is returned for vc14.
+                          14.0 is returned for vc14, 15.0 is returned for vc15.
                         </p>
                       </td>
                     </tr>
@@ -8401,7 +8415,7 @@ class="Code">specific</em> clause.
                     <p class="Body">
                       Certain project types don't support the same
                       input file used by multiple custom types (current examples of
-                      this are vc10, vc11, vc12, vc14, cdt6, and cdt7). To accomodate these types, MPC
+                      this are vc10, vc11, vc12, vc14, vc15, cdt6, and cdt7). To accomodate these types, MPC
                       has a capability called "combined custom".  With this capability
                       enabled in the specific ProjectCreator, MPC will "fold together"
                       the multiple custom steps so that the target tool (Visual Studio