files structure changed

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

12 files changed, 47 insertions, 51 deletions

diff --git a/src/core/stduihist/resource.rc b/src/core/stduihist/res/resource.rc
index 1c0884e4a2..1c0884e4a2 100644
--- a/src/core/stduihist/resource.rc
+++ b/src/core/stduihist/res/resource.rc
diff --git a/src/core/stduihist/version.rc b/src/core/stduihist/res/version.rc
index d1da5e8d6a..5bfbab4754 100644
--- a/src/core/stduihist/version.rc
+++ b/src/core/stduihist/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/stduihist/commonheaders.cpp b/src/core/stduihist/src/commonheaders.cpp
index 95b2201163..95b2201163 100644
--- a/src/core/stduihist/commonheaders.cpp
+++ b/src/core/stduihist/src/commonheaders.cpp
diff --git a/src/core/stduihist/commonheaders.h b/src/core/stduihist/src/commonheaders.h
index f5744ec23b..f5744ec23b 100644
--- a/src/core/stduihist/commonheaders.h
+++ b/src/core/stduihist/src/commonheaders.h
diff --git a/src/core/stduihist/history.cpp b/src/core/stduihist/src/history.cpp
index 62f58b453b..62f58b453b 100644
--- a/src/core/stduihist/history.cpp
+++ b/src/core/stduihist/src/history.cpp
diff --git a/src/core/stduihist/main.cpp b/src/core/stduihist/src/main.cpp
index a44b9fee5f..a44b9fee5f 100644
--- a/src/core/stduihist/main.cpp
+++ b/src/core/stduihist/src/main.cpp
diff --git a/src/core/stduihist/src/version.h b/src/core/stduihist/src/version.h
new file mode 100644
index 0000000000..d15d8de7d6
--- /dev/null
+++ b/src/core/stduihist/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 History UI"

+#define __FILENAME               "stduihist.dll"

+#define __DESCRIPTION            "Core module for built-in history viewer."

+#define __AUTHOR                 "Miranda NG Development Team"

+#define __AUTHOREMAIL            ""

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

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

diff --git a/src/core/stduihist/stduihist_10.vcxproj b/src/core/stduihist/stduihist_10.vcxproj
index b79bd4ee4d..0ff5edc20d 100644
--- a/src/core/stduihist/stduihist_10.vcxproj
+++ b/src/core/stduihist/stduihist_10.vcxproj
@@ -199,22 +199,20 @@
     </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="history.cpp" />

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

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

+    <ClCompile Include="src\main.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/stduihist/stduihist_10.vcxproj.filters b/src/core/stduihist/stduihist_10.vcxproj.filters
index 4b215c60e3..c2a89081c1 100644
--- a/src/core/stduihist/stduihist_10.vcxproj.filters
+++ b/src/core/stduihist/stduihist_10.vcxproj.filters
@@ -15,29 +15,32 @@
     </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="history.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

   </ItemGroup>

   <ItemGroup>

-    <ClInclude Include="commonheaders.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

     <ClInclude Include="..\stdplug.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/stduihist/stduihist_12.vcxproj b/src/core/stduihist/stduihist_12.vcxproj
index d2119995d4..cb0e16ee03 100644
--- a/src/core/stduihist/stduihist_12.vcxproj
+++ b/src/core/stduihist/stduihist_12.vcxproj
@@ -202,22 +202,20 @@
     </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="history.cpp" />

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

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

+    <ClCompile Include="src\main.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/stduihist/stduihist_12.vcxproj.filters b/src/core/stduihist/stduihist_12.vcxproj.filters
index 4b215c60e3..c2a89081c1 100644
--- a/src/core/stduihist/stduihist_12.vcxproj.filters
+++ b/src/core/stduihist/stduihist_12.vcxproj.filters
@@ -15,29 +15,32 @@
     </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="history.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

   </ItemGroup>

   <ItemGroup>

-    <ClInclude Include="commonheaders.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

     <ClInclude Include="..\stdplug.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/stduihist/version.h b/src/core/stduihist/version.h
deleted file mode 100644
index 6f8c320c5f..0000000000
--- a/src/core/stduihist/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 History UI"

-#define __INTERNAL_NAME            "stduihist"

-#define __FILENAME               "stduihist.dll"

-#define __DESCRIPTION             "Core module for built-in history viewer."

-#define __AUTHOR                 "Miranda NG Development Team"

-#define __AUTHOREMAIL            ""

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

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