Skip to content

Commit

Permalink
Build Jencode app ok by vc2019.
Browse files Browse the repository at this point in the history
  • Loading branch information
郑树新 committed Dec 20, 2024
1 parent c51cfdc commit 0665972
Show file tree
Hide file tree
Showing 6 changed files with 329 additions and 2 deletions.
60 changes: 60 additions & 0 deletions app/jencode/Jencode_vc2019.sln
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2019
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Jencode", "Jencode_vc2019.vcxproj", "{5CEAFE4B-8A09-4FFE-8005-CD3131486D05}"
ProjectSection(ProjectDependencies) = postProject
{6EC1F44E-6A6A-48E9-B699-D7E89B63C8DC} = {6EC1F44E-6A6A-48E9-B699-D7E89B63C8DC}
{B40213C2-507C-4C7F-A6E1-B850C9BDC27B} = {B40213C2-507C-4C7F-A6E1-B850C9BDC27B}
{FE724EF7-3763-4E78-BDF5-BCBC075719FD} = {FE724EF7-3763-4E78-BDF5-BCBC075719FD}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lib_acl", "..\..\lib_acl\lib_acl_vc2019.vcxproj", "{B40213C2-507C-4C7F-A6E1-B850C9BDC27B}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lib_acl_cpp", "..\..\lib_acl_cpp\lib_acl_cpp_vc2019.vcxproj", "{6EC1F44E-6A6A-48E9-B699-D7E89B63C8DC}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lib_protocol", "..\..\lib_protocol\lib_protocol_vc2019.vcxproj", "{FE724EF7-3763-4E78-BDF5-BCBC075719FD}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
DebugDll|Win32 = DebugDll|Win32
Release|Win32 = Release|Win32
ReleaseDll|Win32 = ReleaseDll|Win32
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{5CEAFE4B-8A09-4FFE-8005-CD3131486D05}.Debug|Win32.ActiveCfg = Debug|Win32
{5CEAFE4B-8A09-4FFE-8005-CD3131486D05}.Debug|Win32.Build.0 = Debug|Win32
{5CEAFE4B-8A09-4FFE-8005-CD3131486D05}.DebugDll|Win32.ActiveCfg = Debug|Win32
{5CEAFE4B-8A09-4FFE-8005-CD3131486D05}.DebugDll|Win32.Build.0 = Debug|Win32
{5CEAFE4B-8A09-4FFE-8005-CD3131486D05}.Release|Win32.ActiveCfg = Release|Win32
{5CEAFE4B-8A09-4FFE-8005-CD3131486D05}.Release|Win32.Build.0 = Release|Win32
{5CEAFE4B-8A09-4FFE-8005-CD3131486D05}.ReleaseDll|Win32.ActiveCfg = Release|Win32
{5CEAFE4B-8A09-4FFE-8005-CD3131486D05}.ReleaseDll|Win32.Build.0 = Release|Win32
{B40213C2-507C-4C7F-A6E1-B850C9BDC27B}.Debug|Win32.ActiveCfg = Debug|Win32
{B40213C2-507C-4C7F-A6E1-B850C9BDC27B}.Debug|Win32.Build.0 = Debug|Win32
{B40213C2-507C-4C7F-A6E1-B850C9BDC27B}.DebugDll|Win32.ActiveCfg = DebugDll|Win32
{B40213C2-507C-4C7F-A6E1-B850C9BDC27B}.DebugDll|Win32.Build.0 = DebugDll|Win32
{B40213C2-507C-4C7F-A6E1-B850C9BDC27B}.Release|Win32.ActiveCfg = Release|Win32
{B40213C2-507C-4C7F-A6E1-B850C9BDC27B}.Release|Win32.Build.0 = Release|Win32
{B40213C2-507C-4C7F-A6E1-B850C9BDC27B}.ReleaseDll|Win32.ActiveCfg = ReleaseDll|Win32
{B40213C2-507C-4C7F-A6E1-B850C9BDC27B}.ReleaseDll|Win32.Build.0 = ReleaseDll|Win32
{6EC1F44E-6A6A-48E9-B699-D7E89B63C8DC}.Debug|Win32.ActiveCfg = Debug|Win32
{6EC1F44E-6A6A-48E9-B699-D7E89B63C8DC}.Debug|Win32.Build.0 = Debug|Win32
{6EC1F44E-6A6A-48E9-B699-D7E89B63C8DC}.DebugDll|Win32.ActiveCfg = DebugDll|Win32
{6EC1F44E-6A6A-48E9-B699-D7E89B63C8DC}.DebugDll|Win32.Build.0 = DebugDll|Win32
{6EC1F44E-6A6A-48E9-B699-D7E89B63C8DC}.Release|Win32.ActiveCfg = Release|Win32
{6EC1F44E-6A6A-48E9-B699-D7E89B63C8DC}.Release|Win32.Build.0 = Release|Win32
{6EC1F44E-6A6A-48E9-B699-D7E89B63C8DC}.ReleaseDll|Win32.ActiveCfg = Releasedll|Win32
{6EC1F44E-6A6A-48E9-B699-D7E89B63C8DC}.ReleaseDll|Win32.Build.0 = Releasedll|Win32
{FE724EF7-3763-4E78-BDF5-BCBC075719FD}.Debug|Win32.ActiveCfg = Debug|Win32
{FE724EF7-3763-4E78-BDF5-BCBC075719FD}.Debug|Win32.Build.0 = Debug|Win32
{FE724EF7-3763-4E78-BDF5-BCBC075719FD}.DebugDll|Win32.ActiveCfg = DebugDll|Win32
{FE724EF7-3763-4E78-BDF5-BCBC075719FD}.DebugDll|Win32.Build.0 = DebugDll|Win32
{FE724EF7-3763-4E78-BDF5-BCBC075719FD}.Release|Win32.ActiveCfg = Release|Win32
{FE724EF7-3763-4E78-BDF5-BCBC075719FD}.Release|Win32.Build.0 = Release|Win32
{FE724EF7-3763-4E78-BDF5-BCBC075719FD}.ReleaseDll|Win32.ActiveCfg = ReleaseDll|Win32
{FE724EF7-3763-4E78-BDF5-BCBC075719FD}.ReleaseDll|Win32.Build.0 = ReleaseDll|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal
173 changes: 173 additions & 0 deletions app/jencode/Jencode_vc2019.vcxproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,173 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{5CEAFE4B-8A09-4FFE-8005-CD3131486D05}</ProjectGuid>
<RootNamespace>Jencode</RootNamespace>
<Keyword>MFCProj</Keyword>
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
<ProjectName>Jencode</ProjectName>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<PlatformToolset>v142</PlatformToolset>
<UseOfMfc>Dynamic</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<PlatformToolset>v142</PlatformToolset>
<UseOfMfc>Dynamic</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<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 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>11.0.50727.1</_ProjectFileVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<OutDir>$(SolutionDir)$(Configuration)\</OutDir>
<IntDir>$(Configuration)\</IntDir>
<LinkIncremental>true</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<OutDir>$(SolutionDir)$(Configuration)\</OutDir>
<IntDir>$(Configuration)\</IntDir>
<LinkIncremental>false</LinkIncremental>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\lib_acl_cpp\include;..\..\lib_acl\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>false</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
<PrecompiledHeader />
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
<AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalDependencies>lib_acl.lib;lib_protocol.lib;lib_acl_cpp.lib</AdditionalDependencies>
</Link>
<Midl>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MkTypLibCompatible>false</MkTypLibCompatible>
</Midl>
<PreBuildEvent>
<Command>copy ..\..\dist\lib\win32\lib_acl_d.dll $(OutDir) /Y
copy ..\..\dist\lib\win32\lib_protocol_d.dll $(OutDir) /Y
copy ..\..\dist\lib\win32\lib_acl_cpp_d.dll $(OutDir) /Y</Command>
</PreBuildEvent>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Culture>0x0804</Culture>
<AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<AdditionalIncludeDirectories>..\..\lib_acl\include;..\..\lib_acl_cpp\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>false</MinimalRebuild>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
<PrecompiledHeader>Use</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<TargetMachine>MachineX86</TargetMachine>
<AdditionalDependencies>lib_acl.lib;lib_protocol.lib;lib_acl_cpp.lib</AdditionalDependencies>
<AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link>
<Midl>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MkTypLibCompatible>false</MkTypLibCompatible>
</Midl>
<PreBuildEvent>
<Command>copy ..\..\dist\lib\win32\lib_acl.dll $(OutDir) /Y
copy ..\..\dist\lib\win32\lib_protocol.dll $(OutDir) /Y
copy ..\..\dist\lib\win32\lib_acl_cpp.dll $(OutDir) /Y</Command>
</PreBuildEvent>
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Culture>0x0804</Culture>
<AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="AclTrans.cpp" />
<ClCompile Include="AddBOM.cpp" />
<ClCompile Include="DelBOM.cpp" />
<ClCompile Include="Gb2Utf8.cpp" />
<ClCompile Include="IdxTrans.cpp" />
<ClCompile Include="Jencode.cpp" />
<ClCompile Include="JencodeDlg.cpp" />
<ClCompile Include="stdafx.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="AclTrans.h" />
<ClInclude Include="AddBOM.h" />
<ClInclude Include="DelBOM.h" />
<ClInclude Include="Gb2Utf8.h" />
<ClInclude Include="IdxTrans.h" />
<ClInclude Include="Jencode.h" />
<ClInclude Include="JencodeDlg.h" />
<ClInclude Include="Resource.h" />
<ClInclude Include="stdafx.h" />
</ItemGroup>
<ItemGroup>
<Image Include="res\Jencode.ico" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="Jencode.rc" />
</ItemGroup>
<ItemGroup>
<None Include="res\Jencode.rc2" />
</ItemGroup>
<ItemGroup>
<Manifest Include="res\Jencode.manifest" />
</ItemGroup>
<ItemGroup>
<Text Include="ReadMe.txt" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
<ProjectExtensions>
<VisualStudio>
<UserProperties RESOURCE_FILE="Jencode.rc" />
</VisualStudio>
</ProjectExtensions>
</Project>
93 changes: 93 additions & 0 deletions app/jencode/Jencode_vc2019.vcxproj.filters
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="源文件">
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
<Extensions>cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
</Filter>
<Filter Include="头文件">
<UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
<Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
</Filter>
<Filter Include="资源文件">
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx</Extensions>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="AclTrans.cpp">
<Filter>源文件</Filter>
</ClCompile>
<ClCompile Include="DelBOM.cpp">
<Filter>源文件</Filter>
</ClCompile>
<ClCompile Include="Gb2Utf8.cpp">
<Filter>源文件</Filter>
</ClCompile>
<ClCompile Include="IdxTrans.cpp">
<Filter>源文件</Filter>
</ClCompile>
<ClCompile Include="Jencode.cpp">
<Filter>源文件</Filter>
</ClCompile>
<ClCompile Include="JencodeDlg.cpp">
<Filter>源文件</Filter>
</ClCompile>
<ClCompile Include="stdafx.cpp">
<Filter>源文件</Filter>
</ClCompile>
<ClCompile Include="AddBOM.cpp">
<Filter>源文件</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="AclTrans.h">
<Filter>头文件</Filter>
</ClInclude>
<ClInclude Include="DelBOM.h">
<Filter>头文件</Filter>
</ClInclude>
<ClInclude Include="Gb2Utf8.h">
<Filter>头文件</Filter>
</ClInclude>
<ClInclude Include="IdxTrans.h">
<Filter>头文件</Filter>
</ClInclude>
<ClInclude Include="Jencode.h">
<Filter>头文件</Filter>
</ClInclude>
<ClInclude Include="JencodeDlg.h">
<Filter>头文件</Filter>
</ClInclude>
<ClInclude Include="Resource.h">
<Filter>头文件</Filter>
</ClInclude>
<ClInclude Include="stdafx.h">
<Filter>头文件</Filter>
</ClInclude>
<ClInclude Include="AddBOM.h">
<Filter>头文件</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<Image Include="res\Jencode.ico">
<Filter>资源文件</Filter>
</Image>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="Jencode.rc">
<Filter>资源文件</Filter>
</ResourceCompile>
</ItemGroup>
<ItemGroup>
<None Include="res\Jencode.rc2">
<Filter>资源文件</Filter>
</None>
</ItemGroup>
<ItemGroup>
<Manifest Include="res\Jencode.manifest" />
</ItemGroup>
<ItemGroup>
<Text Include="ReadMe.txt" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion lib_acl_cpp/include/acl_cpp/serialize/gson_helper.ipp
Original file line number Diff line number Diff line change
Expand Up @@ -802,7 +802,7 @@ gson(acl::json_node &node, char **obj)
return std::make_pair(false, "get char * string failed");

int len = (int) strlen(node.get_string());
*obj = new char[len + 1];
*obj = new char[len + 8];
memcpy(*obj, node.get_string(), len);
(*obj)[len] = 0;

Expand Down
1 change: 1 addition & 0 deletions lib_fiber/cpp/src/fiber.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -412,6 +412,7 @@ void fiber::stackshow(const fiber& fb, size_t max /* = 50 */)
//////////////////////////////////////////////////////////////////////////////

fiber_timer::fiber_timer()
: f_(NULL)
{
}

Expand Down
2 changes: 1 addition & 1 deletion lib_fiber/samples-gui/WinFiber/WinFiberDlg.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ void CWinFiberDlg::Uni2Str(const CString& in, acl::string& out)
buf, len, NULL, NULL);
buf[len] = 0;
out = buf;
delete buf;
delete []buf;
}

void CWinFiberDlg::InitFiber(void)
Expand Down

0 comments on commit 0665972

Please sign in to comment.