PasteIt and SensSS added to pro sln, some warnings deprecation, unneeded rc file deleted

git-svn-id: http://svn.miranda-ng.org/main/trunk@860 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

4 files changed, 24 insertions, 5 deletions

diff --git a/bin10/mir_full_pro.sln b/bin10/mir_full_pro.sln
index c6ece82813..3850bdff3b 100644
--- a/bin10/mir_full_pro.sln
+++ b/bin10/mir_full_pro.sln
@@ -321,6 +321,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MimCmd", "..\plugins\CmdLin
 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FTPFile", "..\plugins\FTPFileYM\ftpfile_10.vcxproj", "{73482497-9F57-4819-A9AB-5D841A9F072D}"

 EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PasteIt", "..\plugins\PasteIt\PasteIt.vcxproj", "{BAEBC482-CDA9-4053-A7D0-08222E85118E}"

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SendSS", "..\plugins\SendScreenshotPlus\SendSS_10.vcxproj", "{CEAD8BCF-1F22-4E00-9F6D-E33405B00552}"

+EndProject

 Global

 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

 		Debug|Win32 = Debug|Win32

@@ -1453,6 +1457,22 @@ Global
 		{73482497-9F57-4819-A9AB-5D841A9F072D}.Release|Win32.Build.0 = Release|Win32

 		{73482497-9F57-4819-A9AB-5D841A9F072D}.Release|x64.ActiveCfg = Release|x64

 		{73482497-9F57-4819-A9AB-5D841A9F072D}.Release|x64.Build.0 = Release|x64

+		{BAEBC482-CDA9-4053-A7D0-08222E85118E}.Debug|Win32.ActiveCfg = Debug|Win32

+		{BAEBC482-CDA9-4053-A7D0-08222E85118E}.Debug|Win32.Build.0 = Debug|Win32

+		{BAEBC482-CDA9-4053-A7D0-08222E85118E}.Debug|x64.ActiveCfg = Debug|x64

+		{BAEBC482-CDA9-4053-A7D0-08222E85118E}.Debug|x64.Build.0 = Debug|x64

+		{BAEBC482-CDA9-4053-A7D0-08222E85118E}.Release|Win32.ActiveCfg = Release|Win32

+		{BAEBC482-CDA9-4053-A7D0-08222E85118E}.Release|Win32.Build.0 = Release|Win32

+		{BAEBC482-CDA9-4053-A7D0-08222E85118E}.Release|x64.ActiveCfg = Release|x64

+		{BAEBC482-CDA9-4053-A7D0-08222E85118E}.Release|x64.Build.0 = Release|x64

+		{CEAD8BCF-1F22-4E00-9F6D-E33405B00552}.Debug|Win32.ActiveCfg = Debug|Win32

+		{CEAD8BCF-1F22-4E00-9F6D-E33405B00552}.Debug|Win32.Build.0 = Debug|Win32

+		{CEAD8BCF-1F22-4E00-9F6D-E33405B00552}.Debug|x64.ActiveCfg = Debug|x64

+		{CEAD8BCF-1F22-4E00-9F6D-E33405B00552}.Debug|x64.Build.0 = Debug|x64

+		{CEAD8BCF-1F22-4E00-9F6D-E33405B00552}.Release|Win32.ActiveCfg = Release|Win32

+		{CEAD8BCF-1F22-4E00-9F6D-E33405B00552}.Release|Win32.Build.0 = Release|Win32

+		{CEAD8BCF-1F22-4E00-9F6D-E33405B00552}.Release|x64.ActiveCfg = Release|x64

+		{CEAD8BCF-1F22-4E00-9F6D-E33405B00552}.Release|x64.Build.0 = Release|x64

 	EndGlobalSection

 	GlobalSection(SolutionProperties) = preSolution

 		HideSolutionNode = FALSE

@@ -1572,6 +1592,8 @@ Global
 		{0BB52326-02D5-4698-A180-24078DA5DA0E} = {0EF566FB-09FC-4F4D-9944-A0CDC82DF626}

 		{D7A3B8D0-425A-2286-8E2F-2C0BF1EE5C2E} = {0EF566FB-09FC-4F4D-9944-A0CDC82DF626}

 		{98DF7761-41D7-4C5C-9FFE-E5CCB3997783} = {0EF566FB-09FC-4F4D-9944-A0CDC82DF626}

+		{BAEBC482-CDA9-4053-A7D0-08222E85118E} = {0EF566FB-09FC-4F4D-9944-A0CDC82DF626}

+		{CEAD8BCF-1F22-4E00-9F6D-E33405B00552} = {0EF566FB-09FC-4F4D-9944-A0CDC82DF626}

 		{803DA965-4B1C-4BF3-A35E-A3A12D4121D3} = {76177119-A395-4739-AECE-25D4864198AD}

 		{3E6CEC79-5E93-4607-B10E-498586ECF6A6} = {76177119-A395-4739-AECE-25D4864198AD}

 		{3E727941-2854-4F64-ADA5-BF3BF104A4A3} = {76177119-A395-4739-AECE-25D4864198AD}

diff --git a/plugins/SendScreenshotPlus/SendSS_10.vcxproj b/plugins/SendScreenshotPlus/SendSS_10.vcxproj
index 5ecfde2a82..d58df0064f 100644
--- a/plugins/SendScreenshotPlus/SendSS_10.vcxproj
+++ b/plugins/SendScreenshotPlus/SendSS_10.vcxproj
@@ -74,7 +74,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

     <ClCompile>

       <AdditionalIncludeDirectories>sdk;..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <WarningLevel>Level3</WarningLevel>

       <Optimization>Full</Optimization>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

@@ -119,7 +119,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

     <ClCompile>

       <AdditionalIncludeDirectories>sdk;..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <WarningLevel>Level3</WarningLevel>

       <Optimization>Full</Optimization>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

diff --git a/plugins/SendScreenshotPlus/global.h b/plugins/SendScreenshotPlus/global.h
index 2710be0e17..48586f83d3 100644
--- a/plugins/SendScreenshotPlus/global.h
+++ b/plugins/SendScreenshotPlus/global.h
@@ -38,7 +38,6 @@ Last change by : $Author: ing.u.horn $
 #define _WIN32_IE		0x0601

 

 #define OEMRESOURCE

-#define _CRT_SECURE_NO_WARNINGS

 #define MIRANDA_VER		0x0A00

 

 // Windows includes

diff --git a/plugins/SendScreenshotPlus/resource_6.rc b/plugins/SendScreenshotPlus/resource_6.rc
deleted file mode 100644
index 7989eaa16b..0000000000
--- a/plugins/SendScreenshotPlus/resource_6.rc
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "resource.rc"

-#include "version.rc"