c++ ENet改名为ENetCpp CSharp版的改成ENet

CSharp/App/Modules/Robot/Robot.csproj

@@ -67,9 +67,9 @@
     </Page>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\Platform\ENetCS\ENetCS.csproj">
+    <ProjectReference Include="..\..\..\Platform\ENet\ENet.csproj">
       <Project>{d0b4cfac-a368-4742-9863-68776cfa9938}</Project>
-      <Name>ENetCS</Name>
+      <Name>ENet</Name>
     </ProjectReference>
     <ProjectReference Include="..\..\..\Platform\Helper\Helper.csproj">
       <Project>{24233cd5-a5df-484b-a482-b79cb7a0d9cb}</Project>

CSharp/CSharp.sln

@@ -42,14 +42,11 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Realm", "Server\Realm\Realm
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RealmContract", "Contract\RealmContract\RealmContract.csproj", "{E62B0633-1767-44A0-9479-C8E9D19DA4B8}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ENet", "Platform\ENet\ENet.vcxproj", "{C9992B7C-313E-4C9F-A954-640D01EDFB58}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ENetCpp", "Platform\ENetCpp\ENetCpp.vcxproj", "{C9992B7C-313E-4C9F-A954-640D01EDFB58}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ENetCS", "Platform\ENetCS\ENetCS.csproj", "{D0B4CFAC-A368-4742-9863-68776CFA9938}"
-	ProjectSection(ProjectDependencies) = postProject
-		{C9992B7C-313E-4C9F-A954-640D01EDFB58} = {C9992B7C-313E-4C9F-A954-640D01EDFB58}
-	EndProjectSection
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ENet", "Platform\ENet\ENet.csproj", "{D0B4CFAC-A368-4742-9863-68776CFA9938}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ENetCSTest", "Platform\ENetCSTest\ENetCSTest.csproj", "{901A8E5C-C4C6-4C3C-8E18-068D75119F5D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ENetTest", "Platform\ENetTest\ENetTest.csproj", "{901A8E5C-C4C6-4C3C-8E18-068D75119F5D}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

CSharp/Platform/ENetCS/ENetCS.csproj → CSharp/Platform/ENet/ENet.csproj

@@ -8,7 +8,7 @@
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>ENet</RootNamespace>
-    <AssemblyName>ENetCS</AssemblyName>
+    <AssemblyName>ENet</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
@@ -55,6 +55,10 @@
     <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\ENetCpp\ENetCpp.vcxproj">
+      <Project>{c9992b7c-313e-4c9f-a954-640d01edfb58}</Project>
+      <Name>ENetCpp</Name>
+    </ProjectReference>
     <ProjectReference Include="..\Log\Log.csproj">
       <Project>{72E16572-FC1F-4A9E-BC96-035417239298}</Project>
       <Name>Log</Name>

CSharp/Platform/ENetCS/NativeMethods.cs → CSharp/Platform/ENet/NativeMethods.cs

@@ -6,7 +6,7 @@ namespace ENet
 {
 	public static class NativeMethods
 	{
-		private const string LIB = "ENet.dll";
+		private const string LIB = "ENetCpp.dll";
 
 		public const int ENET_PEER_PACKET_THROTTLE_SCALE = 32;
 		public const int ENET_PEER_PACKET_THROTTLE_ACCELERATION = 2;

CSharp/Platform/ENetCpp/ENet.vcxproj.filters

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <ClCompile Include="callbacks.c" />
+    <ClCompile Include="compress.c" />
+    <ClCompile Include="host.c" />
+    <ClCompile Include="list.c" />
+    <ClCompile Include="packet.c" />
+    <ClCompile Include="peer.c" />
+    <ClCompile Include="protocol.c" />
+    <ClCompile Include="unix.c" />
+    <ClCompile Include="win32.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <Filter Include="ENet">
+      <UniqueIdentifier>{4d34ecdb-f5f2-401c-ab08-fa8e1ed6634f}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+</Project>

CSharp/Platform/ENet/ENet.vcxproj → CSharp/Platform/ENetCpp/ENetCpp.vcxproj

@@ -15,6 +15,7 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <Keyword>ManagedCProj</Keyword>
     <RootNamespace>ENet</RootNamespace>
+    <ProjectName>ENetCpp</ProjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -103,15 +104,15 @@
     <ClCompile Include="win32.c" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="callbacks.h" />
-    <ClInclude Include="enet.h" />
-    <ClInclude Include="list.h" />
-    <ClInclude Include="protocol.h" />
-    <ClInclude Include="time.h" />
-    <ClInclude Include="types.h" />
-    <ClInclude Include="unix.h" />
-    <ClInclude Include="utility.h" />
-    <ClInclude Include="win32.h" />
+    <ClInclude Include="ENet\callbacks.h" />
+    <ClInclude Include="ENet\enet.h" />
+    <ClInclude Include="ENet\list.h" />
+    <ClInclude Include="ENet\protocol.h" />
+    <ClInclude Include="ENet\time.h" />
+    <ClInclude Include="ENet\types.h" />
+    <ClInclude Include="ENet\unix.h" />
+    <ClInclude Include="ENet\utility.h" />
+    <ClInclude Include="ENet\win32.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

CSharp/Platform/ENetCpp/ENetCpp.vcxproj.filters

@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <ClCompile Include="callbacks.c" />
+    <ClCompile Include="compress.c" />
+    <ClCompile Include="host.c" />
+    <ClCompile Include="list.c" />
+    <ClCompile Include="packet.c" />
+    <ClCompile Include="peer.c" />
+    <ClCompile Include="protocol.c" />
+    <ClCompile Include="unix.c" />
+    <ClCompile Include="win32.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <Filter Include="ENet">
+      <UniqueIdentifier>{be5ed3f1-506a-4452-aef1-0c13a6371621}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="ENet\callbacks.h">
+      <Filter>ENet</Filter>
+    </ClInclude>
+    <ClInclude Include="ENet\enet.h">
+      <Filter>ENet</Filter>
+    </ClInclude>
+    <ClInclude Include="ENet\list.h">
+      <Filter>ENet</Filter>
+    </ClInclude>
+    <ClInclude Include="ENet\protocol.h">
+      <Filter>ENet</Filter>
+    </ClInclude>
+    <ClInclude Include="ENet\time.h">
+      <Filter>ENet</Filter>
+    </ClInclude>
+    <ClInclude Include="ENet\types.h">
+      <Filter>ENet</Filter>
+    </ClInclude>
+    <ClInclude Include="ENet\unix.h">
+      <Filter>ENet</Filter>
+    </ClInclude>
+    <ClInclude Include="ENet\utility.h">
+      <Filter>ENet</Filter>
+    </ClInclude>
+    <ClInclude Include="ENet\win32.h">
+      <Filter>ENet</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>

CSharp/Platform/ENetCSTest/ENetCSTest.csproj → CSharp/Platform/ENetTest/ENetTest.csproj

@@ -6,8 +6,8 @@
     <ProjectGuid>{901A8E5C-C4C6-4C3C-8E18-068D75119F5D}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>ENetCSTest</RootNamespace>
-    <AssemblyName>ENetCSTest</AssemblyName>
+    <RootNamespace>ENetTest</RootNamespace>
+    <AssemblyName>ENetTest</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
@@ -57,10 +57,6 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\Platform\ENetCS\ENetCS.csproj">
-      <Project>{D0B4CFAC-A368-4742-9863-68776CFA9938}</Project>
-      <Name>ENetCS</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\Platform\Helper\Helper.csproj">
       <Project>{24233cd5-a5df-484b-a482-b79cb7a0d9cb}</Project>
       <Name>Helper</Name>
@@ -69,6 +65,10 @@
       <Project>{72e16572-fc1f-4a9e-bc96-035417239298}</Project>
       <Name>Log</Name>
     </ProjectReference>
+    <ProjectReference Include="..\ENet\ENet.csproj">
+      <Project>{d0b4cfac-a368-4742-9863-68776cfa9938}</Project>
+      <Name>ENet</Name>
+    </ProjectReference>
   </ItemGroup>
   <Choose>
     <When Condition="'$(VisualStudioVersion)' == '10.0' And '$(IsCodedUITest)' == 'True'">