files structure changed

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

16 files changed, 63 insertions, 67 deletions

diff --git a/src/core/stdcrypt/resource.rc b/src/core/stdcrypt/res/resource.rc
index 5bb57eb276..5bb57eb276 100644
--- a/src/core/stdcrypt/resource.rc
+++ b/src/core/stdcrypt/res/resource.rc
diff --git a/src/core/stdcrypt/version.rc b/src/core/stdcrypt/res/version.rc
index d1da5e8d6a..5bfbab4754 100644
--- a/src/core/stdcrypt/version.rc
+++ b/src/core/stdcrypt/res/version.rc
@@ -5,11 +5,7 @@
 #endif //APSTUDIO_INVOKED

 

 #include "afxres.h"

-#include "version.h"

-

-#ifdef _WIN32

-LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL

-#endif //_WIN32

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

 

 VS_VERSION_INFO VERSIONINFO

  FILEVERSION __FILEVERSION_STRING

diff --git a/src/core/stdcrypt/Rijndael.cpp b/src/core/stdcrypt/src/Rijndael.cpp
index 95cc317099..95cc317099 100644
--- a/src/core/stdcrypt/Rijndael.cpp
+++ b/src/core/stdcrypt/src/Rijndael.cpp
diff --git a/src/core/stdcrypt/Rijndael.h b/src/core/stdcrypt/src/Rijndael.h
index a69409b929..a69409b929 100644
--- a/src/core/stdcrypt/Rijndael.h
+++ b/src/core/stdcrypt/src/Rijndael.h
diff --git a/src/core/stdcrypt/commonheaders.cpp b/src/core/stdcrypt/src/commonheaders.cpp
index 95b2201163..95b2201163 100644
--- a/src/core/stdcrypt/commonheaders.cpp
+++ b/src/core/stdcrypt/src/commonheaders.cpp
diff --git a/src/core/stdcrypt/commonheaders.h b/src/core/stdcrypt/src/commonheaders.h
index a86f828180..a86f828180 100644
--- a/src/core/stdcrypt/commonheaders.h
+++ b/src/core/stdcrypt/src/commonheaders.h
diff --git a/src/core/stdcrypt/encrypt.cpp b/src/core/stdcrypt/src/encrypt.cpp
index c08ec19529..c08ec19529 100644
--- a/src/core/stdcrypt/encrypt.cpp
+++ b/src/core/stdcrypt/src/encrypt.cpp
diff --git a/src/core/stdcrypt/main.cpp b/src/core/stdcrypt/src/main.cpp
index 5c2d8b3084..5c2d8b3084 100644
--- a/src/core/stdcrypt/main.cpp
+++ b/src/core/stdcrypt/src/main.cpp
diff --git a/src/core/stdcrypt/stdcrypt.h b/src/core/stdcrypt/src/stdcrypt.h
index 7b3df473d5..7b3df473d5 100644
--- a/src/core/stdcrypt/stdcrypt.h
+++ b/src/core/stdcrypt/src/stdcrypt.h
diff --git a/src/core/stdcrypt/utils.cpp b/src/core/stdcrypt/src/utils.cpp
index 85f6eb53b1..85f6eb53b1 100644
--- a/src/core/stdcrypt/utils.cpp
+++ b/src/core/stdcrypt/src/utils.cpp
diff --git a/src/core/stdcrypt/src/version.h b/src/core/stdcrypt/src/version.h
new file mode 100644
index 0000000000..bf1c6d662e
--- /dev/null
+++ b/src/core/stdcrypt/src/version.h
@@ -0,0 +1,12 @@
+#include <m_version.h>

+

+#define __FILEVERSION_STRING     MIRANDA_VERSION_FILEVERSION

+#define __VERSION_STRING         MIRANDA_VERSION_STRING

+

+#define __PLUGIN_NAME            "Standard encrypting module"

+#define __FILENAME               "stdcrypt.dll"

+#define __DESCRIPTION            "Core module for encryption."

+#define __AUTHOR                 "Miranda NG Development Team"

+#define __AUTHOREMAIL            ""

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

+#define __COPYRIGHT              "© 2012-14 Miranda NG Development Team"

diff --git a/src/core/stdcrypt/stdcrypt_10.vcxproj b/src/core/stdcrypt/stdcrypt_10.vcxproj
index 8425e9bfde..4bb55e0958 100644
--- a/src/core/stdcrypt/stdcrypt_10.vcxproj
+++ b/src/core/stdcrypt/stdcrypt_10.vcxproj
@@ -199,27 +199,25 @@
     </Link>

   </ItemDefinitionGroup>

   <ItemGroup>

-    <ClCompile Include="commonheaders.cpp">

-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>

-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>

-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>

-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>

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

+      <PrecompiledHeader>Create</PrecompiledHeader>

     </ClCompile>

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

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

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

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

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

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

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

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

   </ItemGroup>

   <ItemGroup>

     <ClInclude Include="..\..\..\include\m_crypto.h" />

     <ClInclude Include="..\stdplug.h" />

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

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

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

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

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

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

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

   </ItemGroup>

   <ItemGroup>

-    <ResourceCompile Include="resource.rc" />

-    <ResourceCompile Include="version.rc" />

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

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

   </ItemGroup>

   <ItemGroup>

     <ProjectReference Include="..\..\..\plugins\Zlib\zlib_10.vcxproj">

diff --git a/src/core/stdcrypt/stdcrypt_10.vcxproj.filters b/src/core/stdcrypt/stdcrypt_10.vcxproj.filters
index 970fd73212..4ac4b666d6 100644
--- a/src/core/stdcrypt/stdcrypt_10.vcxproj.filters
+++ b/src/core/stdcrypt/stdcrypt_10.vcxproj.filters
@@ -15,19 +15,19 @@
     </Filter>

   </ItemGroup>

   <ItemGroup>

-    <ClCompile Include="commonheaders.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="main.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="encrypt.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="Rijndael.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="utils.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

   </ItemGroup>

@@ -35,24 +35,27 @@
     <ClInclude Include="..\stdplug.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="commonheaders.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

     <ClInclude Include="..\..\..\include\m_crypto.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="stdcrypt.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="Rijndael.h">

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

+      <Filter>Header Files</Filter>

+    </ClInclude>

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

       <Filter>Header Files</Filter>

     </ClInclude>

   </ItemGroup>

   <ItemGroup>

-    <ResourceCompile Include="version.rc">

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

       <Filter>Resource Files</Filter>

     </ResourceCompile>

-    <ResourceCompile Include="resource.rc">

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

       <Filter>Resource Files</Filter>

     </ResourceCompile>

   </ItemGroup>

diff --git a/src/core/stdcrypt/stdcrypt_12.vcxproj b/src/core/stdcrypt/stdcrypt_12.vcxproj
index 014a601a85..f75771d2e6 100644
--- a/src/core/stdcrypt/stdcrypt_12.vcxproj
+++ b/src/core/stdcrypt/stdcrypt_12.vcxproj
@@ -202,27 +202,25 @@
     </Link>

   </ItemDefinitionGroup>

   <ItemGroup>

-    <ClCompile Include="commonheaders.cpp">

-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>

-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>

-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>

-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>

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

+      <PrecompiledHeader>Create</PrecompiledHeader>

     </ClCompile>

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

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

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

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

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

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

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

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

   </ItemGroup>

   <ItemGroup>

     <ClInclude Include="..\..\..\include\m_crypto.h" />

     <ClInclude Include="..\stdplug.h" />

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

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

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

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

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

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

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

   </ItemGroup>

   <ItemGroup>

-    <ResourceCompile Include="resource.rc" />

-    <ResourceCompile Include="version.rc" />

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

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

   </ItemGroup>

   <ItemGroup>

     <ProjectReference Include="..\..\..\plugins\Zlib\zlib_12.vcxproj">

diff --git a/src/core/stdcrypt/stdcrypt_12.vcxproj.filters b/src/core/stdcrypt/stdcrypt_12.vcxproj.filters
index 970fd73212..4ac4b666d6 100644
--- a/src/core/stdcrypt/stdcrypt_12.vcxproj.filters
+++ b/src/core/stdcrypt/stdcrypt_12.vcxproj.filters
@@ -15,19 +15,19 @@
     </Filter>

   </ItemGroup>

   <ItemGroup>

-    <ClCompile Include="commonheaders.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="main.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="encrypt.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="Rijndael.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="utils.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

   </ItemGroup>

@@ -35,24 +35,27 @@
     <ClInclude Include="..\stdplug.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="commonheaders.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

     <ClInclude Include="..\..\..\include\m_crypto.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="stdcrypt.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="Rijndael.h">

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

+      <Filter>Header Files</Filter>

+    </ClInclude>

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

       <Filter>Header Files</Filter>

     </ClInclude>

   </ItemGroup>

   <ItemGroup>

-    <ResourceCompile Include="version.rc">

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

       <Filter>Resource Files</Filter>

     </ResourceCompile>

-    <ResourceCompile Include="resource.rc">

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

       <Filter>Resource Files</Filter>

     </ResourceCompile>

   </ItemGroup>

diff --git a/src/core/stdcrypt/version.h b/src/core/stdcrypt/version.h
deleted file mode 100644
index e5350abb5a..0000000000
--- a/src/core/stdcrypt/version.h
+++ /dev/null
@@ -1,14 +0,0 @@
-

-#include <m_version.h>

-

-#define __FILEVERSION_STRING      MIRANDA_VERSION_FILEVERSION

-#define __VERSION_STRING         MIRANDA_VERSION_STRING

-

-#define __PLUGIN_NAME            "Standard encrypting module"

-#define __INTERNAL_NAME            "stdcrypt"

-#define __FILENAME               "stdcrypt.dll"

-#define __DESCRIPTION             "Core module for encryption."

-#define __AUTHOR                 "Miranda NG Development Team"

-#define __AUTHOREMAIL            ""

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

-#define __COPYRIGHT               "© 2012-14 Miranda NG Development Team"