[mapguide-commits] r9894 - in sandbox/jng/msvc2019: Desktop/DesktopUnmanagedApi/DotNet Desktop/MgDesktop Desktop/UnitTest Oem/SWIGEx/Lib/csharp

[svn_mapguide at osgeo.org]

Author: jng
Date: 2021-11-15 06:33:34 -0800 (Mon, 15 Nov 2021)
New Revision: 9894

Modified:
   sandbox/jng/msvc2019/Desktop/DesktopUnmanagedApi/DotNet/DesktopApi.vcxproj
   sandbox/jng/msvc2019/Desktop/MgDesktop/MgDesktop.vcxproj
   sandbox/jng/msvc2019/Desktop/UnitTest/UnitTest.vcxproj
   sandbox/jng/msvc2019/Oem/SWIGEx/Lib/csharp/csharphead.swg
Log:
#2843: Fix up mg-desktop build

Modified: sandbox/jng/msvc2019/Desktop/DesktopUnmanagedApi/DotNet/DesktopApi.vcxproj
===================================================================
--- sandbox/jng/msvc2019/Desktop/DesktopUnmanagedApi/DotNet/DesktopApi.vcxproj	2021-11-15 14:22:40 UTC (rev 9893)
+++ sandbox/jng/msvc2019/Desktop/DesktopUnmanagedApi/DotNet/DesktopApi.vcxproj	2021-11-15 14:33:34 UTC (rev 9894)
@@ -22,7 +22,7 @@
     <ProjectName>MapGuideDesktopUnmanagedApi</ProjectName>
     <ProjectGuid>{E706FB1C-4431-4508-8A2F-239A143EFA1C}</ProjectGuid>
     <RootNamespace>DesktopApi</RootNamespace>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
@@ -93,6 +93,7 @@
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+      <ShowIncludes>false</ShowIncludes>
     </ClCompile>
     <Link>
       <AdditionalDependencies>MgDesktopd.lib;FDO.lib;FDOCommon.lib;ACEd.lib;MgFoundationd.lib;MgGeometryd.lib;MgMdfModeld.lib;MgMdfParserd.lib;MgPlatformBased.lib;MgRenderersd.lib;MgStylizationd.lib;xerces-c_3mgD.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -122,6 +123,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <ShowIncludes>false</ShowIncludes>
     </ClCompile>
     <Link>
       <AdditionalDependencies>MgDesktop.lib;FDO.lib;FDOCommon.lib;ACE.lib;MgFoundation.lib;MgGeometry.lib;MgMdfModel.lib;MgMdfParser.lib;MgPlatformBase.lib;MgRenderers.lib;MgStylization.lib;xerces-c_3mg.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -161,6 +163,7 @@
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <ShowIncludes>false</ShowIncludes>
     </ClCompile>
     <Link>
       <AdditionalDependencies>MgDesktopd.lib;FDO.lib;FDOCommon.lib;ACEd.lib;MgFoundationd.lib;MgGeometryd.lib;MgMdfModeld.lib;MgMdfParserd.lib;MgPlatformBased.lib;MgRenderersd.lib;MgStylizationd.lib;xerces-c_3mgD.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -193,6 +196,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <ShowIncludes>false</ShowIncludes>
     </ClCompile>
     <Link>
       <AdditionalDependencies>MgDesktop.lib;FDO.lib;FDOCommon.lib;ACE.lib;MgFoundation.lib;MgGeometry.lib;MgMdfModel.lib;MgMdfParser.lib;MgPlatformBase.lib;MgRenderers.lib;MgStylization.lib;xerces-c_3mg.lib;%(AdditionalDependencies)</AdditionalDependencies>

Modified: sandbox/jng/msvc2019/Desktop/MgDesktop/MgDesktop.vcxproj
===================================================================
--- sandbox/jng/msvc2019/Desktop/MgDesktop/MgDesktop.vcxproj	2021-11-15 14:22:40 UTC (rev 9893)
+++ sandbox/jng/msvc2019/Desktop/MgDesktop/MgDesktop.vcxproj	2021-11-15 14:33:34 UTC (rev 9894)
@@ -21,7 +21,7 @@
   <PropertyGroup Label="Globals">
     <ProjectGuid>{CBC0339F-E68B-48BA-9059-945483BEBDCA}</ProjectGuid>
     <RootNamespace>MgDesktop</RootNamespace>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

Modified: sandbox/jng/msvc2019/Desktop/UnitTest/UnitTest.vcxproj
===================================================================
--- sandbox/jng/msvc2019/Desktop/UnitTest/UnitTest.vcxproj	2021-11-15 14:22:40 UTC (rev 9893)
+++ sandbox/jng/msvc2019/Desktop/UnitTest/UnitTest.vcxproj	2021-11-15 14:33:34 UTC (rev 9894)
@@ -21,7 +21,7 @@
   <PropertyGroup Label="Globals">
     <ProjectGuid>{67505883-F667-4C18-BCCA-63F3B76C64FF}</ProjectGuid>
     <RootNamespace>UnitTest</RootNamespace>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

Modified: sandbox/jng/msvc2019/Oem/SWIGEx/Lib/csharp/csharphead.swg
===================================================================
--- sandbox/jng/msvc2019/Oem/SWIGEx/Lib/csharp/csharphead.swg	2021-11-15 14:22:40 UTC (rev 9893)
+++ sandbox/jng/msvc2019/Oem/SWIGEx/Lib/csharp/csharphead.swg	2021-11-15 14:33:34 UTC (rev 9894)
@@ -5,9 +5,9 @@
  * ----------------------------------------------------------------------------- */
 
 %insert(runtime) %{
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
+#include <cstdlib>
+#include <cstring>
+#include <cstdio>
 #if defined(_WIN32) || defined(__CYGWIN32__)
 #  define DllExport   __declspec( dllexport )
 #  define SWIGSTDCALL __stdcall