Moved the SubiT_ShellExt project to SubiT's solution, and to the root…

… dir. Also upgraded the project to VS2013.
yosi-dediashvili · Mar 26, 2014 · 508a12a · 508a12a
1 parent e3dee14
commit 508a12a
Show file tree

Hide file tree

Showing 20 changed files with 54 additions and 35 deletions.
diff --git a/SubiT.sln b/SubiT.sln
@@ -1,24 +1,58 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2013
-VisualStudioVersion = 12.0.21005.1
+VisualStudioVersion = 12.0.30110.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{888888A0-9F3D-457C-B088-3A5042F75D52}") = "SubiT", "SubiT.pyproj", "{CA7E4620-E7E0-4188-9A18-3C8C75BB06E3}"
 EndProject
 Project("{888888A0-9F3D-457C-B088-3A5042F75D52}") = "SubiT_Tests", "SubiT_Tests\SubiT_Tests.pyproj", "{13BF253A-8314-42F4-BFA9-EF78D9DB9B16}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SubiT_ShellExt", "SubiT_ShellExt\SubiTShellExt.vcxproj", "{10FDC9AB-5B02-44E2-B7E1-31746443146E}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Debug|Mixed Platforms = Debug|Mixed Platforms
+		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
 		Release|Any CPU = Release|Any CPU
+		Release|Mixed Platforms = Release|Mixed Platforms
+		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{CA7E4620-E7E0-4188-9A18-3C8C75BB06E3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CA7E4620-E7E0-4188-9A18-3C8C75BB06E3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{CA7E4620-E7E0-4188-9A18-3C8C75BB06E3}.Debug|Win32.ActiveCfg = Debug|Any CPU
+		{CA7E4620-E7E0-4188-9A18-3C8C75BB06E3}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{CA7E4620-E7E0-4188-9A18-3C8C75BB06E3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CA7E4620-E7E0-4188-9A18-3C8C75BB06E3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{CA7E4620-E7E0-4188-9A18-3C8C75BB06E3}.Release|Win32.ActiveCfg = Release|Any CPU
+		{CA7E4620-E7E0-4188-9A18-3C8C75BB06E3}.Release|x64.ActiveCfg = Release|Any CPU
 		{13BF253A-8314-42F4-BFA9-EF78D9DB9B16}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{13BF253A-8314-42F4-BFA9-EF78D9DB9B16}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{13BF253A-8314-42F4-BFA9-EF78D9DB9B16}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{13BF253A-8314-42F4-BFA9-EF78D9DB9B16}.Debug|Win32.ActiveCfg = Debug|Any CPU
+		{13BF253A-8314-42F4-BFA9-EF78D9DB9B16}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{13BF253A-8314-42F4-BFA9-EF78D9DB9B16}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{13BF253A-8314-42F4-BFA9-EF78D9DB9B16}.Release|Any CPU.Build.0 = Release|Any CPU
+		{13BF253A-8314-42F4-BFA9-EF78D9DB9B16}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{13BF253A-8314-42F4-BFA9-EF78D9DB9B16}.Release|Win32.ActiveCfg = Release|Any CPU
+		{13BF253A-8314-42F4-BFA9-EF78D9DB9B16}.Release|x64.ActiveCfg = Release|Any CPU
+		{10FDC9AB-5B02-44E2-B7E1-31746443146E}.Debug|Any CPU.ActiveCfg = Debug|Win32
+		{10FDC9AB-5B02-44E2-B7E1-31746443146E}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{10FDC9AB-5B02-44E2-B7E1-31746443146E}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{10FDC9AB-5B02-44E2-B7E1-31746443146E}.Debug|Win32.ActiveCfg = Debug|Win32
+		{10FDC9AB-5B02-44E2-B7E1-31746443146E}.Debug|Win32.Build.0 = Debug|Win32
+		{10FDC9AB-5B02-44E2-B7E1-31746443146E}.Debug|x64.ActiveCfg = Debug|x64
+		{10FDC9AB-5B02-44E2-B7E1-31746443146E}.Debug|x64.Build.0 = Debug|x64
+		{10FDC9AB-5B02-44E2-B7E1-31746443146E}.Release|Any CPU.ActiveCfg = Release|Win32
+		{10FDC9AB-5B02-44E2-B7E1-31746443146E}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{10FDC9AB-5B02-44E2-B7E1-31746443146E}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{10FDC9AB-5B02-44E2-B7E1-31746443146E}.Release|Win32.ActiveCfg = Release|Win32
+		{10FDC9AB-5B02-44E2-B7E1-31746443146E}.Release|Win32.Build.0 = Release|Win32
+		{10FDC9AB-5B02-44E2-B7E1-31746443146E}.Release|x64.ActiveCfg = Release|x64
+		{10FDC9AB-5B02-44E2-B7E1-31746443146E}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/...iTShellExt/SubiTShellExt/ClassFactory.cpp → SubiT_ShellExt/ClassFactory.cpp b/...iTShellExt/SubiTShellExt/ClassFactory.cpp → SubiT_ShellExt/ClassFactory.cpp
diff --git a/...ubiTShellExt/SubiTShellExt/ClassFactory.h → SubiT_ShellExt/ClassFactory.h b/...ubiTShellExt/SubiTShellExt/ClassFactory.h → SubiT_ShellExt/ClassFactory.h
diff --git a/...lExt/SubiTShellExt/FileContextMenuExt.cpp → SubiT_ShellExt/FileContextMenuExt.cpp b/...lExt/SubiTShellExt/FileContextMenuExt.cpp → SubiT_ShellExt/FileContextMenuExt.cpp
diff --git a/...ellExt/SubiTShellExt/FileContextMenuExt.h → SubiT_ShellExt/FileContextMenuExt.h b/...ellExt/SubiTShellExt/FileContextMenuExt.h → SubiT_ShellExt/FileContextMenuExt.h
diff --git a/...t/SubiTShellExt/GlobalExportFunctions.def → SubiT_ShellExt/GlobalExportFunctions.def b/...t/SubiTShellExt/GlobalExportFunctions.def → SubiT_ShellExt/GlobalExportFunctions.def
diff --git a/...llExt/SubiTShellExt/SubiTShellExt.vcxproj → SubiT_ShellExt/SubiTShellExt.vcxproj b/...llExt/SubiTShellExt/SubiTShellExt.vcxproj → SubiT_ShellExt/SubiTShellExt.vcxproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -22,32 +22,36 @@
     <ProjectGuid>{10FDC9AB-5B02-44E2-B7E1-31746443146E}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>SubiTShellExt</RootNamespace>
+    <ProjectName>SubiT_ShellExt</ProjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v120_xp</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120_xp</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -151,7 +155,6 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <None Include="..\subit-contextmenu-icon.bmp" />
     <None Include="GlobalExportFunctions.def" />
   </ItemGroup>
   <ItemGroup>
@@ -179,7 +182,10 @@
     <ClCompile Include="FileContextMenuExt.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="SubiTShellExt.rc" />
+    <Image Include="icons\subit-contextmenu-icon.bmp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="SubiT_ShellExt.rc" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

diff --git a/...biTShellExt/SubiTShellExt.vcxproj.filters → SubiT_ShellExt/SubiTShellExt.vcxproj.filters b/...biTShellExt/SubiTShellExt.vcxproj.filters → SubiT_ShellExt/SubiTShellExt.vcxproj.filters
@@ -13,11 +13,11 @@
       <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
       <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
     </Filter>
+    <Filter Include="icons">
+      <UniqueIdentifier>{28dad1fa-4a5b-4d68-b309-eb9a58e06b84}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\subit-contextmenu-icon.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
     <None Include="GlobalExportFunctions.def">
       <Filter>Source Files</Filter>
     </None>
@@ -48,7 +48,12 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="SubiTShellExt.rc">
+    <Image Include="icons\subit-contextmenu-icon.bmp">
+      <Filter>icons</Filter>
+    </Image>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="SubiT_ShellExt.rc">
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>

diff --git a/...iTShellExt/SubiTShellExt/SubiTShellExt.rc → SubiT_ShellExt/SubiT_ShellExt.rc b/...iTShellExt/SubiTShellExt/SubiTShellExt.rc → SubiT_ShellExt/SubiT_ShellExt.rc
diff --git a/...s/SubiTShellExt/SubiTShellExt/dllmain.cpp → SubiT_ShellExt/dllmain.cpp b/...s/SubiTShellExt/SubiTShellExt/dllmain.cpp → SubiT_ShellExt/dllmain.cpp
diff --git a/.../SubiTShellExt/subit-contextmenu-icon.bmp → ...ShellExt/icons/subit-contextmenu-icon.bmp b/.../SubiTShellExt/subit-contextmenu-icon.bmp → ...ShellExt/icons/subit-contextmenu-icon.bmp
diff --git a/...es/SubiTShellExt/SubiTShellExt/resource.h → SubiT_ShellExt/resource.h b/...es/SubiTShellExt/SubiTShellExt/resource.h → SubiT_ShellExt/resource.h
diff --git a/...s/SubiTShellExt/SubiTShellExt/targetver.h → SubiT_ShellExt/targetver.h b/...s/SubiTShellExt/SubiTShellExt/targetver.h → SubiT_ShellExt/targetver.h
diff --git a/resources/SubiTShellExt/Release/SubiT.ShellExt.32.dll b/resources/SubiTShellExt/Release/SubiT.ShellExt.32.dll
diff --git a/resources/SubiTShellExt/SubiTShellExt.sln b/resources/SubiTShellExt/SubiTShellExt.sln
diff --git a/resources/SubiTShellExt/SubiTShellExt/SubiTShellExt.aps b/resources/SubiTShellExt/SubiTShellExt/SubiTShellExt.aps
diff --git a/resources/SubiTShellExt/icon.ico b/resources/SubiTShellExt/icon.ico
diff --git a/resources/SubiTShellExt/subit-icon.ico b/resources/SubiTShellExt/subit-icon.ico
diff --git a/resources/SubiTShellExt/subit-icon.png b/resources/SubiTShellExt/subit-icon.png
diff --git a/resources/SubiTShellExt/x64/Release/SubiT.ShellExt.64.dll b/resources/SubiTShellExt/x64/Release/SubiT.ShellExt.64.dll