@@ -49,14 +49,14 @@ Global | |||
{CCD2D328-1912-4FC4-91B5-2333A7EF6EB7}.Release_Unicode|Win32.ActiveCfg = Release_Unicode|Win32 | |||
{CCD2D328-1912-4FC4-91B5-2333A7EF6EB7}.Release_Unicode|Win32.Build.0 = Release_Unicode|Win32 | |||
{CCD2D328-1912-4FC4-91B5-2333A7EF6EB7}.Release_Unicode|x64.ActiveCfg = Release_Unicode|Win32 | |||
{51FD2060-F4F9-4982-8474-473541D4FCF8}.Debug_Unicode|Win32.ActiveCfg = Release_Unicode|Win32 | |||
{51FD2060-F4F9-4982-8474-473541D4FCF8}.Debug_Unicode|Win32.Build.0 = Release_Unicode|Win32 | |||
{51FD2060-F4F9-4982-8474-473541D4FCF8}.Debug_Unicode|Win32.ActiveCfg = Debug_Unicode|Win32 | |||
{51FD2060-F4F9-4982-8474-473541D4FCF8}.Debug_Unicode|Win32.Build.0 = Debug_Unicode|Win32 | |||
{51FD2060-F4F9-4982-8474-473541D4FCF8}.Debug_Unicode|x64.ActiveCfg = Debug_Unicode|Win32 | |||
{51FD2060-F4F9-4982-8474-473541D4FCF8}.Release_Unicode|Win32.ActiveCfg = Release_Unicode|Win32 | |||
{51FD2060-F4F9-4982-8474-473541D4FCF8}.Release_Unicode|Win32.Build.0 = Release_Unicode|Win32 | |||
{51FD2060-F4F9-4982-8474-473541D4FCF8}.Release_Unicode|x64.ActiveCfg = Release_Unicode|Win32 | |||
{C38EABE4-E7E3-437A-8ECF-97A8626227D0}.Debug_Unicode|Win32.ActiveCfg = Release_Unicode|Win32 | |||
{C38EABE4-E7E3-437A-8ECF-97A8626227D0}.Debug_Unicode|Win32.Build.0 = Release_Unicode|Win32 | |||
{C38EABE4-E7E3-437A-8ECF-97A8626227D0}.Debug_Unicode|Win32.ActiveCfg = Debug_Unicode|Win32 | |||
{C38EABE4-E7E3-437A-8ECF-97A8626227D0}.Debug_Unicode|Win32.Build.0 = Debug_Unicode|Win32 | |||
{C38EABE4-E7E3-437A-8ECF-97A8626227D0}.Debug_Unicode|x64.ActiveCfg = Debug_Unicode|Win32 | |||
{C38EABE4-E7E3-437A-8ECF-97A8626227D0}.Release_Unicode|Win32.ActiveCfg = Release_Unicode|Win32 | |||
{C38EABE4-E7E3-437A-8ECF-97A8626227D0}.Release_Unicode|Win32.Build.0 = Release_Unicode|Win32 | |||
@@ -64,7 +64,7 @@ | |||
<Link> | |||
<SubSystem>Windows</SubSystem> | |||
<GenerateDebugInformation>true</GenerateDebugInformation> | |||
<AdditionalLibraryDirectories>../../../\Source\Libs\Release_Unicode</AdditionalLibraryDirectories> | |||
<AdditionalLibraryDirectories>$(SolutionDir)Source\Libs\$(Configuration)</AdditionalLibraryDirectories> | |||
</Link> | |||
<Midl> | |||
<MkTypLibCompatible>false</MkTypLibCompatible> | |||
@@ -5,18 +5,10 @@ | |||
<Configuration>Debug_Unicode</Configuration> | |||
<Platform>Win32</Platform> | |||
</ProjectConfiguration> | |||
<ProjectConfiguration Include="Debug|Win32"> | |||
<Configuration>Debug</Configuration> | |||
<Platform>Win32</Platform> | |||
</ProjectConfiguration> | |||
<ProjectConfiguration Include="Release_Unicode|Win32"> | |||
<Configuration>Release_Unicode</Configuration> | |||
<Platform>Win32</Platform> | |||
</ProjectConfiguration> | |||
<ProjectConfiguration Include="Release|Win32"> | |||
<Configuration>Release</Configuration> | |||
<Platform>Win32</Platform> | |||
</ProjectConfiguration> | |||
</ItemGroup> | |||
<PropertyGroup Label="Globals"> | |||
<ProjectGuid>{DA531A23-506A-4643-BA47-B77542C5F41C}</ProjectGuid> | |||
@@ -25,13 +17,6 @@ | |||
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion> | |||
</PropertyGroup> | |||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> | |||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> | |||
<ConfigurationType>DynamicLibrary</ConfigurationType> | |||
<UseDebugLibraries>true</UseDebugLibraries> | |||
<PlatformToolset>v142</PlatformToolset> | |||
<CharacterSet>MultiByte</CharacterSet> | |||
<UseOfMfc>Dynamic</UseOfMfc> | |||
</PropertyGroup> | |||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Unicode|Win32'" Label="Configuration"> | |||
<ConfigurationType>DynamicLibrary</ConfigurationType> | |||
<UseDebugLibraries>true</UseDebugLibraries> | |||
@@ -39,14 +24,6 @@ | |||
<CharacterSet>Unicode</CharacterSet> | |||
<UseOfMfc>Dynamic</UseOfMfc> | |||
</PropertyGroup> | |||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> | |||
<ConfigurationType>DynamicLibrary</ConfigurationType> | |||
<UseDebugLibraries>false</UseDebugLibraries> | |||
<PlatformToolset>v142</PlatformToolset> | |||
<WholeProgramOptimization>true</WholeProgramOptimization> | |||
<CharacterSet>MultiByte</CharacterSet> | |||
<UseOfMfc>Dynamic</UseOfMfc> | |||
</PropertyGroup> | |||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_Unicode|Win32'" Label="Configuration"> | |||
<ConfigurationType>DynamicLibrary</ConfigurationType> | |||
<UseDebugLibraries>false</UseDebugLibraries> | |||
@@ -58,57 +35,22 @@ | |||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> | |||
<ImportGroup Label="ExtensionSettings"> | |||
</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 Condition="'$(Configuration)|$(Platform)'=='Debug_Unicode|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|Win32'"> | |||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | |||
</ImportGroup> | |||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_Unicode|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 Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> | |||
<LinkIncremental>true</LinkIncremental> | |||
</PropertyGroup> | |||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Unicode|Win32'"> | |||
<LinkIncremental>true</LinkIncremental> | |||
<OutDir>$(SolutionDir)Bin\$(Configuration)\</OutDir> | |||
<TargetName>$(ProjectName)D</TargetName> | |||
</PropertyGroup> | |||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> | |||
<LinkIncremental>false</LinkIncremental> | |||
</PropertyGroup> | |||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_Unicode|Win32'"> | |||
<LinkIncremental>false</LinkIncremental> | |||
<OutDir>$(SolutionDir)Bin\$(Configuration)\</OutDir> | |||
</PropertyGroup> | |||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> | |||
<ClCompile> | |||
<PrecompiledHeader>Use</PrecompiledHeader> | |||
<WarningLevel>Level3</WarningLevel> | |||
<Optimization>Disabled</Optimization> | |||
<PreprocessorDefinitions>_USING_V110_SDK71_;WIN32;_WINDOWS;_DEBUG;_AFXEXT;KERNEL_ENGINE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |||
<SDLCheck>true</SDLCheck> | |||
</ClCompile> | |||
<Link> | |||
<SubSystem>Windows</SubSystem> | |||
<GenerateDebugInformation>true</GenerateDebugInformation> | |||
<ModuleDefinitionFile>.\KernelEngine.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)'=='Debug_Unicode|Win32'"> | |||
<ClCompile> | |||
<PrecompiledHeader>Use</PrecompiledHeader> | |||
@@ -141,33 +83,6 @@ | |||
</Command> | |||
</PostBuildEvent> | |||
</ItemDefinitionGroup> | |||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> | |||
<ClCompile> | |||
<WarningLevel>Level3</WarningLevel> | |||
<PrecompiledHeader>Use</PrecompiledHeader> | |||
<Optimization>MaxSpeed</Optimization> | |||
<FunctionLevelLinking>true</FunctionLevelLinking> | |||
<IntrinsicFunctions>true</IntrinsicFunctions> | |||
<PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;_AFXEXT;KERNEL_ENGINE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |||
<SDLCheck>true</SDLCheck> | |||
</ClCompile> | |||
<Link> | |||
<SubSystem>Windows</SubSystem> | |||
<GenerateDebugInformation>true</GenerateDebugInformation> | |||
<EnableCOMDATFolding>true</EnableCOMDATFolding> | |||
<OptimizeReferences>true</OptimizeReferences> | |||
<ModuleDefinitionFile>.\KernelEngine.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> | |||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_Unicode|Win32'"> | |||
<ClCompile> | |||
<WarningLevel>Level3</WarningLevel> | |||
@@ -224,9 +139,7 @@ copy /y $(OutDir)$(TargetFileName) ..\..\..\Publish\Server\$(Configuration)\$(Ta | |||
<ClCompile Include="MyEncrypt.cpp" /> | |||
<ClCompile Include="QueueService.cpp" /> | |||
<ClCompile Include="stdafx.cpp"> | |||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader> | |||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug_Unicode|Win32'">Create</PrecompiledHeader> | |||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader> | |||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release_Unicode|Win32'">Create</PrecompiledHeader> | |||
</ClCompile> | |||
<ClCompile Include="TCPNetworkEngine.cpp" /> | |||
@@ -5,18 +5,10 @@ | |||
<Configuration>Debug_Unicode</Configuration> | |||
<Platform>Win32</Platform> | |||
</ProjectConfiguration> | |||
<ProjectConfiguration Include="Debug|Win32"> | |||
<Configuration>Debug</Configuration> | |||
<Platform>Win32</Platform> | |||
</ProjectConfiguration> | |||
<ProjectConfiguration Include="Release_Unicode|Win32"> | |||
<Configuration>Release_Unicode</Configuration> | |||
<Platform>Win32</Platform> | |||
</ProjectConfiguration> | |||
<ProjectConfiguration Include="Release|Win32"> | |||
<Configuration>Release</Configuration> | |||
<Platform>Win32</Platform> | |||
</ProjectConfiguration> | |||
</ItemGroup> | |||
<PropertyGroup Label="Globals"> | |||
<ProjectGuid>{74DE8924-75DC-4444-AB26-B687F71BD778}</ProjectGuid> | |||
@@ -25,13 +17,6 @@ | |||
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion> | |||
</PropertyGroup> | |||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> | |||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> | |||
<ConfigurationType>Application</ConfigurationType> | |||
<UseDebugLibraries>true</UseDebugLibraries> | |||
<PlatformToolset>v142</PlatformToolset> | |||
<CharacterSet>MultiByte</CharacterSet> | |||
<UseOfMfc>Dynamic</UseOfMfc> | |||
</PropertyGroup> | |||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Unicode|Win32'" Label="Configuration"> | |||
<ConfigurationType>Application</ConfigurationType> | |||
<UseDebugLibraries>true</UseDebugLibraries> | |||
@@ -39,14 +24,6 @@ | |||
<CharacterSet>Unicode</CharacterSet> | |||
<UseOfMfc>Dynamic</UseOfMfc> | |||
</PropertyGroup> | |||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> | |||
<ConfigurationType>Application</ConfigurationType> | |||
<UseDebugLibraries>false</UseDebugLibraries> | |||
<PlatformToolset>v142</PlatformToolset> | |||
<WholeProgramOptimization>true</WholeProgramOptimization> | |||
<CharacterSet>MultiByte</CharacterSet> | |||
<UseOfMfc>Dynamic</UseOfMfc> | |||
</PropertyGroup> | |||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_Unicode|Win32'" Label="Configuration"> | |||
<ConfigurationType>Application</ConfigurationType> | |||
<UseDebugLibraries>false</UseDebugLibraries> | |||
@@ -58,58 +35,23 @@ | |||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> | |||
<ImportGroup Label="ExtensionSettings"> | |||
</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 Condition="'$(Configuration)|$(Platform)'=='Debug_Unicode|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|Win32'"> | |||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | |||
</ImportGroup> | |||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_Unicode|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 Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> | |||
<LinkIncremental>true</LinkIncremental> | |||
</PropertyGroup> | |||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Unicode|Win32'"> | |||
<LinkIncremental>true</LinkIncremental> | |||
<OutDir>$(SolutionDir)Bin\$(Configuration)\</OutDir> | |||
<IncludePath>../../../\Source\SharedControl\create_dump;../../../\Source\ServerControl\curl-7.32.0\include;$(IncludePath)</IncludePath> | |||
</PropertyGroup> | |||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> | |||
<LinkIncremental>false</LinkIncremental> | |||
</PropertyGroup> | |||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_Unicode|Win32'"> | |||
<LinkIncremental>false</LinkIncremental> | |||
<OutDir>$(SolutionDir)Bin\$(Configuration)\</OutDir> | |||
<IncludePath>../../../\Source\SharedControl\create_dump;$(IncludePath);../../../\Source\ServerControl\curl-7.32.0\include;</IncludePath> | |||
</PropertyGroup> | |||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> | |||
<ClCompile> | |||
<PrecompiledHeader>Use</PrecompiledHeader> | |||
<WarningLevel>Level3</WarningLevel> | |||
<Optimization>Disabled</Optimization> | |||
<PreprocessorDefinitions>_USING_V110_SDK71_;WIN32;_WINDOWS;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |||
<SDLCheck>true</SDLCheck> | |||
</ClCompile> | |||
<Link> | |||
<SubSystem>Windows</SubSystem> | |||
<GenerateDebugInformation>true</GenerateDebugInformation> | |||
</Link> | |||
<Midl> | |||
<MkTypLibCompatible>false</MkTypLibCompatible> | |||
<ValidateAllParameters>true</ValidateAllParameters> | |||
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |||
</Midl> | |||
<ResourceCompile> | |||
<Culture>0x0804</Culture> | |||
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |||
<AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | |||
</ResourceCompile> | |||
</ItemDefinitionGroup> | |||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Unicode|Win32'"> | |||
<ClCompile> | |||
<PrecompiledHeader>NotUsing</PrecompiledHeader> | |||
@@ -141,33 +83,6 @@ | |||
</Command> | |||
</PostBuildEvent> | |||
</ItemDefinitionGroup> | |||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> | |||
<ClCompile> | |||
<WarningLevel>Level3</WarningLevel> | |||
<PrecompiledHeader>Use</PrecompiledHeader> | |||
<Optimization>MaxSpeed</Optimization> | |||
<FunctionLevelLinking>true</FunctionLevelLinking> | |||
<IntrinsicFunctions>true</IntrinsicFunctions> | |||
<PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |||
<SDLCheck>true</SDLCheck> | |||
</ClCompile> | |||
<Link> | |||
<SubSystem>Windows</SubSystem> | |||
<GenerateDebugInformation>true</GenerateDebugInformation> | |||
<EnableCOMDATFolding>true</EnableCOMDATFolding> | |||
<OptimizeReferences>true</OptimizeReferences> | |||
</Link> | |||
<Midl> | |||
<MkTypLibCompatible>false</MkTypLibCompatible> | |||
<ValidateAllParameters>true</ValidateAllParameters> | |||
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |||
</Midl> | |||
<ResourceCompile> | |||
<Culture>0x0804</Culture> | |||
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |||
<AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | |||
</ResourceCompile> | |||
</ItemDefinitionGroup> | |||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_Unicode|Win32'"> | |||
<ClCompile> | |||
<WarningLevel>Level3</WarningLevel> | |||
@@ -246,9 +161,7 @@ copy /y $(OutDir)$(TargetFileName) ..\..\..\Publish\Server\$(Configuration)\$(Ta | |||
<ClCompile Include="ServiceUnits.cpp" /> | |||
<ClCompile Include="ShowTime.cpp" /> | |||
<ClCompile Include="stdafx.cpp"> | |||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader> | |||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug_Unicode|Win32'">Create</PrecompiledHeader> | |||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader> | |||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release_Unicode|Win32'">Create</PrecompiledHeader> | |||
</ClCompile> | |||
<ClCompile Include="ZBase64.cpp" /> | |||
@@ -5,18 +5,10 @@ | |||
<Configuration>Debug_Unicode</Configuration> | |||
<Platform>Win32</Platform> | |||
</ProjectConfiguration> | |||
<ProjectConfiguration Include="Debug|Win32"> | |||
<Configuration>Debug</Configuration> | |||
<Platform>Win32</Platform> | |||
</ProjectConfiguration> | |||
<ProjectConfiguration Include="Release_Unicode|Win32"> | |||
<Configuration>Release_Unicode</Configuration> | |||
<Platform>Win32</Platform> | |||
</ProjectConfiguration> | |||
<ProjectConfiguration Include="Release|Win32"> | |||
<Configuration>Release</Configuration> | |||
<Platform>Win32</Platform> | |||
</ProjectConfiguration> | |||
</ItemGroup> | |||
<PropertyGroup Label="Globals"> | |||
<ProjectGuid>{C323A106-B50D-48CB-A353-CFBE5308F2A5}</ProjectGuid> | |||
@@ -25,13 +17,6 @@ | |||
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion> | |||
</PropertyGroup> | |||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> | |||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> | |||
<ConfigurationType>DynamicLibrary</ConfigurationType> | |||
<UseDebugLibraries>true</UseDebugLibraries> | |||
<PlatformToolset>v142</PlatformToolset> | |||
<CharacterSet>Unicode</CharacterSet> | |||
<UseOfMfc>Dynamic</UseOfMfc> | |||
</PropertyGroup> | |||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Unicode|Win32'" Label="Configuration"> | |||
<ConfigurationType>DynamicLibrary</ConfigurationType> | |||
<UseDebugLibraries>true</UseDebugLibraries> | |||
@@ -39,14 +24,6 @@ | |||
<CharacterSet>Unicode</CharacterSet> | |||
<UseOfMfc>Dynamic</UseOfMfc> | |||
</PropertyGroup> | |||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> | |||
<ConfigurationType>DynamicLibrary</ConfigurationType> | |||
<UseDebugLibraries>false</UseDebugLibraries> | |||
<PlatformToolset>v142</PlatformToolset> | |||
<WholeProgramOptimization>true</WholeProgramOptimization> | |||
<CharacterSet>Unicode</CharacterSet> | |||
<UseOfMfc>Dynamic</UseOfMfc> | |||
</PropertyGroup> | |||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_Unicode|Win32'" Label="Configuration"> | |||
<ConfigurationType>DynamicLibrary</ConfigurationType> | |||
<UseDebugLibraries>false</UseDebugLibraries> | |||
@@ -58,57 +35,22 @@ | |||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> | |||
<ImportGroup Label="ExtensionSettings"> | |||
</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 Condition="'$(Configuration)|$(Platform)'=='Debug_Unicode|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|Win32'"> | |||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | |||
</ImportGroup> | |||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_Unicode|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 Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> | |||
<LinkIncremental>true</LinkIncremental> | |||
</PropertyGroup> | |||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Unicode|Win32'"> | |||
<LinkIncremental>true</LinkIncremental> | |||
<OutDir>$(SolutionDir)Bin\$(Configuration)\</OutDir> | |||
<TargetName>$(ProjectName)D</TargetName> | |||
</PropertyGroup> | |||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> | |||
<LinkIncremental>false</LinkIncremental> | |||
</PropertyGroup> | |||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_Unicode|Win32'"> | |||
<LinkIncremental>false</LinkIncremental> | |||
<OutDir>$(SolutionDir)Bin\$(Configuration)\</OutDir> | |||
</PropertyGroup> | |||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> | |||
<ClCompile> | |||
<PrecompiledHeader>Use</PrecompiledHeader> | |||
<WarningLevel>Level3</WarningLevel> | |||
<Optimization>Disabled</Optimization> | |||
<PreprocessorDefinitions>_USING_V110_SDK71_;WIN32;_WINDOWS;_DEBUG;_AFXEXT;MODULE_MANAGER_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |||
<SDLCheck>true</SDLCheck> | |||
</ClCompile> | |||
<Link> | |||
<SubSystem>Windows</SubSystem> | |||
<GenerateDebugInformation>true</GenerateDebugInformation> | |||
<ModuleDefinitionFile>.\ModuleManager.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)'=='Debug_Unicode|Win32'"> | |||
<ClCompile> | |||
<PrecompiledHeader>Use</PrecompiledHeader> | |||
@@ -139,33 +81,6 @@ | |||
</Command> | |||
</PostBuildEvent> | |||
</ItemDefinitionGroup> | |||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> | |||
<ClCompile> | |||
<WarningLevel>Level3</WarningLevel> | |||
<PrecompiledHeader>Use</PrecompiledHeader> | |||
<Optimization>MaxSpeed</Optimization> | |||
<FunctionLevelLinking>true</FunctionLevelLinking> | |||
<IntrinsicFunctions>true</IntrinsicFunctions> | |||
<PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;_AFXEXT;MODULE_MANAGER_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |||
<SDLCheck>true</SDLCheck> | |||
</ClCompile> | |||
<Link> | |||
<SubSystem>Windows</SubSystem> | |||
<GenerateDebugInformation>true</GenerateDebugInformation> | |||
<EnableCOMDATFolding>true</EnableCOMDATFolding> | |||
<OptimizeReferences>true</OptimizeReferences> | |||
<ModuleDefinitionFile>.\ModuleManager.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> | |||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_Unicode|Win32'"> | |||
<ClCompile> | |||
<WarningLevel>Level3</WarningLevel> | |||
@@ -221,9 +136,7 @@ copy /y $(OutDir)$(TargetFileName) ..\..\..\Publish\Server\$(Configuration)\$(Ta | |||
<ClCompile Include="ServerInfoManager.cpp" /> | |||
<ClCompile Include="ServerListControl.cpp" /> | |||
<ClCompile Include="stdafx.cpp"> | |||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader> | |||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug_Unicode|Win32'">Create</PrecompiledHeader> | |||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader> | |||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release_Unicode|Win32'">Create</PrecompiledHeader> | |||
</ClCompile> | |||
</ItemGroup> | |||
@@ -5,18 +5,10 @@ | |||
<Configuration>Debug_Unicode</Configuration> | |||
<Platform>Win32</Platform> | |||
</ProjectConfiguration> | |||
<ProjectConfiguration Include="Debug|Win32"> | |||
<Configuration>Debug</Configuration> | |||
<Platform>Win32</Platform> | |||
</ProjectConfiguration> | |||
<ProjectConfiguration Include="Release_Unicode|Win32"> | |||
<Configuration>Release_Unicode</Configuration> | |||
<Platform>Win32</Platform> | |||
</ProjectConfiguration> | |||
<ProjectConfiguration Include="Release|Win32"> | |||
<Configuration>Release</Configuration> | |||
<Platform>Win32</Platform> | |||
</ProjectConfiguration> | |||
</ItemGroup> | |||
<PropertyGroup Label="Globals"> | |||
<ProjectGuid>{B4766ADF-5AA6-4ADF-9354-4F889FFF028E}</ProjectGuid> | |||
@@ -24,13 +16,6 @@ | |||
<Keyword>MFCDLLProj</Keyword> | |||
</PropertyGroup> | |||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> | |||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> | |||
<ConfigurationType>DynamicLibrary</ConfigurationType> | |||
<UseDebugLibraries>true</UseDebugLibraries> | |||
<PlatformToolset>v120</PlatformToolset> | |||
<CharacterSet>MultiByte</CharacterSet> | |||
<UseOfMfc>Dynamic</UseOfMfc> | |||
</PropertyGroup> | |||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Unicode|Win32'" Label="Configuration"> | |||
<ConfigurationType>DynamicLibrary</ConfigurationType> | |||
<UseDebugLibraries>true</UseDebugLibraries> | |||
@@ -38,14 +23,6 @@ | |||
<CharacterSet>Unicode</CharacterSet> | |||
<UseOfMfc>Dynamic</UseOfMfc> | |||
</PropertyGroup> | |||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> | |||
<ConfigurationType>DynamicLibrary</ConfigurationType> | |||
<UseDebugLibraries>false</UseDebugLibraries> | |||
<PlatformToolset>v120</PlatformToolset> | |||
<WholeProgramOptimization>true</WholeProgramOptimization> | |||
<CharacterSet>MultiByte</CharacterSet> | |||
<UseOfMfc>Dynamic</UseOfMfc> | |||
</PropertyGroup> | |||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_Unicode|Win32'" Label="Configuration"> | |||
<ConfigurationType>DynamicLibrary</ConfigurationType> | |||
<UseDebugLibraries>false</UseDebugLibraries> | |||
@@ -57,57 +34,22 @@ | |||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> | |||
<ImportGroup Label="ExtensionSettings"> | |||
</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 Condition="'$(Configuration)|$(Platform)'=='Debug_Unicode|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|Win32'"> | |||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | |||
</ImportGroup> | |||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_Unicode|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 Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> | |||
<LinkIncremental>true</LinkIncremental> | |||
</PropertyGroup> | |||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Unicode|Win32'"> | |||
<LinkIncremental>true</LinkIncremental> | |||
<OutDir>$(SolutionDir)Bin\$(Configuration)\</OutDir> | |||
<TargetName>$(ProjectName)D</TargetName> | |||
</PropertyGroup> | |||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> | |||
<LinkIncremental>false</LinkIncremental> | |||
</PropertyGroup> | |||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_Unicode|Win32'"> | |||
<LinkIncremental>false</LinkIncremental> | |||
<OutDir>$(SolutionDir)Bin\$(Configuration)\</OutDir> | |||
</PropertyGroup> | |||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> | |||
<ClCompile> | |||
<PrecompiledHeader>Use</PrecompiledHeader> | |||
<WarningLevel>Level3</WarningLevel> | |||
<Optimization>Disabled</Optimization> | |||
<PreprocessorDefinitions>_USING_V110_SDK71_;WIN32;_WINDOWS;_DEBUG;_AFXEXT;PROCESS_CONTROL_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |||
<SDLCheck>true</SDLCheck> | |||
</ClCompile> | |||
<Link> | |||
<SubSystem>Windows</SubSystem> | |||
<GenerateDebugInformation>true</GenerateDebugInformation> | |||
<ModuleDefinitionFile>.\ProcessControl.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)'=='Debug_Unicode|Win32'"> | |||
<ClCompile> | |||
<PrecompiledHeader>Use</PrecompiledHeader> | |||
@@ -136,33 +78,6 @@ | |||
</Command> | |||
</PostBuildEvent> | |||
</ItemDefinitionGroup> | |||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> | |||
<ClCompile> | |||
<WarningLevel>Level3</WarningLevel> | |||
<PrecompiledHeader>Use</PrecompiledHeader> | |||
<Optimization>MaxSpeed</Optimization> | |||
<FunctionLevelLinking>true</FunctionLevelLinking> | |||
<IntrinsicFunctions>true</IntrinsicFunctions> | |||
<PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;_AFXEXT;PROCESS_CONTROL_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |||
<SDLCheck>true</SDLCheck> | |||
</ClCompile> | |||
<Link> | |||
<SubSystem>Windows</SubSystem> | |||
<GenerateDebugInformation>true</GenerateDebugInformation> | |||
<EnableCOMDATFolding>true</EnableCOMDATFolding> | |||
<OptimizeReferences>true</OptimizeReferences> | |||
<ModuleDefinitionFile>.\ProcessControl.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> | |||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_Unicode|Win32'"> | |||
<ClCompile> | |||
<WarningLevel>Level3</WarningLevel> | |||
@@ -211,9 +126,7 @@ copy /y $(OutDir)$(TargetFileName) ..\..\..\Publish\Client\$(Configuration)\$(Ta | |||
<ClCompile Include="ProcessControlDLL.cpp" /> | |||
<ClCompile Include="ProcessDataControl.cpp" /> | |||
<ClCompile Include="stdafx.cpp"> | |||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader> | |||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug_Unicode|Win32'">Create</PrecompiledHeader> | |||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader> | |||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release_Unicode|Win32'">Create</PrecompiledHeader> | |||
</ClCompile> | |||
</ItemGroup> | |||
@@ -5,18 +5,10 @@ | |||
<Configuration>Debug_Unicode</Configuration> | |||
<Platform>Win32</Platform> | |||
</ProjectConfiguration> | |||
<ProjectConfiguration Include="Debug|Win32"> | |||
<Configuration>Debug</Configuration> | |||
<Platform>Win32</Platform> | |||
</ProjectConfiguration> | |||
<ProjectConfiguration Include="Release_Unicode|Win32"> | |||
<Configuration>Release_Unicode</Configuration> | |||
<Platform>Win32</Platform> | |||
</ProjectConfiguration> | |||
<ProjectConfiguration Include="Release|Win32"> | |||
<Configuration>Release</Configuration> | |||
<Platform>Win32</Platform> | |||
</ProjectConfiguration> | |||
</ItemGroup> | |||
<PropertyGroup Label="Globals"> | |||
<ProjectGuid>{60710DEB-8538-4CB6-8ABA-3A143E451C21}</ProjectGuid> | |||
@@ -25,13 +17,6 @@ | |||
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion> | |||
</PropertyGroup> | |||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> | |||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> | |||
<ConfigurationType>DynamicLibrary</ConfigurationType> | |||
<UseDebugLibraries>true</UseDebugLibraries> | |||
<PlatformToolset>v142</PlatformToolset> | |||
<CharacterSet>MultiByte</CharacterSet> | |||
<UseOfMfc>Dynamic</UseOfMfc> | |||
</PropertyGroup> | |||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Unicode|Win32'" Label="Configuration"> | |||
<ConfigurationType>DynamicLibrary</ConfigurationType> | |||
<UseDebugLibraries>true</UseDebugLibraries> | |||
@@ -39,14 +24,6 @@ | |||
<CharacterSet>Unicode</CharacterSet> | |||
<UseOfMfc>Dynamic</UseOfMfc> | |||
</PropertyGroup> | |||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> | |||
<ConfigurationType>DynamicLibrary</ConfigurationType> | |||
<UseDebugLibraries>false</UseDebugLibraries> | |||
<PlatformToolset>v142</PlatformToolset> | |||
<WholeProgramOptimization>true</WholeProgramOptimization> | |||
<CharacterSet>MultiByte</CharacterSet> | |||
<UseOfMfc>Dynamic</UseOfMfc> | |||
</PropertyGroup> | |||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_Unicode|Win32'" Label="Configuration"> | |||
<ConfigurationType>DynamicLibrary</ConfigurationType> | |||
<UseDebugLibraries>false</UseDebugLibraries> | |||
@@ -58,57 +35,22 @@ | |||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> | |||
<ImportGroup Label="ExtensionSettings"> | |||
</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 Condition="'$(Configuration)|$(Platform)'=='Debug_Unicode|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|Win32'"> | |||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | |||
</ImportGroup> | |||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_Unicode|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 Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> | |||
<LinkIncremental>true</LinkIncremental> | |||
</PropertyGroup> | |||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Unicode|Win32'"> | |||
<LinkIncremental>true</LinkIncremental> | |||
<OutDir>$(SolutionDir)Bin\$(Configuration)\</OutDir> | |||
<TargetName>$(ProjectName)D</TargetName> | |||
</PropertyGroup> | |||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> | |||
<LinkIncremental>false</LinkIncremental> | |||
</PropertyGroup> | |||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_Unicode|Win32'"> | |||
<LinkIncremental>false</LinkIncremental> | |||
<OutDir>$(SolutionDir)Bin\$(Configuration)\</OutDir> | |||
</PropertyGroup> | |||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> | |||
<ClCompile> | |||
<PrecompiledHeader>Use</PrecompiledHeader> | |||
<WarningLevel>Level3</WarningLevel> | |||
<Optimization>Disabled</Optimization> | |||
<PreprocessorDefinitions>_USING_V110_SDK71_;WIN32;_WINDOWS;_DEBUG;_AFXEXT;SERVICE_CORE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |||
<SDLCheck>true</SDLCheck> | |||
</ClCompile> | |||
<Link> | |||
<SubSystem>Windows</SubSystem> | |||
<GenerateDebugInformation>true</GenerateDebugInformation> | |||
<ModuleDefinitionFile>.\ServiceCore.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)'=='Debug_Unicode|Win32'"> | |||
<ClCompile> | |||
<PrecompiledHeader>Use</PrecompiledHeader> | |||
@@ -138,33 +80,6 @@ | |||
</Command> | |||
</PostBuildEvent> | |||
</ItemDefinitionGroup> | |||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> | |||
<ClCompile> | |||
<WarningLevel>Level3</WarningLevel> | |||
<PrecompiledHeader>Use</PrecompiledHeader> | |||
<Optimization>MaxSpeed</Optimization> | |||
<FunctionLevelLinking>true</FunctionLevelLinking> | |||
<IntrinsicFunctions>true</IntrinsicFunctions> | |||
<PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;_AFXEXT;SERVICE_CORE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |||
<SDLCheck>true</SDLCheck> | |||
</ClCompile> | |||
<Link> | |||
<SubSystem>Windows</SubSystem> | |||
<GenerateDebugInformation>true</GenerateDebugInformation> | |||
<EnableCOMDATFolding>true</EnableCOMDATFolding> | |||
<OptimizeReferences>true</OptimizeReferences> | |||
<ModuleDefinitionFile>.\ServiceCore.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> | |||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_Unicode|Win32'"> | |||
<ClCompile> | |||
<WarningLevel>Level3</WarningLevel> | |||
@@ -212,9 +127,7 @@ copy /y $(OutDir)$(TargetFileName) ..\..\..\Publish\Client\$(Configuration)\$(Ta | |||
<ItemGroup> | |||
<ClCompile Include="ServiceCore.cpp" /> | |||
<ClCompile Include="stdafx.cpp"> | |||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader> | |||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug_Unicode|Win32'">Create</PrecompiledHeader> | |||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader> | |||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release_Unicode|Win32'">Create</PrecompiledHeader> | |||
</ClCompile> | |||
<ClCompile Include="WHCommandLine.cpp" /> | |||
@@ -88,7 +88,8 @@ | |||
<SubSystem>Windows</SubSystem> | |||
<ImportLibrary>$(OutDir)GameServer.lib</ImportLibrary> | |||
<TargetMachine>MachineX86</TargetMachine> | |||
<AdditionalLibraryDirectories>$(SolutionDir)Source\Protobuf;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | |||
<AdditionalLibraryDirectories>$(SolutionDir)Source\Protobuf;$(SolutionDir)Source\Libs\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | |||
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies> | |||
</Link> | |||
<PostBuildEvent> | |||
<Command> | |||
@@ -454,7 +454,7 @@ bool CTableFrameSinkPoker::OnEventGameStart() | |||
{ | |||
CopyMemory(GameStart.cbCardData[i], m_cbCardData[i], MAX_COUNT_Poker); | |||
} | |||
RepayRecord(INVALID_CHAIR, SUB_S_GAME_START_Poker, &GameSt......art, sizeof(GameStart)); | |||
RepayRecord(INVALID_CHAIR, SUB_S_GAME_START_Poker, &GameStart, sizeof(GameStart)); | |||
for (int i = 0; i < m_cbPlayerNum;i++) | |||
{ | |||
ZeroMemory(GameStart.cbCardData, GAME_PLAYER*MAX_COUNT_Poker); | |||
@@ -311,24 +311,11 @@ bool CTableFrameSink::RepayRecordEnd() | |||
for (auto& grp : m_UserReplayRecord) | |||
{ | |||
RecordPacket::pb_GameRecordPacket* Packet = RecordResp.add_precordpacket(); | |||
<<<<<<< .mine | |||
Packet->set_wchairid(grp.wchairid()); | |||
Packet->set_wsubcmdid(grp.wsubcmdid()); | |||
Packet->set_wmaincmdid(grp.wmaincmdid()); | |||
Packet->set_pdata(grp.pdata()); | |||
||||||| .r248 | |||
Packet->set_wchairid(grp.wChairID); | |||
Packet->set_wsubcmdid(grp.wSubCmdID); | |||
Packet->set_wmaincmdid(grp.wMainCmdID); | |||
std::string wPacket = CW2AEX<1024>(grp.wPacket, CP_UTF8).m_psz; | |||
Packet->set_pdata(wPacket); | |||
======= | |||
Packet->set_wchairid(grp.wchairid()); | |||
Packet->set_wsubcmdid(grp.wsubcmdid()); | |||
Packet->set_wmaincmdid(grp.wmaincmdid()); | |||
Packet->set_pdata(grp.pdata()); | |||
>>>>>>> .r273 | |||
} | |||
std::string pbresp = RecordResp.SerializePartialAsString(); | |||
@@ -343,73 +330,12 @@ bool CTableFrameSink::RepayRecordEnd() | |||
bool CTableFrameSink::RepayRecord(WORD wChairID, WORD wSubCmdId, void* pData, WORD wSize) | |||
{ | |||
<<<<<<< .mine | |||
//»ñÈ¡Óû§ | |||
/*char* dwpdate = new char[wSize]; | |||
CopyMemory(dwpdate, pData, wSize); | |||
RecordPacket::pb_GameRecordPacket Packet; | |||
Packet.set_wchairid(wChairID); | |||
Packet.set_wsubcmdid(wSubCmdId); | |||
Packet.set_wmaincmdid(MDM_GF_GAME); | |||
Packet.set_pdata(dwpdate); | |||
std::string pbpacket = Packet.SerializePartialAsString(); | |||
GameRecordPacket record; | |||
CString dwPacket = (CA2CTEX<2048>(pbpacket.c_str(), CP_UTF8)).m_szBuffer; | |||
_sntprintf(record.wPacket, CountArray(record.wPacket), TEXT("%s"), pData); | |||
CopyMemory(record.wPacket, pData, wSize); | |||
record.wSize = wSize; | |||
record.wPacketSize = pbpacket.length();*/ | |||
RecordPacket::pb_GameRecordPacket record; | |||
record.set_wchairid(wChairID); | |||
record.set_wsubcmdid(wSubCmdId); | |||
record.set_wmaincmdid(MDM_GF_GAME); | |||
record.set_pdata((char*)pData); | |||
m_UserReplayRecord.push_back(record); | |||
/*if (nullptr != dwpdate) | |||
{ | |||
delete[] dwpdate; | |||
dwpdate = nullptr; | |||
}*/ | |||
||||||| .r248 | |||
//»ñÈ¡Óû§ | |||
/*char* dwpdate = new char[wSize]; | |||
CopyMemory(dwpdate, pData, wSize); | |||
RecordPacket::pb_GameRecordPacket Packet; | |||
Packet.set_wchairid(wChairID); | |||
Packet.set_wsubcmdid(wSubCmdId); | |||
Packet.set_wmaincmdid(MDM_GF_GAME); | |||
Packet.set_pdata(dwpdate); | |||
std::string pbpacket = Packet.SerializePartialAsString(); | |||
GameRecordPacket record; | |||
CString dwPacket = (CA2CTEX<2048>(pbpacket.c_str(), CP_UTF8)).m_szBuffer; | |||
_sntprintf(record.wPacket, CountArray(record.wPacket), TEXT("%s"), pData); | |||
CopyMemory(record.wPacket, pData, wSize); | |||
record.wSize = wSize; | |||
record.wPacketSize = pbpacket.length();*/ | |||
GameRecordPacket record; | |||
record.wSize = wSize; | |||
record.wChairID = wChairID; | |||
record.wSubCmdID = wSubCmdId; | |||
record.wMainCmdID = MDM_GF_GAME; | |||
_sntprintf(record.wPacket, wSize, TEXT("%s"), pData); | |||
m_UserReplayRecord.push_back(record); | |||
/*if (nullptr != dwpdate) | |||
{ | |||
delete[] dwpdate; | |||
dwpdate = nullptr; | |||
}*/ | |||
======= | |||
RecordPacket::pb_GameRecordPacket pRecordPacket; | |||
pRecordPacket.set_wchairid(wChairID); | |||
pRecordPacket.set_wsubcmdid(wSubCmdId); | |||
pRecordPacket.set_wmaincmdid(MDM_GF_GAME); | |||
pRecordPacket.set_pdata((char*)pData,wSize); | |||
m_UserReplayRecord.push_back(pRecordPacket); | |||
>>>>>>> .r273 | |||
return true; | |||
} | |||
@@ -7,13 +7,7 @@ | |||
#include "GameLogic.h" | |||
#include "ReplayRecordManager.h" | |||
#include "data.h" | |||
<<<<<<< .mine | |||
#include "../俱乐部/Source/MessageDef/Pb_RecordPacket.pb.h" | |||
||||||| .r248 | |||
======= | |||
#include "../俱乐部/Source/MessageDef/Pb_RecordPacket.pb.h" | |||
>>>>>>> .r273 | |||
enum MagicCount | |||
{ | |||
MagicZero=0, | |||
@@ -146,14 +140,7 @@ private: | |||
const tagGameServiceOption * m_pGameServiceOption; //配置参数 | |||
bool m_bReplayRecordStart; //是否开始录像 | |||
<<<<<<< .mine | |||
std::vector<RecordPacket::pb_GameRecordPacket> m_UserReplayRecord; //对四个位置用户的数据的记录,用于回放。 | |||
||||||| .r248 | |||
std::vector<GameRecordPacket> m_UserReplayRecord; //对四个位置用户的数据的记录,用于回放。 | |||
======= | |||
std::vector<RecordPacket::pb_GameRecordPacket> m_UserReplayRecord; //对四个位置用户的数据的记录,用于回放。 | |||
>>>>>>> .r273 | |||
//bool m_bReduceBean; //是否已扣房卡(游戏豆) | |||
//LONGLONG m_lUserTmpScore[GAME_PLAYER]; | |||