|
@@ -1,5 +1,5 @@
|
|
|
<?xml version="1.0" encoding="utf-8"?>
|
|
|
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
|
|
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
|
|
<ItemGroup Label="ProjectConfigurations">
|
|
|
<ProjectConfiguration Include="Debug|Win32">
|
|
|
<Configuration>Debug</Configuration>
|
|
@@ -9,236 +9,125 @@
|
|
|
<Configuration>Release</Configuration>
|
|
|
<Platform>Win32</Platform>
|
|
|
</ProjectConfiguration>
|
|
|
- <ProjectConfiguration Include="Debug|x64">
|
|
|
- <Configuration>Debug</Configuration>
|
|
|
- <Platform>x64</Platform>
|
|
|
- </ProjectConfiguration>
|
|
|
- <ProjectConfiguration Include="Release|x64">
|
|
|
- <Configuration>Release</Configuration>
|
|
|
- <Platform>x64</Platform>
|
|
|
- </ProjectConfiguration>
|
|
|
</ItemGroup>
|
|
|
<PropertyGroup Label="Globals">
|
|
|
- <VCProjectVersion>15.0</VCProjectVersion>
|
|
|
- <ProjectGuid>{B3C0BF00-C99D-4CC1-BABE-842914F0D9D6}</ProjectGuid>
|
|
|
- <Keyword>MFCDLLProj</Keyword>
|
|
|
+ <ProjectGuid>{3DA33328-6F2A-4673-9A30-BB8791A88171}</ProjectGuid>
|
|
|
<RootNamespace>WxAdoInterface</RootNamespace>
|
|
|
+ <Keyword>Win32Proj</Keyword>
|
|
|
<WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
|
|
|
</PropertyGroup>
|
|
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
|
|
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
|
|
- <ConfigurationType>StaticLibrary</ConfigurationType>
|
|
|
- <UseDebugLibraries>true</UseDebugLibraries>
|
|
|
- <PlatformToolset>v141</PlatformToolset>
|
|
|
- <CharacterSet>MultiByte</CharacterSet>
|
|
|
- <UseOfMfc>Dynamic</UseOfMfc>
|
|
|
- </PropertyGroup>
|
|
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
|
|
|
<ConfigurationType>StaticLibrary</ConfigurationType>
|
|
|
- <UseDebugLibraries>false</UseDebugLibraries>
|
|
|
- <PlatformToolset>v141</PlatformToolset>
|
|
|
- <WholeProgramOptimization>true</WholeProgramOptimization>
|
|
|
- <CharacterSet>MultiByte</CharacterSet>
|
|
|
- <UseOfMfc>Dynamic</UseOfMfc>
|
|
|
- </PropertyGroup>
|
|
|
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
|
|
|
- <ConfigurationType>DynamicLibrary</ConfigurationType>
|
|
|
- <UseDebugLibraries>true</UseDebugLibraries>
|
|
|
<PlatformToolset>v141</PlatformToolset>
|
|
|
- <CharacterSet>Unicode</CharacterSet>
|
|
|
<UseOfMfc>Dynamic</UseOfMfc>
|
|
|
+ <CharacterSet>MultiByte</CharacterSet>
|
|
|
+ <WholeProgramOptimization>true</WholeProgramOptimization>
|
|
|
</PropertyGroup>
|
|
|
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
|
|
|
- <ConfigurationType>DynamicLibrary</ConfigurationType>
|
|
|
- <UseDebugLibraries>false</UseDebugLibraries>
|
|
|
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
|
|
+ <ConfigurationType>StaticLibrary</ConfigurationType>
|
|
|
<PlatformToolset>v141</PlatformToolset>
|
|
|
- <WholeProgramOptimization>true</WholeProgramOptimization>
|
|
|
- <CharacterSet>Unicode</CharacterSet>
|
|
|
<UseOfMfc>Dynamic</UseOfMfc>
|
|
|
+ <CharacterSet>MultiByte</CharacterSet>
|
|
|
</PropertyGroup>
|
|
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
|
|
<ImportGroup Label="ExtensionSettings">
|
|
|
</ImportGroup>
|
|
|
- <ImportGroup Label="Shared">
|
|
|
- </ImportGroup>
|
|
|
- <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
|
|
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
|
|
- </ImportGroup>
|
|
|
- <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
|
|
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
|
|
- </ImportGroup>
|
|
|
- <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
|
|
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
|
|
|
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
|
|
</ImportGroup>
|
|
|
- <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
|
|
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
|
|
|
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
|
|
</ImportGroup>
|
|
|
<PropertyGroup Label="UserMacros" />
|
|
|
+ <PropertyGroup>
|
|
|
+ <_ProjectFileVersion>16.0.28320.50</_ProjectFileVersion>
|
|
|
+ </PropertyGroup>
|
|
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
|
|
- <LinkIncremental>true</LinkIncremental>
|
|
|
<OutDir>..\..\..\..\bin\$(SolutionName)\</OutDir>
|
|
|
<IntDir>$(OutDir)$(ProjectName)\$(Configuration)\</IntDir>
|
|
|
</PropertyGroup>
|
|
|
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
|
|
- <LinkIncremental>true</LinkIncremental>
|
|
|
- </PropertyGroup>
|
|
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
|
|
- <LinkIncremental>false</LinkIncremental>
|
|
|
<OutDir>..\..\..\..\bin\$(SolutionName)\</OutDir>
|
|
|
<IntDir>$(OutDir)$(ProjectName)\$(Configuration)\</IntDir>
|
|
|
</PropertyGroup>
|
|
|
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
|
|
- <LinkIncremental>false</LinkIncremental>
|
|
|
- </PropertyGroup>
|
|
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
|
|
<ClCompile>
|
|
|
+ <Optimization>Disabled</Optimization>
|
|
|
+ <AdditionalIncludeDirectories>..\Include;..\pb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
|
|
+ <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
|
+ <MinimalRebuild>true</MinimalRebuild>
|
|
|
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
|
|
|
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
|
|
|
<PrecompiledHeader>Use</PrecompiledHeader>
|
|
|
<WarningLevel>Level3</WarningLevel>
|
|
|
- <Optimization>Disabled</Optimization>
|
|
|
- <SDLCheck>true</SDLCheck>
|
|
|
- <PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
|
- <AdditionalIncludeDirectories>..\Include;..\pb;</AdditionalIncludeDirectories>
|
|
|
- <InlineFunctionExpansion>Default</InlineFunctionExpansion>
|
|
|
+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
|
|
|
<DisableSpecificWarnings>4018;4065;4146;4244;4251;4267;4305;4307;4309;4334;4355;4506;4800;4996</DisableSpecificWarnings>
|
|
|
- <CompileAs>Default</CompileAs>
|
|
|
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
|
|
|
</ClCompile>
|
|
|
- <Link>
|
|
|
- <SubSystem>Windows</SubSystem>
|
|
|
- <ModuleDefinitionFile>.\WxAdoInterface.def</ModuleDefinitionFile>
|
|
|
- <AdditionalLibraryDirectories>..\lib;</AdditionalLibraryDirectories>
|
|
|
- <AdditionalDependencies>libprotobufd.lib;libprotobuf-lited.lib;libprotocd.lib;gmock_main.lib;gmock.lib;msvcprtd.lib;mfcs140d.lib</AdditionalDependencies>
|
|
|
- <IgnoreSpecificDefaultLibraries>mfcs140d.lib;msvcprtd.lib</IgnoreSpecificDefaultLibraries>
|
|
|
- </Link>
|
|
|
- <Midl>
|
|
|
- <MkTypLibCompatible>false</MkTypLibCompatible>
|
|
|
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
|
- </Midl>
|
|
|
- <ResourceCompile>
|
|
|
- <Culture>0x0804</Culture>
|
|
|
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
|
- <AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
|
|
- </ResourceCompile>
|
|
|
+ <Lib>
|
|
|
+ <AdditionalDependencies>libprotobufd.lib;libprotobuf-lited.lib;libprotocd.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
|
|
+ <AdditionalLibraryDirectories>..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
|
|
+ </Lib>
|
|
|
<PostBuildEvent>
|
|
|
<Command>xcopy $(TargetDir)$(ProjectName).lib $(SolutionDir)WxService\ /Y /A</Command>
|
|
|
</PostBuildEvent>
|
|
|
</ItemDefinitionGroup>
|
|
|
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
|
|
- <ClCompile>
|
|
|
- <PrecompiledHeader>Use</PrecompiledHeader>
|
|
|
- <WarningLevel>Level3</WarningLevel>
|
|
|
- <Optimization>Disabled</Optimization>
|
|
|
- <SDLCheck>true</SDLCheck>
|
|
|
- <PreprocessorDefinitions>_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
|
- </ClCompile>
|
|
|
- <Link>
|
|
|
- <SubSystem>Windows</SubSystem>
|
|
|
- <ModuleDefinitionFile>.\WxAdoInterface.def</ModuleDefinitionFile>
|
|
|
- </Link>
|
|
|
- <Midl>
|
|
|
- <MkTypLibCompatible>false</MkTypLibCompatible>
|
|
|
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
|
- </Midl>
|
|
|
- <ResourceCompile>
|
|
|
- <Culture>0x0804</Culture>
|
|
|
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
|
- <AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
|
|
- </ResourceCompile>
|
|
|
- </ItemDefinitionGroup>
|
|
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
|
|
<ClCompile>
|
|
|
- <PrecompiledHeader>Use</PrecompiledHeader>
|
|
|
- <WarningLevel>Level3</WarningLevel>
|
|
|
<Optimization>MaxSpeed</Optimization>
|
|
|
- <FunctionLevelLinking>true</FunctionLevelLinking>
|
|
|
<IntrinsicFunctions>true</IntrinsicFunctions>
|
|
|
- <SDLCheck>true</SDLCheck>
|
|
|
- <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;_USRDLL;_AFXEXT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
|
- <AdditionalIncludeDirectories>..\Include;..\pb;</AdditionalIncludeDirectories>
|
|
|
+ <AdditionalIncludeDirectories>..\Include;..\pb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
|
|
+ <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
|
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
|
|
|
+ <FunctionLevelLinking>true</FunctionLevelLinking>
|
|
|
+ <PrecompiledHeader>Use</PrecompiledHeader>
|
|
|
+ <WarningLevel>Level3</WarningLevel>
|
|
|
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
|
|
|
+ <DisableSpecificWarnings>4018;4065;4146;4244;4251;4267;4305;4307;4309;4334;4355;4506;4800;4996</DisableSpecificWarnings>
|
|
|
</ClCompile>
|
|
|
- <Link>
|
|
|
- <SubSystem>Windows</SubSystem>
|
|
|
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
|
|
|
- <OptimizeReferences>true</OptimizeReferences>
|
|
|
- <ModuleDefinitionFile>.\WxAdoInterface.def</ModuleDefinitionFile>
|
|
|
- <AdditionalLibraryDirectories>..\lib;</AdditionalLibraryDirectories>
|
|
|
- <AdditionalDependencies>msvcprt.lib;mfcs140.lib;libprotobuf.lib;libprotobuf-lite.lib;libprotoc.lib;</AdditionalDependencies>
|
|
|
- <IgnoreSpecificDefaultLibraries>mfcs140.lib;msvcprt.lib</IgnoreSpecificDefaultLibraries>
|
|
|
- </Link>
|
|
|
- <Midl>
|
|
|
- <MkTypLibCompatible>false</MkTypLibCompatible>
|
|
|
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
|
- </Midl>
|
|
|
- <ResourceCompile>
|
|
|
- <Culture>0x0804</Culture>
|
|
|
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
|
- <AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
|
|
- </ResourceCompile>
|
|
|
+ <Lib>
|
|
|
+ <AdditionalDependencies>libprotobuf.lib;libprotobuf-lite.lib;libprotoc.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
|
|
+ <AdditionalLibraryDirectories>..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
|
|
+ </Lib>
|
|
|
<PostBuildEvent>
|
|
|
<Command>xcopy $(TargetDir)$(ProjectName).lib $(SolutionDir)WxService\ /Y /A</Command>
|
|
|
</PostBuildEvent>
|
|
|
</ItemDefinitionGroup>
|
|
|
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
|
|
- <ClCompile>
|
|
|
- <PrecompiledHeader>Use</PrecompiledHeader>
|
|
|
- <WarningLevel>Level3</WarningLevel>
|
|
|
- <Optimization>MaxSpeed</Optimization>
|
|
|
- <FunctionLevelLinking>true</FunctionLevelLinking>
|
|
|
- <IntrinsicFunctions>true</IntrinsicFunctions>
|
|
|
- <SDLCheck>true</SDLCheck>
|
|
|
- <PreprocessorDefinitions>_WINDOWS;NDEBUG;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
|
- </ClCompile>
|
|
|
- <Link>
|
|
|
- <SubSystem>Windows</SubSystem>
|
|
|
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
|
|
|
- <OptimizeReferences>true</OptimizeReferences>
|
|
|
- <ModuleDefinitionFile>.\WxAdoInterface.def</ModuleDefinitionFile>
|
|
|
- </Link>
|
|
|
- <Midl>
|
|
|
- <MkTypLibCompatible>false</MkTypLibCompatible>
|
|
|
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
|
- </Midl>
|
|
|
- <ResourceCompile>
|
|
|
- <Culture>0x0804</Culture>
|
|
|
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
|
- <AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
|
|
- </ResourceCompile>
|
|
|
- </ItemDefinitionGroup>
|
|
|
<ItemGroup>
|
|
|
+ <ClCompile Include="..\pb\msg.pb.cc">
|
|
|
+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
|
|
+ </PrecompiledHeader>
|
|
|
+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
|
|
+ </PrecompiledHeader>
|
|
|
+ </ClCompile>
|
|
|
<ClCompile Include="..\pb\table.pb.cc">
|
|
|
- <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
|
|
|
- <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
|
|
|
+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
|
|
+ </PrecompiledHeader>
|
|
|
+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
|
|
+ </PrecompiledHeader>
|
|
|
</ClCompile>
|
|
|
- <ClCompile Include="WxAdoImpl.cpp" />
|
|
|
- <ClCompile Include="WxAdoPool.cpp" />
|
|
|
<ClCompile Include="Global.cpp" />
|
|
|
<ClCompile Include="stdafx.cpp">
|
|
|
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
|
|
|
- <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
|
|
|
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
|
|
|
- <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
|
|
|
</ClCompile>
|
|
|
- <ClCompile Include="WxAdoInterface.cpp" />
|
|
|
- </ItemGroup>
|
|
|
- <ItemGroup>
|
|
|
- <None Include="res\WxAdoInterface.rc2" />
|
|
|
- <None Include="WxAdoInterface.def" />
|
|
|
+ <ClCompile Include="WxAdoImpl.cpp" />
|
|
|
+ <ClCompile Include="WxAdoPool.cpp" />
|
|
|
</ItemGroup>
|
|
|
<ItemGroup>
|
|
|
+ <ClInclude Include="..\pb\msg.pb.h" />
|
|
|
<ClInclude Include="..\pb\table.pb.h" />
|
|
|
<ClInclude Include="CritSection.h" />
|
|
|
- <ClInclude Include="WxAdoImpl.h" />
|
|
|
- <ClInclude Include="WxAdoPool.h" />
|
|
|
<ClInclude Include="Global.h" />
|
|
|
<ClInclude Include="IWxAdoInterface.h" />
|
|
|
- <ClInclude Include="Resource.h" />
|
|
|
<ClInclude Include="SafeList.h" />
|
|
|
<ClInclude Include="stdafx.h" />
|
|
|
<ClInclude Include="targetver.h" />
|
|
|
- <ClInclude Include="WxAdoInterface.h" />
|
|
|
+ <ClInclude Include="WxAdoImpl.h" />
|
|
|
+ <ClInclude Include="WxAdoPool.h" />
|
|
|
</ItemGroup>
|
|
|
<ItemGroup>
|
|
|
- <ResourceCompile Include="WxAdoInterface.rc" />
|
|
|
+ <Text Include="ReadMe.txt" />
|
|
|
</ItemGroup>
|
|
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
|
|
<ImportGroup Label="ExtensionTargets">
|