Move xrGame/gamespy/CdkeyDecode -> xrGame/CdkeyDecode.

OpenXRay · Jan 27, 2016 · 7820c59 · 7820c59
1 parent 3bca1e2
commit 7820c59
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 26 deletions.
diff --git a/src/xrGame/gamespy/CdkeyDecode/base32.c → src/xrGame/CdkeyDecode/base32.c b/src/xrGame/gamespy/CdkeyDecode/base32.c → src/xrGame/CdkeyDecode/base32.c
diff --git a/src/xrGame/gamespy/CdkeyDecode/base32.h → src/xrGame/CdkeyDecode/base32.h b/src/xrGame/gamespy/CdkeyDecode/base32.h → src/xrGame/CdkeyDecode/base32.h
diff --git a/src/xrGame/gamespy/CdkeyDecode/cdkeydecode.c → src/xrGame/CdkeyDecode/cdkeydecode.c b/src/xrGame/gamespy/CdkeyDecode/cdkeydecode.c → src/xrGame/CdkeyDecode/cdkeydecode.c
diff --git a/src/xrGame/gamespy/CdkeyDecode/cdkeydecode.h → src/xrGame/CdkeyDecode/cdkeydecode.h b/src/xrGame/gamespy/CdkeyDecode/cdkeydecode.h → src/xrGame/CdkeyDecode/cdkeydecode.h
diff --git a/src/xrGame/MainMenu.cpp b/src/xrGame/MainMenu.cpp
@@ -14,7 +14,7 @@
 #include "gamespy/GameSpy_Full.h"
 #include "gamespy/GameSpy_HTTP.h"
 #include "gamespy/GameSpy_Available.h"
-#include "gamespy/CdkeyDecode/cdkeydecode.h"
+#include "CdkeyDecode/cdkeydecode.h"
 #include "string_table.h"
 #include "xrCore/os_clipboard.h"
 

diff --git a/src/xrGame/xrGame.vcxproj b/src/xrGame/xrGame.vcxproj
@@ -778,6 +778,8 @@
     <ClInclude Include="CarLights.h" />
     <ClInclude Include="CarWeapon.h" />
     <ClInclude Include="car_memory.h" />
+    <ClInclude Include="CdkeyDecode\base32.h" />
+    <ClInclude Include="CdkeyDecode\cdkeydecode.h" />
     <ClInclude Include="cdkey_ban_list.h" />
     <ClInclude Include="CharacterPhysicsSupport.h" />
     <ClInclude Include="character_community.h" />
@@ -892,8 +894,6 @@
     <ClInclude Include="GalantineArtifact.h" />
     <ClInclude Include="GameObject.h" />
     <ClInclude Include="GamePersistent.h" />
-    <ClInclude Include="gamespy\CdkeyDecode\base32.h" />
-    <ClInclude Include="gamespy\CdkeyDecode\cdkeydecode.h" />
     <ClInclude Include="gamespy\GameSpy_ATLAS.h" />
     <ClInclude Include="GameSpy\GameSpy_Available.h" />
     <ClInclude Include="GameSpy\GameSpy_Base_Defs.h" />
@@ -2309,6 +2309,16 @@
     <ClCompile Include="CarWeapon.cpp" />
     <ClCompile Include="CarWheels.cpp" />
     <ClCompile Include="car_memory.cpp" />
+    <ClCompile Include="CdkeyDecode\base32.c">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Mixed|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="CdkeyDecode\cdkeydecode.c">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Mixed|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
+    </ClCompile>
     <ClCompile Include="cdkey_ban_list.cpp" />
     <ClCompile Include="CharacterPhysicsSupport.cpp" />
     <ClCompile Include="character_community.cpp" />
@@ -2457,14 +2467,6 @@
       <PrecompiledHeaderFile>pch_script.h</PrecompiledHeaderFile>
       <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName)_script.pch</PrecompiledHeaderOutputFile>
     </ClCompile>
-    <ClCompile Include="gamespy\CdkeyDecode\base32.c">
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="gamespy\CdkeyDecode\cdkeydecode.c">
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-    </ClCompile>
     <ClCompile Include="gamespy\GameSpy_ATLAS.cpp" />
     <ClCompile Include="GameSpy\GameSpy_Available.cpp" />
     <ClCompile Include="GameSpy\GameSpy_Browser.cpp" />

diff --git a/src/xrGame/xrGame.vcxproj.filters b/src/xrGame/xrGame.vcxproj.filters
@@ -1831,9 +1831,6 @@
     <Filter Include="Core\Server\GameSpy">
       <UniqueIdentifier>{0e29aa42-d79c-425a-994b-c18169f076de}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Core\Server\GameSpy\CdkeyDecode">
-      <UniqueIdentifier>{1e260ced-c32e-4b46-a3cc-a5fd5d7c6109}</UniqueIdentifier>
-    </Filter>
     <Filter Include="Core\Server\ID_Generator">
       <UniqueIdentifier>{896c2566-b777-4505-acd6-792e19f54026}</UniqueIdentifier>
     </Filter>
@@ -2287,6 +2284,9 @@
     <Filter Include="ScriptClasses\ScriptSound">
       <UniqueIdentifier>{7461340c-f13a-4ba4-a432-e8aeca7393cf}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Core\Server\CdkeyDecode">
+      <UniqueIdentifier>{43eeb848-b66f-495c-8120-ea477ba14632}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="mt_config.h">
@@ -5940,12 +5940,6 @@
     <ClInclude Include="gamespy\GameSpy_SAKE.h">
       <Filter>Core\Server\GameSpy</Filter>
     </ClInclude>
-    <ClInclude Include="gamespy\CdkeyDecode\base32.h">
-      <Filter>Core\Server\GameSpy\CdkeyDecode</Filter>
-    </ClInclude>
-    <ClInclude Include="gamespy\CdkeyDecode\cdkeydecode.h">
-      <Filter>Core\Server\GameSpy\CdkeyDecode</Filter>
-    </ClInclude>
     <ClInclude Include="id_generator.h">
       <Filter>Core\Server\ID_Generator</Filter>
     </ClInclude>
@@ -6693,6 +6687,12 @@
     <ClInclude Include="LevelGraphDebugRender.hpp">
       <Filter>AI\ADebug</Filter>
     </ClInclude>
+    <ClInclude Include="CdkeyDecode\base32.h">
+      <Filter>Core\Server\CdkeyDecode</Filter>
+    </ClInclude>
+    <ClInclude Include="CdkeyDecode\cdkeydecode.h">
+      <Filter>Core\Server\CdkeyDecode</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="damage_manager.cpp">
@@ -9353,12 +9353,6 @@
     <ClCompile Include="gamespy\GameSpy_SAKE.cpp">
       <Filter>Core\Server\GameSpy</Filter>
     </ClCompile>
-    <ClCompile Include="gamespy\CdkeyDecode\base32.c">
-      <Filter>Core\Server\GameSpy\CdkeyDecode</Filter>
-    </ClCompile>
-    <ClCompile Include="gamespy\CdkeyDecode\cdkeydecode.c">
-      <Filter>Core\Server\GameSpy\CdkeyDecode</Filter>
-    </ClCompile>
     <ClCompile Include="..\xrServerEntities\gametype_chooser.cpp">
       <Filter>Core\Server\ServerEntities</Filter>
     </ClCompile>
@@ -10235,6 +10229,12 @@
     <ClCompile Include="LevelGraphDebugRender.cpp">
       <Filter>AI\ADebug</Filter>
     </ClCompile>
+    <ClCompile Include="CdkeyDecode\base32.c">
+      <Filter>Core\Server\CdkeyDecode</Filter>
+    </ClCompile>
+    <ClCompile Include="CdkeyDecode\cdkeydecode.c">
+      <Filter>Core\Server\CdkeyDecode</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="ai\monsters\chimera\chimera_attack_state.h">