diff options
Diffstat (limited to 'src/core/stdfile')
| -rw-r--r-- | src/core/stdfile/res/resource.rc (renamed from src/core/stdfile/resource.rc) | 0 | ||||
| -rw-r--r-- | src/core/stdfile/res/version.rc (renamed from src/core/stdfile/version.rc) | 6 | ||||
| -rw-r--r-- | src/core/stdfile/src/commonheaders.cpp (renamed from src/core/stdfile/commonheaders.cpp) | 0 | ||||
| -rw-r--r-- | src/core/stdfile/src/commonheaders.h (renamed from src/core/stdfile/commonheaders.h) | 0 | ||||
| -rw-r--r-- | src/core/stdfile/src/file.cpp (renamed from src/core/stdfile/file.cpp) | 0 | ||||
| -rw-r--r-- | src/core/stdfile/src/file.h (renamed from src/core/stdfile/file.h) | 0 | ||||
| -rw-r--r-- | src/core/stdfile/src/fileexistsdlg.cpp (renamed from src/core/stdfile/fileexistsdlg.cpp) | 0 | ||||
| -rw-r--r-- | src/core/stdfile/src/fileopts.cpp (renamed from src/core/stdfile/fileopts.cpp) | 0 | ||||
| -rw-r--r-- | src/core/stdfile/src/filerecvdlg.cpp (renamed from src/core/stdfile/filerecvdlg.cpp) | 0 | ||||
| -rw-r--r-- | src/core/stdfile/src/filesenddlg.cpp (renamed from src/core/stdfile/filesenddlg.cpp) | 0 | ||||
| -rw-r--r-- | src/core/stdfile/src/filexferdlg.cpp (renamed from src/core/stdfile/filexferdlg.cpp) | 0 | ||||
| -rw-r--r-- | src/core/stdfile/src/ftmanager.cpp (renamed from src/core/stdfile/ftmanager.cpp) | 0 | ||||
| -rw-r--r-- | src/core/stdfile/src/main.cpp (renamed from src/core/stdfile/main.cpp) | 0 | ||||
| -rw-r--r-- | src/core/stdfile/src/version.h | 12 | ||||
| -rw-r--r-- | src/core/stdfile/stdfile_10.vcxproj | 32 | ||||
| -rw-r--r-- | src/core/stdfile/stdfile_10.vcxproj.filters | 29 | ||||
| -rw-r--r-- | src/core/stdfile/stdfile_12.vcxproj | 32 | ||||
| -rw-r--r-- | src/core/stdfile/stdfile_12.vcxproj.filters | 29 | ||||
| -rw-r--r-- | src/core/stdfile/version.h | 14 |
19 files changed, 75 insertions, 79 deletions
diff --git a/src/core/stdfile/resource.rc b/src/core/stdfile/res/resource.rc index ed986fbaf2..ed986fbaf2 100644 --- a/src/core/stdfile/resource.rc +++ b/src/core/stdfile/res/resource.rc diff --git a/src/core/stdfile/version.rc b/src/core/stdfile/res/version.rc index d1da5e8d6a..5bfbab4754 100644 --- a/src/core/stdfile/version.rc +++ b/src/core/stdfile/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/stdfile/commonheaders.cpp b/src/core/stdfile/src/commonheaders.cpp index 95b2201163..95b2201163 100644 --- a/src/core/stdfile/commonheaders.cpp +++ b/src/core/stdfile/src/commonheaders.cpp diff --git a/src/core/stdfile/commonheaders.h b/src/core/stdfile/src/commonheaders.h index 058ddb124d..058ddb124d 100644 --- a/src/core/stdfile/commonheaders.h +++ b/src/core/stdfile/src/commonheaders.h diff --git a/src/core/stdfile/file.cpp b/src/core/stdfile/src/file.cpp index 10a6269869..10a6269869 100644 --- a/src/core/stdfile/file.cpp +++ b/src/core/stdfile/src/file.cpp diff --git a/src/core/stdfile/file.h b/src/core/stdfile/src/file.h index f86bc57fe6..f86bc57fe6 100644 --- a/src/core/stdfile/file.h +++ b/src/core/stdfile/src/file.h diff --git a/src/core/stdfile/fileexistsdlg.cpp b/src/core/stdfile/src/fileexistsdlg.cpp index 1c3e7dedef..1c3e7dedef 100644 --- a/src/core/stdfile/fileexistsdlg.cpp +++ b/src/core/stdfile/src/fileexistsdlg.cpp diff --git a/src/core/stdfile/fileopts.cpp b/src/core/stdfile/src/fileopts.cpp index b76a25caa6..b76a25caa6 100644 --- a/src/core/stdfile/fileopts.cpp +++ b/src/core/stdfile/src/fileopts.cpp diff --git a/src/core/stdfile/filerecvdlg.cpp b/src/core/stdfile/src/filerecvdlg.cpp index 8a1ff1b5b7..8a1ff1b5b7 100644 --- a/src/core/stdfile/filerecvdlg.cpp +++ b/src/core/stdfile/src/filerecvdlg.cpp diff --git a/src/core/stdfile/filesenddlg.cpp b/src/core/stdfile/src/filesenddlg.cpp index 5abc5221ff..5abc5221ff 100644 --- a/src/core/stdfile/filesenddlg.cpp +++ b/src/core/stdfile/src/filesenddlg.cpp diff --git a/src/core/stdfile/filexferdlg.cpp b/src/core/stdfile/src/filexferdlg.cpp index b9d5980746..b9d5980746 100644 --- a/src/core/stdfile/filexferdlg.cpp +++ b/src/core/stdfile/src/filexferdlg.cpp diff --git a/src/core/stdfile/ftmanager.cpp b/src/core/stdfile/src/ftmanager.cpp index 9788776091..9788776091 100644 --- a/src/core/stdfile/ftmanager.cpp +++ b/src/core/stdfile/src/ftmanager.cpp diff --git a/src/core/stdfile/main.cpp b/src/core/stdfile/src/main.cpp index abf3e56402..abf3e56402 100644 --- a/src/core/stdfile/main.cpp +++ b/src/core/stdfile/src/main.cpp diff --git a/src/core/stdfile/src/version.h b/src/core/stdfile/src/version.h new file mode 100644 index 0000000000..9edd6f7c6a --- /dev/null +++ b/src/core/stdfile/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 File Transfers"
+#define __FILENAME "stdfile.dll"
+#define __DESCRIPTION "Core module for sending/receiving files."
+#define __AUTHOR "Miranda NG Development Team"
+#define __AUTHOREMAIL ""
+#define __AUTHORWEB "http://miranda-ng.org/p/StdFile/"
+#define __COPYRIGHT "© 2012 Miranda NG Development Team"
diff --git a/src/core/stdfile/stdfile_10.vcxproj b/src/core/stdfile/stdfile_10.vcxproj index a2fa5b249d..9a0a5214fb 100644 --- a/src/core/stdfile/stdfile_10.vcxproj +++ b/src/core/stdfile/stdfile_10.vcxproj @@ -199,29 +199,27 @@ </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="file.cpp" />
- <ClCompile Include="fileexistsdlg.cpp" />
- <ClCompile Include="fileopts.cpp" />
- <ClCompile Include="filerecvdlg.cpp" />
- <ClCompile Include="filesenddlg.cpp" />
- <ClCompile Include="filexferdlg.cpp" />
- <ClCompile Include="ftmanager.cpp" />
- <ClCompile Include="main.cpp" />
+ <ClCompile Include="src\file.cpp" />
+ <ClCompile Include="src\fileexistsdlg.cpp" />
+ <ClCompile Include="src\fileopts.cpp" />
+ <ClCompile Include="src\filerecvdlg.cpp" />
+ <ClCompile Include="src\filesenddlg.cpp" />
+ <ClCompile Include="src\filexferdlg.cpp" />
+ <ClCompile Include="src\ftmanager.cpp" />
+ <ClCompile Include="src\main.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\stdplug.h" />
- <ClInclude Include="commonheaders.h" />
- <ClInclude Include="file.h" />
+ <ClInclude Include="src\commonheaders.h" />
+ <ClInclude Include="src\file.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/stdfile/stdfile_10.vcxproj.filters b/src/core/stdfile/stdfile_10.vcxproj.filters index 596bc83397..b87e47dbdd 100644 --- a/src/core/stdfile/stdfile_10.vcxproj.filters +++ b/src/core/stdfile/stdfile_10.vcxproj.filters @@ -15,31 +15,31 @@ </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="file.cpp">
+ <ClCompile Include="src\file.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="fileexistsdlg.cpp">
+ <ClCompile Include="src\fileexistsdlg.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="fileopts.cpp">
+ <ClCompile Include="src\fileopts.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="filerecvdlg.cpp">
+ <ClCompile Include="src\filerecvdlg.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="filesenddlg.cpp">
+ <ClCompile Include="src\filesenddlg.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="filexferdlg.cpp">
+ <ClCompile Include="src\filexferdlg.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="ftmanager.cpp">
+ <ClCompile Include="src\ftmanager.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
@@ -47,18 +47,21 @@ <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="file.h">
+ <ClInclude Include="src\file.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/stdfile/stdfile_12.vcxproj b/src/core/stdfile/stdfile_12.vcxproj index 8ca6fd4484..9794c5d412 100644 --- a/src/core/stdfile/stdfile_12.vcxproj +++ b/src/core/stdfile/stdfile_12.vcxproj @@ -202,29 +202,27 @@ </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="file.cpp" />
- <ClCompile Include="fileexistsdlg.cpp" />
- <ClCompile Include="fileopts.cpp" />
- <ClCompile Include="filerecvdlg.cpp" />
- <ClCompile Include="filesenddlg.cpp" />
- <ClCompile Include="filexferdlg.cpp" />
- <ClCompile Include="ftmanager.cpp" />
- <ClCompile Include="main.cpp" />
+ <ClCompile Include="src\file.cpp" />
+ <ClCompile Include="src\fileexistsdlg.cpp" />
+ <ClCompile Include="src\fileopts.cpp" />
+ <ClCompile Include="src\filerecvdlg.cpp" />
+ <ClCompile Include="src\filesenddlg.cpp" />
+ <ClCompile Include="src\filexferdlg.cpp" />
+ <ClCompile Include="src\ftmanager.cpp" />
+ <ClCompile Include="src\main.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\stdplug.h" />
- <ClInclude Include="commonheaders.h" />
- <ClInclude Include="file.h" />
+ <ClInclude Include="src\commonheaders.h" />
+ <ClInclude Include="src\file.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/stdfile/stdfile_12.vcxproj.filters b/src/core/stdfile/stdfile_12.vcxproj.filters index 596bc83397..b87e47dbdd 100644 --- a/src/core/stdfile/stdfile_12.vcxproj.filters +++ b/src/core/stdfile/stdfile_12.vcxproj.filters @@ -15,31 +15,31 @@ </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="file.cpp">
+ <ClCompile Include="src\file.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="fileexistsdlg.cpp">
+ <ClCompile Include="src\fileexistsdlg.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="fileopts.cpp">
+ <ClCompile Include="src\fileopts.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="filerecvdlg.cpp">
+ <ClCompile Include="src\filerecvdlg.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="filesenddlg.cpp">
+ <ClCompile Include="src\filesenddlg.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="filexferdlg.cpp">
+ <ClCompile Include="src\filexferdlg.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="ftmanager.cpp">
+ <ClCompile Include="src\ftmanager.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
@@ -47,18 +47,21 @@ <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="file.h">
+ <ClInclude Include="src\file.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/stdfile/version.h b/src/core/stdfile/version.h deleted file mode 100644 index 2cdfc40da1..0000000000 --- a/src/core/stdfile/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 File Transfers"
-#define __INTERNAL_NAME "stdfile"
-#define __FILENAME "stdfile.dll"
-#define __DESCRIPTION "Core module for sending/receiving files."
-#define __AUTHOR "Miranda NG Development Team"
-#define __AUTHOREMAIL ""
-#define __AUTHORWEB "http://miranda-ng.org/p/StdFile/"
-#define __COPYRIGHT "© 2012 Miranda NG Development Team"
|