summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/core/stdhelp/res/resource.rc (renamed from src/core/stdhelp/resource.rc)0
-rw-r--r--src/core/stdhelp/res/version.rc (renamed from src/core/stdhelp/version.rc)6
-rw-r--r--src/core/stdhelp/src/about.cpp (renamed from src/core/stdhelp/about.cpp)0
-rw-r--r--src/core/stdhelp/src/commonheaders.cpp (renamed from src/core/stdhelp/commonheaders.cpp)0
-rw-r--r--src/core/stdhelp/src/commonheaders.h (renamed from src/core/stdhelp/commonheaders.h)0
-rw-r--r--src/core/stdhelp/src/help.cpp (renamed from src/core/stdhelp/help.cpp)0
-rw-r--r--src/core/stdhelp/src/main.cpp (renamed from src/core/stdhelp/main.cpp)0
-rw-r--r--src/core/stdhelp/src/version.h12
-rw-r--r--src/core/stdhelp/stdhelp_10.vcxproj20
-rw-r--r--src/core/stdhelp/stdhelp_10.vcxproj.filters17
-rw-r--r--src/core/stdhelp/stdhelp_12.vcxproj20
-rw-r--r--src/core/stdhelp/stdhelp_12.vcxproj.filters17
-rw-r--r--src/core/stdhelp/version.h14
13 files changed, 51 insertions, 55 deletions
diff --git a/src/core/stdhelp/resource.rc b/src/core/stdhelp/res/resource.rc
index 98a5334dca..98a5334dca 100644
--- a/src/core/stdhelp/resource.rc
+++ b/src/core/stdhelp/res/resource.rc
diff --git a/src/core/stdhelp/version.rc b/src/core/stdhelp/res/version.rc
index d1da5e8d6a..5bfbab4754 100644
--- a/src/core/stdhelp/version.rc
+++ b/src/core/stdhelp/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/stdhelp/about.cpp b/src/core/stdhelp/src/about.cpp
index ba33896248..ba33896248 100644
--- a/src/core/stdhelp/about.cpp
+++ b/src/core/stdhelp/src/about.cpp
diff --git a/src/core/stdhelp/commonheaders.cpp b/src/core/stdhelp/src/commonheaders.cpp
index 95b2201163..95b2201163 100644
--- a/src/core/stdhelp/commonheaders.cpp
+++ b/src/core/stdhelp/src/commonheaders.cpp
diff --git a/src/core/stdhelp/commonheaders.h b/src/core/stdhelp/src/commonheaders.h
index 9caed79e40..9caed79e40 100644
--- a/src/core/stdhelp/commonheaders.h
+++ b/src/core/stdhelp/src/commonheaders.h
diff --git a/src/core/stdhelp/help.cpp b/src/core/stdhelp/src/help.cpp
index 7f7f449ae0..7f7f449ae0 100644
--- a/src/core/stdhelp/help.cpp
+++ b/src/core/stdhelp/src/help.cpp
diff --git a/src/core/stdhelp/main.cpp b/src/core/stdhelp/src/main.cpp
index ef2d77f8fa..ef2d77f8fa 100644
--- a/src/core/stdhelp/main.cpp
+++ b/src/core/stdhelp/src/main.cpp
diff --git a/src/core/stdhelp/src/version.h b/src/core/stdhelp/src/version.h
new file mode 100644
index 0000000000..64147ae010
--- /dev/null
+++ b/src/core/stdhelp/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 Help module"
+#define __FILENAME "stdhelp.dll"
+#define __DESCRIPTION "Core module for the Help/About dialog."
+#define __AUTHOR "Miranda NG Development Team"
+#define __AUTHOREMAIL ""
+#define __AUTHORWEB "http://miranda-ng.org/p/StdHelp/"
+#define __COPYRIGHT "© 2012 Miranda NG Development Team"
diff --git a/src/core/stdhelp/stdhelp_10.vcxproj b/src/core/stdhelp/stdhelp_10.vcxproj
index 60c7b0cebe..ac4df7abec 100644
--- a/src/core/stdhelp/stdhelp_10.vcxproj
+++ b/src/core/stdhelp/stdhelp_10.vcxproj
@@ -199,23 +199,21 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
- <ClCompile Include="about.cpp" />
- <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\about.cpp" />
+ <ClCompile Include="src\commonheaders.cpp">
+ <PrecompiledHeader>Create</PrecompiledHeader>
</ClCompile>
- <ClCompile Include="help.cpp" />
- <ClCompile Include="main.cpp" />
+ <ClCompile Include="src\help.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/stdhelp/stdhelp_10.vcxproj.filters b/src/core/stdhelp/stdhelp_10.vcxproj.filters
index 476d1343f6..d783a2d94c 100644
--- a/src/core/stdhelp/stdhelp_10.vcxproj.filters
+++ b/src/core/stdhelp/stdhelp_10.vcxproj.filters
@@ -15,32 +15,35 @@
</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="about.cpp">
+ <ClCompile Include="src\about.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="help.cpp">
+ <ClCompile Include="src\help.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/stdhelp/stdhelp_12.vcxproj b/src/core/stdhelp/stdhelp_12.vcxproj
index 958952672d..67af883c0b 100644
--- a/src/core/stdhelp/stdhelp_12.vcxproj
+++ b/src/core/stdhelp/stdhelp_12.vcxproj
@@ -202,23 +202,21 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
- <ClCompile Include="about.cpp" />
- <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\about.cpp" />
+ <ClCompile Include="src\commonheaders.cpp">
+ <PrecompiledHeader>Create</PrecompiledHeader>
</ClCompile>
- <ClCompile Include="help.cpp" />
- <ClCompile Include="main.cpp" />
+ <ClCompile Include="src\help.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/stdhelp/stdhelp_12.vcxproj.filters b/src/core/stdhelp/stdhelp_12.vcxproj.filters
index 476d1343f6..d783a2d94c 100644
--- a/src/core/stdhelp/stdhelp_12.vcxproj.filters
+++ b/src/core/stdhelp/stdhelp_12.vcxproj.filters
@@ -15,32 +15,35 @@
</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="about.cpp">
+ <ClCompile Include="src\about.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="help.cpp">
+ <ClCompile Include="src\help.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/stdhelp/version.h b/src/core/stdhelp/version.h
deleted file mode 100644
index b12b77e56e..0000000000
--- a/src/core/stdhelp/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 Help module"
-#define __INTERNAL_NAME "stdhelp"
-#define __FILENAME "stdhelp.dll"
-#define __DESCRIPTION "Core module for the Help/About dialog."
-#define __AUTHOR "Miranda NG Development Team"
-#define __AUTHOREMAIL ""
-#define __AUTHORWEB "http://miranda-ng.org/p/StdHelp/"
-#define __COPYRIGHT "© 2012 Miranda NG Development Team"