From 14ebaafb069ca198ee24a4e4859aab29971d273f Mon Sep 17 00:00:00 2001
From: Axel 0vercl0k Souchet <0vercl0k@tuxfamily.org>
Date: Sun, 11 May 2014 17:24:28 +0100
Subject: [PATCH] cleaned up the msvc tree

---
 .../capstone-static/capstone-static.vcxproj   |  0
 {capstone-msvc => msvc}/headers/inttypes.h    |  0
 {capstone-msvc => msvc}/headers/platform.h    |  0
 {capstone-msvc => msvc}/headers/stdbool.h     |  0
 .../capstone-msvc.sln => msvc/msvc-2012.sln   | 20 +++++++++----------
 .../test-arm/test-arm.vcxproj                 |  1 +
 .../test-arm64/test-arm64.vcxproj             |  1 +
 .../test-detail/test-detail.vcxproj           |  1 +
 .../test-mips/test-mips.vcxproj               |  1 +
 .../test-ppc/test-ppc.vcxproj                 |  1 +
 .../test-skipdata/test-skipdata.vcxproj       |  1 +
 .../test-sparc/test-sparc.vcxproj             |  1 +
 .../test-systemz/test-systemz.vcxproj         |  1 +
 .../test-x86/test-x86.vcxproj                 |  1 +
 .../test/test.vcxproj                         |  1 +
 15 files changed, 20 insertions(+), 10 deletions(-)
 rename {capstone-msvc => msvc}/capstone-static/capstone-static.vcxproj (100%)
 rename {capstone-msvc => msvc}/headers/inttypes.h (100%)
 rename {capstone-msvc => msvc}/headers/platform.h (100%)
 rename {capstone-msvc => msvc}/headers/stdbool.h (100%)
 rename capstone-msvc/capstone-msvc.sln => msvc/msvc-2012.sln (81%)
 rename capstone-msvc/capstone-test-arm/capstone-test-arm.vcxproj => msvc/test-arm/test-arm.vcxproj (99%)
 rename capstone-msvc/capstone-test-arm64/capstone-test-arm64.vcxproj => msvc/test-arm64/test-arm64.vcxproj (99%)
 rename capstone-msvc/capstone-test-detail/capstone-test-detail.vcxproj => msvc/test-detail/test-detail.vcxproj (99%)
 rename capstone-msvc/capstone-test-mips/capstone-test-mips.vcxproj => msvc/test-mips/test-mips.vcxproj (99%)
 rename capstone-msvc/capstone-test-ppc/capstone-test-ppc.vcxproj => msvc/test-ppc/test-ppc.vcxproj (99%)
 rename capstone-msvc/capstone-test-skipdata/capstone-test-skipdata.vcxproj => msvc/test-skipdata/test-skipdata.vcxproj (99%)
 rename capstone-msvc/capstone-test-sparc/capstone-test-sparc.vcxproj => msvc/test-sparc/test-sparc.vcxproj (99%)
 rename capstone-msvc/capstone-test-systemz/capstone-test-systemz.vcxproj => msvc/test-systemz/test-systemz.vcxproj (99%)
 rename capstone-msvc/capstone-test-x86/capstone-test-x86.vcxproj => msvc/test-x86/test-x86.vcxproj (99%)
 rename capstone-msvc/capstone-test/capstone-test.vcxproj => msvc/test/test.vcxproj (99%)

diff --git a/capstone-msvc/capstone-static/capstone-static.vcxproj b/msvc/capstone-static/capstone-static.vcxproj
similarity index 100%
rename from capstone-msvc/capstone-static/capstone-static.vcxproj
rename to msvc/capstone-static/capstone-static.vcxproj
diff --git a/capstone-msvc/headers/inttypes.h b/msvc/headers/inttypes.h
similarity index 100%
rename from capstone-msvc/headers/inttypes.h
rename to msvc/headers/inttypes.h
diff --git a/capstone-msvc/headers/platform.h b/msvc/headers/platform.h
similarity index 100%
rename from capstone-msvc/headers/platform.h
rename to msvc/headers/platform.h
diff --git a/capstone-msvc/headers/stdbool.h b/msvc/headers/stdbool.h
similarity index 100%
rename from capstone-msvc/headers/stdbool.h
rename to msvc/headers/stdbool.h
diff --git a/capstone-msvc/capstone-msvc.sln b/msvc/msvc-2012.sln
similarity index 81%
rename from capstone-msvc/capstone-msvc.sln
rename to msvc/msvc-2012.sln
index 89c24e6a..6713e911 100644
--- a/capstone-msvc/capstone-msvc.sln
+++ b/msvc/msvc-2012.sln
@@ -3,25 +3,25 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2012
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "capstone-static", "capstone-static\capstone-static.vcxproj", "{5B01D900-2359-44CA-9914-6B0C6AFB7BE7}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "capstone-test", "capstone-test\capstone-test.vcxproj", "{B291E0D9-4B39-4AF8-971D-A015B78D54A1}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test", "test\test.vcxproj", "{B291E0D9-4B39-4AF8-971D-A015B78D54A1}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "capstone-test-x86", "capstone-test-x86\capstone-test-x86.vcxproj", "{9C69243E-C7DC-42A4-AB86-0696E51697C8}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-x86", "test-x86\test-x86.vcxproj", "{9C69243E-C7DC-42A4-AB86-0696E51697C8}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "capstone-test-arm", "capstone-test-arm\capstone-test-arm.vcxproj", "{349B99E4-2E79-44FE-96F9-02D9B4EC0584}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-arm", "test-arm\test-arm.vcxproj", "{349B99E4-2E79-44FE-96F9-02D9B4EC0584}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "capstone-test-arm64", "capstone-test-arm64\capstone-test-arm64.vcxproj", "{CBE31473-7D0E-41F5-AFCB-8C8422ED8908}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-arm64", "test-arm64\test-arm64.vcxproj", "{CBE31473-7D0E-41F5-AFCB-8C8422ED8908}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "capstone-test-mips", "capstone-test-mips\capstone-test-mips.vcxproj", "{28B2D82F-3E95-4ECE-8118-0E891BD453E0}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-mips", "test-mips\test-mips.vcxproj", "{28B2D82F-3E95-4ECE-8118-0E891BD453E0}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "capstone-test-ppc", "capstone-test-ppc\capstone-test-ppc.vcxproj", "{0B78E956-F897-4149-BFB2-BE87DA3A6F0D}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-ppc", "test-ppc\test-ppc.vcxproj", "{0B78E956-F897-4149-BFB2-BE87DA3A6F0D}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "capstone-test-sparc", "capstone-test-sparc\capstone-test-sparc.vcxproj", "{9E735ABA-00D9-4114-A9E7-0568D8DFF94B}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-sparc", "test-sparc\test-sparc.vcxproj", "{9E735ABA-00D9-4114-A9E7-0568D8DFF94B}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "capstone-test-systemz", "capstone-test-systemz\capstone-test-systemz.vcxproj", "{D83F2A2D-D5F1-421E-A5B7-B47F1ECABAD2}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-systemz", "test-systemz\test-systemz.vcxproj", "{D83F2A2D-D5F1-421E-A5B7-B47F1ECABAD2}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "capstone-test-detail", "capstone-test-detail\capstone-test-detail.vcxproj", "{A510F308-3094-4FF6-9DFC-539CC5260BA4}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-detail", "test-detail\test-detail.vcxproj", "{A510F308-3094-4FF6-9DFC-539CC5260BA4}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "capstone-test-skipdata", "capstone-test-skipdata\capstone-test-skipdata.vcxproj", "{B09819BB-7EF1-4B04-945D-58117E6940A1}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-skipdata", "test-skipdata\test-skipdata.vcxproj", "{B09819BB-7EF1-4B04-945D-58117E6940A1}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/capstone-msvc/capstone-test-arm/capstone-test-arm.vcxproj b/msvc/test-arm/test-arm.vcxproj
similarity index 99%
rename from capstone-msvc/capstone-test-arm/capstone-test-arm.vcxproj
rename to msvc/test-arm/test-arm.vcxproj
index bea821ee..524df474 100644
--- a/capstone-msvc/capstone-test-arm/capstone-test-arm.vcxproj
+++ b/msvc/test-arm/test-arm.vcxproj
@@ -22,6 +22,7 @@
     <ProjectGuid>{349B99E4-2E79-44FE-96F9-02D9B4EC0584}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>capstonetestarm</RootNamespace>
+    <ProjectName>test-arm</ProjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
diff --git a/capstone-msvc/capstone-test-arm64/capstone-test-arm64.vcxproj b/msvc/test-arm64/test-arm64.vcxproj
similarity index 99%
rename from capstone-msvc/capstone-test-arm64/capstone-test-arm64.vcxproj
rename to msvc/test-arm64/test-arm64.vcxproj
index 12c02a44..342f21d4 100644
--- a/capstone-msvc/capstone-test-arm64/capstone-test-arm64.vcxproj
+++ b/msvc/test-arm64/test-arm64.vcxproj
@@ -22,6 +22,7 @@
     <ProjectGuid>{CBE31473-7D0E-41F5-AFCB-8C8422ED8908}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>capstonetestarm64</RootNamespace>
+    <ProjectName>test-arm64</ProjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
diff --git a/capstone-msvc/capstone-test-detail/capstone-test-detail.vcxproj b/msvc/test-detail/test-detail.vcxproj
similarity index 99%
rename from capstone-msvc/capstone-test-detail/capstone-test-detail.vcxproj
rename to msvc/test-detail/test-detail.vcxproj
index 97f572f8..4b38fd79 100644
--- a/capstone-msvc/capstone-test-detail/capstone-test-detail.vcxproj
+++ b/msvc/test-detail/test-detail.vcxproj
@@ -22,6 +22,7 @@
     <ProjectGuid>{A510F308-3094-4FF6-9DFC-539CC5260BA4}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>capstonetestdetail</RootNamespace>
+    <ProjectName>test-detail</ProjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
diff --git a/capstone-msvc/capstone-test-mips/capstone-test-mips.vcxproj b/msvc/test-mips/test-mips.vcxproj
similarity index 99%
rename from capstone-msvc/capstone-test-mips/capstone-test-mips.vcxproj
rename to msvc/test-mips/test-mips.vcxproj
index b701d502..24e57a93 100644
--- a/capstone-msvc/capstone-test-mips/capstone-test-mips.vcxproj
+++ b/msvc/test-mips/test-mips.vcxproj
@@ -22,6 +22,7 @@
     <ProjectGuid>{28B2D82F-3E95-4ECE-8118-0E891BD453E0}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>capstonetestmips</RootNamespace>
+    <ProjectName>test-mips</ProjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
diff --git a/capstone-msvc/capstone-test-ppc/capstone-test-ppc.vcxproj b/msvc/test-ppc/test-ppc.vcxproj
similarity index 99%
rename from capstone-msvc/capstone-test-ppc/capstone-test-ppc.vcxproj
rename to msvc/test-ppc/test-ppc.vcxproj
index 22d8e1c9..67e21ebf 100644
--- a/capstone-msvc/capstone-test-ppc/capstone-test-ppc.vcxproj
+++ b/msvc/test-ppc/test-ppc.vcxproj
@@ -25,6 +25,7 @@
     <ProjectGuid>{0B78E956-F897-4149-BFB2-BE87DA3A6F0D}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>capstonetestppc</RootNamespace>
+    <ProjectName>test-ppc</ProjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
diff --git a/capstone-msvc/capstone-test-skipdata/capstone-test-skipdata.vcxproj b/msvc/test-skipdata/test-skipdata.vcxproj
similarity index 99%
rename from capstone-msvc/capstone-test-skipdata/capstone-test-skipdata.vcxproj
rename to msvc/test-skipdata/test-skipdata.vcxproj
index 0bf26b31..b8eb9747 100644
--- a/capstone-msvc/capstone-test-skipdata/capstone-test-skipdata.vcxproj
+++ b/msvc/test-skipdata/test-skipdata.vcxproj
@@ -22,6 +22,7 @@
     <ProjectGuid>{B09819BB-7EF1-4B04-945D-58117E6940A1}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>capstonetestskipdata</RootNamespace>
+    <ProjectName>test-skipdata</ProjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
diff --git a/capstone-msvc/capstone-test-sparc/capstone-test-sparc.vcxproj b/msvc/test-sparc/test-sparc.vcxproj
similarity index 99%
rename from capstone-msvc/capstone-test-sparc/capstone-test-sparc.vcxproj
rename to msvc/test-sparc/test-sparc.vcxproj
index 170e2b28..0990442c 100644
--- a/capstone-msvc/capstone-test-sparc/capstone-test-sparc.vcxproj
+++ b/msvc/test-sparc/test-sparc.vcxproj
@@ -22,6 +22,7 @@
     <ProjectGuid>{9E735ABA-00D9-4114-A9E7-0568D8DFF94B}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>capstonetestsparc</RootNamespace>
+    <ProjectName>test-sparc</ProjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
diff --git a/capstone-msvc/capstone-test-systemz/capstone-test-systemz.vcxproj b/msvc/test-systemz/test-systemz.vcxproj
similarity index 99%
rename from capstone-msvc/capstone-test-systemz/capstone-test-systemz.vcxproj
rename to msvc/test-systemz/test-systemz.vcxproj
index 5a8f9bb7..b2276f32 100644
--- a/capstone-msvc/capstone-test-systemz/capstone-test-systemz.vcxproj
+++ b/msvc/test-systemz/test-systemz.vcxproj
@@ -25,6 +25,7 @@
     <ProjectGuid>{D83F2A2D-D5F1-421E-A5B7-B47F1ECABAD2}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>capstonetestsystemz</RootNamespace>
+    <ProjectName>test-systemz</ProjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
diff --git a/capstone-msvc/capstone-test-x86/capstone-test-x86.vcxproj b/msvc/test-x86/test-x86.vcxproj
similarity index 99%
rename from capstone-msvc/capstone-test-x86/capstone-test-x86.vcxproj
rename to msvc/test-x86/test-x86.vcxproj
index 57389ab8..6560ac90 100644
--- a/capstone-msvc/capstone-test-x86/capstone-test-x86.vcxproj
+++ b/msvc/test-x86/test-x86.vcxproj
@@ -22,6 +22,7 @@
     <ProjectGuid>{9C69243E-C7DC-42A4-AB86-0696E51697C8}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>capstonetestx86</RootNamespace>
+    <ProjectName>test-x86</ProjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
diff --git a/capstone-msvc/capstone-test/capstone-test.vcxproj b/msvc/test/test.vcxproj
similarity index 99%
rename from capstone-msvc/capstone-test/capstone-test.vcxproj
rename to msvc/test/test.vcxproj
index 4bd07801..2021ff78 100644
--- a/capstone-msvc/capstone-test/capstone-test.vcxproj
+++ b/msvc/test/test.vcxproj
@@ -22,6 +22,7 @@
     <ProjectGuid>{B291E0D9-4B39-4AF8-971D-A015B78D54A1}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>capstonetest</RootNamespace>
+    <ProjectName>test</ProjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">