Remove MCountryFilter project

Asunaya · Aug 10, 2016 · 8234b80 · 8234b80
1 parent 26d6470
commit 8234b80
Show file tree

Hide file tree

Showing 32 changed files with 4 additions and 2,633 deletions.
diff --git a/Gunz/Gunz.sln b/Gunz/Gunz.sln
@@ -14,8 +14,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Gunz", "Gunz.vcxproj", "{80
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RealSound", "..\RealSound\RealSound.vcxproj", "{E88600D6-EB31-49F7-9E06-678802D97B82}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MCountryFilter", "..\MCountryFilter\MCountryFilter.vcxproj", "{43FAAF56-EA88-4D3F-95B7-14A0582F3290}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cml", "..\cml\cml.vcxproj", "{8D451493-65C2-49C3-ADAE-ACB17E6B0650}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MDatabase", "..\MDatabase\MDatabase.vcxproj", "{98475FA7-BEA2-42EE-9B1C-31D9684D237B}"
@@ -130,22 +128,6 @@ Global
 		{E88600D6-EB31-49F7-9E06-678802D97B82}.Test|Win32.Build.0 = Debug|Win32
 		{E88600D6-EB31-49F7-9E06-678802D97B82}.Test|x64.ActiveCfg = Debug|x64
 		{E88600D6-EB31-49F7-9E06-678802D97B82}.Test|x64.Build.0 = Debug|x64
-		{43FAAF56-EA88-4D3F-95B7-14A0582F3290}.Debug|Win32.ActiveCfg = Debug|Win32
-		{43FAAF56-EA88-4D3F-95B7-14A0582F3290}.Debug|Win32.Build.0 = Debug|Win32
-		{43FAAF56-EA88-4D3F-95B7-14A0582F3290}.Debug|x64.ActiveCfg = Debug|x64
-		{43FAAF56-EA88-4D3F-95B7-14A0582F3290}.Debug|x64.Build.0 = Debug|x64
-		{43FAAF56-EA88-4D3F-95B7-14A0582F3290}.Release LTCG|Win32.ActiveCfg = Release|Win32
-		{43FAAF56-EA88-4D3F-95B7-14A0582F3290}.Release LTCG|Win32.Build.0 = Release|Win32
-		{43FAAF56-EA88-4D3F-95B7-14A0582F3290}.Release LTCG|x64.ActiveCfg = Release|x64
-		{43FAAF56-EA88-4D3F-95B7-14A0582F3290}.Release LTCG|x64.Build.0 = Release|x64
-		{43FAAF56-EA88-4D3F-95B7-14A0582F3290}.Release|Win32.ActiveCfg = Release|Win32
-		{43FAAF56-EA88-4D3F-95B7-14A0582F3290}.Release|Win32.Build.0 = Release|Win32
-		{43FAAF56-EA88-4D3F-95B7-14A0582F3290}.Release|x64.ActiveCfg = Release|x64
-		{43FAAF56-EA88-4D3F-95B7-14A0582F3290}.Release|x64.Build.0 = Release|x64
-		{43FAAF56-EA88-4D3F-95B7-14A0582F3290}.Test|Win32.ActiveCfg = Debug|Win32
-		{43FAAF56-EA88-4D3F-95B7-14A0582F3290}.Test|Win32.Build.0 = Debug|Win32
-		{43FAAF56-EA88-4D3F-95B7-14A0582F3290}.Test|x64.ActiveCfg = Debug|x64
-		{43FAAF56-EA88-4D3F-95B7-14A0582F3290}.Test|x64.Build.0 = Debug|x64
 		{8D451493-65C2-49C3-ADAE-ACB17E6B0650}.Debug|Win32.ActiveCfg = Debug|Win32
 		{8D451493-65C2-49C3-ADAE-ACB17E6B0650}.Debug|Win32.Build.0 = Debug|Win32
 		{8D451493-65C2-49C3-ADAE-ACB17E6B0650}.Debug|x64.ActiveCfg = Debug|x64

diff --git a/Gunz/Gunz.vcxproj b/Gunz/Gunz.vcxproj
@@ -897,10 +897,6 @@ rem call copy_share.bat
       <Project>{cbd109c1-1aa3-4a57-b439-9919c08faaa5}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
-    <ProjectReference Include="..\MCountryFilter\MCountryFilter.vcxproj">
-      <Project>{43faaf56-ea88-4d3f-95b7-14a0582f3290}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
     <ProjectReference Include="..\MDatabase\MDatabase.vcxproj">
       <Project>{98475fa7-bea2-42ee-9b1c-31d9684d237b}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

diff --git a/Gunz/main.cpp b/Gunz/main.cpp
@@ -7,14 +7,10 @@
 #include <shlwapi.h>
 #include <shellapi.h>
 
-#ifdef _HSHIELD
-#include "HShield/HShield.h"
-#endif
-
-#ifdef _XTRAP
-#include "XTrap/XTrap.h"
-#pragma comment ( lib, "XTrap/Multy C Type/XTrapIC.lib")
-#endif
+#pragma warning(push)
+#pragma warning(disable:4091)
+#include <ShlObj.h>
+#pragma warning(pop)
 
 #include "ZPrerequisites.h"
 #include "ZConfiguration.h"
@@ -1086,8 +1082,6 @@ bool CheckFont()
 	return true;
 }
 
-#include "shlobj.h"
-
 void CheckFileAssociation()
 {
 #define GUNZ_REPLAY_CLASS_NAME	"GunzReplay"

diff --git a/MCountryFilter/.svn/all-wcprops b/MCountryFilter/.svn/all-wcprops
diff --git a/MCountryFilter/.svn/entries b/MCountryFilter/.svn/entries