files structure changed

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

14 files changed, 55 insertions, 59 deletions

diff --git a/src/core/stduserinfo/resource.rc b/src/core/stduserinfo/res/resource.rc
index 9964d2943d..9964d2943d 100644
--- a/src/core/stduserinfo/resource.rc
+++ b/src/core/stduserinfo/res/resource.rc
diff --git a/src/core/stduserinfo/version.rc b/src/core/stduserinfo/res/version.rc
index d1da5e8d6a..5bfbab4754 100644
--- a/src/core/stduserinfo/version.rc
+++ b/src/core/stduserinfo/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/stduserinfo/commonheaders.cpp b/src/core/stduserinfo/src/commonheaders.cpp
index 95b2201163..95b2201163 100644
--- a/src/core/stduserinfo/commonheaders.cpp
+++ b/src/core/stduserinfo/src/commonheaders.cpp
diff --git a/src/core/stduserinfo/commonheaders.h b/src/core/stduserinfo/src/commonheaders.h
index f531d749f3..f531d749f3 100644
--- a/src/core/stduserinfo/commonheaders.h
+++ b/src/core/stduserinfo/src/commonheaders.h
diff --git a/src/core/stduserinfo/contactinfo.cpp b/src/core/stduserinfo/src/contactinfo.cpp
index dd3984b1c8..dd3984b1c8 100644
--- a/src/core/stduserinfo/contactinfo.cpp
+++ b/src/core/stduserinfo/src/contactinfo.cpp
diff --git a/src/core/stduserinfo/main.cpp b/src/core/stduserinfo/src/main.cpp
index b0e4e60776..b0e4e60776 100644
--- a/src/core/stduserinfo/main.cpp
+++ b/src/core/stduserinfo/src/main.cpp
diff --git a/src/core/stduserinfo/stdinfo.cpp b/src/core/stduserinfo/src/stdinfo.cpp
index 44b81671a5..44b81671a5 100644
--- a/src/core/stduserinfo/stdinfo.cpp
+++ b/src/core/stduserinfo/src/stdinfo.cpp
diff --git a/src/core/stduserinfo/userinfo.cpp b/src/core/stduserinfo/src/userinfo.cpp
index e3a48d3837..e3a48d3837 100644
--- a/src/core/stduserinfo/userinfo.cpp
+++ b/src/core/stduserinfo/src/userinfo.cpp
diff --git a/src/core/stduserinfo/src/version.h b/src/core/stduserinfo/src/version.h
new file mode 100644
index 0000000000..4a01547508
--- /dev/null
+++ b/src/core/stduserinfo/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 User Info module"

+#define __FILENAME               "stduserinfo.dll"

+#define __DESCRIPTION            "Core module for providing user information."

+#define __AUTHOR                 "Miranda NG Development Team"

+#define __AUTHOREMAIL            ""

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

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

diff --git a/src/core/stduserinfo/stduserinfo_10.vcxproj b/src/core/stduserinfo/stduserinfo_10.vcxproj
index 719d641237..d04fcf9a96 100644
--- a/src/core/stduserinfo/stduserinfo_10.vcxproj
+++ b/src/core/stduserinfo/stduserinfo_10.vcxproj
@@ -199,24 +199,22 @@
     </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="contactinfo.cpp" />

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

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

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

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

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

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

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

   </ItemGroup>

   <ItemGroup>

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

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

+    <ClInclude Include="src\commonheaders.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>

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

   <ImportGroup Label="ExtensionTargets">

diff --git a/src/core/stduserinfo/stduserinfo_10.vcxproj.filters b/src/core/stduserinfo/stduserinfo_10.vcxproj.filters
index ac101b1384..dd6ca7bfcf 100644
--- a/src/core/stduserinfo/stduserinfo_10.vcxproj.filters
+++ b/src/core/stduserinfo/stduserinfo_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="contactinfo.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="main.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="stdinfo.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="userinfo.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

   </ItemGroup>

@@ -35,15 +35,18 @@
     <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="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/stduserinfo/stduserinfo_12.vcxproj b/src/core/stduserinfo/stduserinfo_12.vcxproj
index ee355ee519..d6df81b469 100644
--- a/src/core/stduserinfo/stduserinfo_12.vcxproj
+++ b/src/core/stduserinfo/stduserinfo_12.vcxproj
@@ -202,24 +202,22 @@
     </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="contactinfo.cpp" />

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

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

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

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

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

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

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

   </ItemGroup>

   <ItemGroup>

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

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

+    <ClInclude Include="src\commonheaders.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>

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

   <ImportGroup Label="ExtensionTargets">

diff --git a/src/core/stduserinfo/stduserinfo_12.vcxproj.filters b/src/core/stduserinfo/stduserinfo_12.vcxproj.filters
index ac101b1384..dd6ca7bfcf 100644
--- a/src/core/stduserinfo/stduserinfo_12.vcxproj.filters
+++ b/src/core/stduserinfo/stduserinfo_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="contactinfo.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="main.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="stdinfo.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="userinfo.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

   </ItemGroup>

@@ -35,15 +35,18 @@
     <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="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/stduserinfo/version.h b/src/core/stduserinfo/version.h
deleted file mode 100644
index 4d33057048..0000000000
--- a/src/core/stduserinfo/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 User Info module"

-#define __INTERNAL_NAME            "stduserinfo"

-#define __FILENAME               "stduserinfo.dll"

-#define __DESCRIPTION             "Core module for providing user information."

-#define __AUTHOR                 "Miranda NG Development Team"

-#define __AUTHOREMAIL            ""

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

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