default folders structure

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

10 files changed, 116 insertions, 48 deletions

diff --git a/protocols/Skype/Skype.vcxproj b/protocols/Skype/Skype.vcxproj
index 8d42f31684..4a9be34c70 100644
--- a/protocols/Skype/Skype.vcxproj
+++ b/protocols/Skype/Skype.vcxproj
@@ -12,8 +12,6 @@
   </ItemGroup>

   <PropertyGroup Label="Globals">

     <ProjectGuid>{F5282DBC-756B-4071-B186-3E82C0E8E1F7}</ProjectGuid>

-    <Keyword>Win32Proj</Keyword>

-    <RootNamespace>Skype</RootNamespace>

   </PropertyGroup>

   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

@@ -37,14 +35,13 @@
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

   </ImportGroup>

   <PropertyGroup Label="UserMacros" />

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

-    <LinkIncremental>

-    </LinkIncremental>

-    <OutDir>$(SolutionDir)$(Configuration)\Plugins\</OutDir>

-    <IntDir>$(SolutionDir)$(Configuration)\Obj\$(ProjectName)\</IntDir>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

-    <LinkIncremental>false</LinkIncremental>

+  <PropertyGroup>

+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\Plugins\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\Obj\$(ProjectName)\</IntDir>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\Plugins\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\Obj\$(ProjectName)\</IntDir>

+    <IgnoreImportLibrary>true</IgnoreImportLibrary>

   </PropertyGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

     <ClCompile>

@@ -62,38 +59,55 @@
       <SubSystem>Windows</SubSystem>

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <AdditionalLibraryDirectories>$(SolutionDir)\lib</AdditionalLibraryDirectories>

-      <RandomizedBaseAddress>true</RandomizedBaseAddress>

+      <RandomizedBaseAddress>false</RandomizedBaseAddress>

       <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>

+      <AdditionalOptions>/PDBALTPATH:%_PDB%</AdditionalOptions>

       <AdditionalDependencies>$(SolutionDir)..\..\SkypeKit\SDK\interfaces\skype\cpp_embedded\build\skypekit-cyassl_lib.lib;$(SolutionDir)..\..\SkypeKit\SDK\interfaces\skype\cpp_embedded\build\skypekit-cppwrapper_2_lib.lib;%(AdditionalDependencies)</AdditionalDependencies>

     </Link>

+    <ResourceCompile>

+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

+    </ResourceCompile>

   </ItemDefinitionGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

     <ClCompile>

       <WarningLevel>Level3</WarningLevel>

-      <PrecompiledHeader>Use</PrecompiledHeader>

-      <Optimization>MaxSpeed</Optimization>

+      <PrecompiledHeader>NotUsing</PrecompiledHeader>

+      <Optimization>Full</Optimization>

       <FunctionLevelLinking>true</FunctionLevelLinking>

       <IntrinsicFunctions>true</IntrinsicFunctions>

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

+

+<AdditionalIncludeDirectories>..\..\include;..\..\plugins\ExternalAPI;..\..\SkypeKit\SDK\interfaces\skype\cpp_embedded\src\api;..\..\SkypeKit\SDK\interfaces\skype\cpp_embedded\src\ipc;..\..\..\SkypeKit\SDK\interfaces\skype\cpp_embedded\src\types;..\..\SkypeKit\SDK\interfaces\skype\cpp_embedded\src\platform\threading;..\..\SkypeKit\SDK\interfaces\skype\cpp_embedded\src\platform\threading\win;..\..\SkypeKit\SDK\ipc\cpp;..\..\SkypeKit\SDK\ipc\cpp\VideoBuffers;..\..\SkypeKit\SDK\ipc\cpp\platform\se;..\..\SkypeKit\SDK\ipc\cpp\ssl\cyassl\include;..\..\SkypeKit\SDK\ipc\cpp\ssl\cyassl\include\openssl;..\..\SkypeKit\SDK\ipc\cpp\ssl\cyassl\ctaocrypt\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PrecompiledHeaderFile>skype.h</PrecompiledHeaderFile>

+      <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>

     </ClCompile>

     <Link>

       <SubSystem>Windows</SubSystem>

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

       <OptimizeReferences>true</OptimizeReferences>

+      <RandomizedBaseAddress>false</RandomizedBaseAddress>

+      <AdditionalOptions>/PDBALTPATH:%_PDB%</AdditionalOptions>

+

+<AdditionalDependencies>$(SolutionDir)..\..\SkypeKit\SDK\interfaces\skype\cpp_embedded\build\skypekit-cyassl_lib.lib;$(SolutionDir)..\..\SkypeKit\SDK\interfaces\skype\cpp_embedded\build\skypekit-cppwrapper_2_lib.lib;%(AdditionalDependencies)</AdditionalDependencies>

     </Link>

+    <ResourceCompile>

+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

+    </ResourceCompile>

   </ItemDefinitionGroup>

   <ItemGroup>

-    <None Include="ReadMe.txt" />

+    <ClInclude Include="src\skype.h" />

+    <ClInclude Include="src\skype_proto.h" />

+    <ClInclude Include="src\version.h" />

   </ItemGroup>

   <ItemGroup>

-    <ClInclude Include="skype.h" />

-    <ClInclude Include="skype_proto.h" />

-    <ClInclude Include="version.h" />

+    <ClCompile Include="src\skype.cpp" />

+    <ClCompile Include="src\skype_proto.cpp" />

   </ItemGroup>

   <ItemGroup>

-    <ClCompile Include="skype.cpp" />

-    <ClCompile Include="skype_proto.cpp" />

+    <ResourceCompile Include="res\Version.rc" />

   </ItemGroup>

   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

   <ImportGroup Label="ExtensionTargets">

diff --git a/protocols/Skype/Skype.vcxproj.filters b/protocols/Skype/Skype.vcxproj.filters
index 911b429cea..ca6ffdb4e4 100644
--- a/protocols/Skype/Skype.vcxproj.filters
+++ b/protocols/Skype/Skype.vcxproj.filters
@@ -15,25 +15,27 @@
     </Filter>

   </ItemGroup>

   <ItemGroup>

-    <None Include="ReadMe.txt" />

-  </ItemGroup>

-  <ItemGroup>

-    <ClInclude Include="skype.h">

+    <ClInclude Include="src\skype.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="version.h">

+    <ClInclude Include="src\version.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="skype_proto.h">

+    <ClInclude Include="src\skype_proto.h">

       <Filter>Header Files</Filter>

     </ClInclude>

   </ItemGroup>

   <ItemGroup>

-    <ClCompile Include="skype_proto.cpp">

+    <ClCompile Include="src\skype_proto.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="skype.cpp">

+    <ClCompile Include="src\skype.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

   </ItemGroup>

+  <ItemGroup>

+    <ResourceCompile Include="res\Version.rc">

+      <Filter>Resource Files</Filter>

+    </ResourceCompile>

+  </ItemGroup>

 </Project>
\ No newline at end of file
diff --git a/protocols/Skype/Skype.vcxproj.user b/protocols/Skype/Skype.vcxproj.user
deleted file mode 100644
index 695b5c78b9..0000000000
--- a/protocols/Skype/Skype.vcxproj.user
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-</Project>
\ No newline at end of file
diff --git a/protocols/Skype/res/Version.rc b/protocols/Skype/res/Version.rc
new file mode 100644
index 0000000000..d741488c4f
--- /dev/null
+++ b/protocols/Skype/res/Version.rc
@@ -0,0 +1,42 @@
+// Microsoft Visual C++ generated resource script.

+//

+#ifdef APSTUDIO_INVOKED

+#error this file is not editable by Microsoft Visual C++

+#endif //APSTUDIO_INVOKED

+

+#include "afxres.h"

+#include "..\src\version.h"

+

+#ifdef _WIN32

+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL

+#endif //_WIN32

+

+VS_VERSION_INFO VERSIONINFO

+ FILEVERSION __FILEVERSION_STRING

+ PRODUCTVERSION __FILEVERSION_STRING

+ FILEFLAGSMASK 0x17L

+#ifdef _DEBUG

+ FILEFLAGS 0x1L

+#else

+ FILEFLAGS 0x0L

+#endif

+ FILEOS 0x4L

+ FILETYPE 0x0L

+ FILESUBTYPE 0x0L

+BEGIN

+    BLOCK "StringFileInfo"

+    BEGIN

+        BLOCK "000004b0"

+        BEGIN

+            VALUE "FileDescription", __DESCRIPTION

+            VALUE "InternalName", __PLUGIN_NAME

+            VALUE "LegalCopyright", __COPYRIGHT

+            VALUE "OriginalFilename", __FILENAME

+            VALUE "ProductName", __PLUGIN_NAME

+        END

+    END

+    BLOCK "VarFileInfo"

+    BEGIN

+        VALUE "Translation", 0x0, 1200

+    END

+END

diff --git a/protocols/Skype/skype.cpp b/protocols/Skype/src/skype.cpp
index 098ea96697..47e9ea0c5e 100644
--- a/protocols/Skype/skype.cpp
+++ b/protocols/Skype/src/skype.cpp
@@ -1,6 +1,4 @@
 #include "skype.h"

-#include "version.h"

-#include "skype_proto.h"

 

 int hLangpack;

 HINSTANCE g_hInstance;

@@ -8,13 +6,13 @@ HINSTANCE g_hInstance;
 PLUGININFOEX pluginInfo =

 {

 	sizeof(PLUGININFOEX),

-	"Skype Plugin",

-	__VERSION_DWORD,

-	"Provides basic support for Skype protocol.",

-	"unsane",

-	"",

-	"© 2012 unsane",

-	"http://miranda-ng.org/",

+	__PLUGIN_NAME,

+	PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),

+	__DESCRIPTION,

+	__AUTHOR,

+	__AUTHOREMAIL,

+	__COPYRIGHT,

+	__AUTHORWEB,

 	UNICODE_AWARE,

 	// {9C448C61-FC3F-42F9-B9F0-4A30E1CF8671}

 	{ 0x9c448c61, 0xfc3f, 0x42f9, { 0xb9, 0xf0, 0x4a, 0x30, 0xe1, 0xcf, 0x86, 0x71 } }

diff --git a/protocols/Skype/skype.h b/protocols/Skype/src/skype.h
index 7484ee7482..908b8bda21 100644
--- a/protocols/Skype/skype.h
+++ b/protocols/Skype/src/skype.h
@@ -1,11 +1,7 @@
-#pragma once

-

 #define MIRANDA_VER 0x0A00

 

 #include <windows.h>

 

-#pragma warning(push)

-#	pragma warning(disable:4312)

 #include <newpluginapi.h>

 #include <m_avatars.h>

 #include <m_button.h>

@@ -36,7 +32,9 @@
 #include <m_system_cpp.h>

 #include <m_hotkeys.h>

 #include <win2k.h>

-#pragma warning(pop)

+

+#include "version.h"

+#include "skype_proto.h"

 

 // skype

 

diff --git a/protocols/Skype/skype_proto.cpp b/protocols/Skype/src/skype_proto.cpp
index eede6c744e..b01329ca4e 100644
--- a/protocols/Skype/skype_proto.cpp
+++ b/protocols/Skype/src/skype_proto.cpp
@@ -1,4 +1,4 @@
-#include "skype_proto.h"

+#include "skype.h"

 

 CSkypeProto::CSkypeProto(const char* protoName, const TCHAR* userName)

 {

diff --git a/protocols/Skype/skype_proto.h b/protocols/Skype/src/skype_proto.h
index a4613fcb3b..a4613fcb3b 100644
--- a/protocols/Skype/skype_proto.h
+++ b/protocols/Skype/src/skype_proto.h
diff --git a/protocols/Skype/src/version.h b/protocols/Skype/src/version.h
new file mode 100644
index 0000000000..281233e9ec
--- /dev/null
+++ b/protocols/Skype/src/version.h
@@ -0,0 +1,20 @@
+#define __MAJOR_VERSION				0

+#define __MINOR_VERSION				0

+#define __RELEASE_NUM				0

+#define __BUILD_NUM					1

+

+#define __FILEVERSION_STRING		__MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM

+#define __FILEVERSION_DOTS			__MAJOR_VERSION.__MINOR_VERSION.__RELEASE_NUM.__BUILD_NUM

+

+#define __STRINGIFY_IMPL(x)			#x

+#define __STRINGIFY(x)				__STRINGIFY_IMPL(x)

+#define __VERSION_STRING			__STRINGIFY(__FILEVERSION_DOTS)

+

+#define __PLUGIN_NAME				"Skype Plugin"

+#define __INTERNAL_NAME				"Skype"

+#define __FILENAME					"Skype.dll"

+#define __DESCRIPTION 				"Provides basic support for Skype protocol."

+#define __AUTHOR					"Unsane, Mataes"

+#define __AUTHOREMAIL				"mataes2007@gmail.com"

+#define __AUTHORWEB					"http://miranda-ng.org/"

+#define __COPYRIGHT					"© 2012 Unsane, Mataes"

diff --git a/protocols/Skype/version.h b/protocols/Skype/version.h
deleted file mode 100644
index d66bebe741..0000000000
--- a/protocols/Skype/version.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#pragma once

-

-#define __VERSION_DWORD             PLUGIN_MAKE_VERSION(0, 1, 0, 0)
\ No newline at end of file