summaryrefslogtreecommitdiff
path: root/plugins/PackUpdater
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/PackUpdater')
-rw-r--r--plugins/PackUpdater/Docs/packupdater-translation.txt (renamed from plugins/PackUpdater/packupdater-translation.txt)0
-rw-r--r--plugins/PackUpdater/PackUpdater_10.vcxproj28
-rw-r--r--plugins/PackUpdater/PackUpdater_10.vcxproj.filters22
-rw-r--r--plugins/PackUpdater/Res/Resource.rc (renamed from plugins/PackUpdater/Resource.rc)12
-rw-r--r--plugins/PackUpdater/Res/Version.rc (renamed from plugins/PackUpdater/Version.rc)2
-rw-r--r--plugins/PackUpdater/Src/Common.h6
-rw-r--r--plugins/PackUpdater/Src/Version.h (renamed from plugins/PackUpdater/Version.h)0
-rw-r--r--plugins/PackUpdater/Src/resource.h (renamed from plugins/PackUpdater/resource.h)0
8 files changed, 23 insertions, 47 deletions
diff --git a/plugins/PackUpdater/packupdater-translation.txt b/plugins/PackUpdater/Docs/packupdater-translation.txt
index 5945f1f25b..5945f1f25b 100644
--- a/plugins/PackUpdater/packupdater-translation.txt
+++ b/plugins/PackUpdater/Docs/packupdater-translation.txt
diff --git a/plugins/PackUpdater/PackUpdater_10.vcxproj b/plugins/PackUpdater/PackUpdater_10.vcxproj
index 188347fac3..711a1586c3 100644
--- a/plugins/PackUpdater/PackUpdater_10.vcxproj
+++ b/plugins/PackUpdater/PackUpdater_10.vcxproj
@@ -73,11 +73,10 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;PACKUPDATER_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- <DisableSpecificWarnings>4996</DisableSpecificWarnings>
<PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>Common.h</PrecompiledHeaderFile>
</ClCompile>
@@ -97,10 +96,9 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;PACKUPDATER_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<WarningLevel>Level3</WarningLevel>
- <DisableSpecificWarnings>4996</DisableSpecificWarnings>
<PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>Common.h</PrecompiledHeaderFile>
</ClCompile>
@@ -121,9 +119,8 @@
<Optimization>Full</Optimization>
<FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
<AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PACKUPDATER_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<WarningLevel>Level3</WarningLevel>
- <DisableSpecificWarnings>4996</DisableSpecificWarnings>
<PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>Common.h</PrecompiledHeaderFile>
</ClCompile>
@@ -133,8 +130,6 @@
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
- <AdditionalManifestDependencies>
- </AdditionalManifestDependencies>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalLibraryDirectories>$(SolutionDir)\lib</AdditionalLibraryDirectories>
</Link>
@@ -148,9 +143,8 @@
<Optimization>Full</Optimization>
<FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
<AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;PACKUPDATER_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<WarningLevel>Level3</WarningLevel>
- <DisableSpecificWarnings>4996</DisableSpecificWarnings>
<PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>Common.h</PrecompiledHeaderFile>
</ClCompile>
@@ -169,14 +163,14 @@
</ResourceCompile>
</ItemDefinitionGroup>
<ItemGroup>
- <ResourceCompile Include="Resource.rc" />
- <ResourceCompile Include="Version.rc" />
+ <ResourceCompile Include="res\Resource.rc" />
+ <ResourceCompile Include="res\Version.rc" />
</ItemGroup>
<ItemGroup>
- <ClInclude Include="Resource.h" />
+ <ClInclude Include="src\Resource.h" />
<ClInclude Include="Src\Common.h" />
<ClInclude Include="Src\Notifications.h" />
- <ClInclude Include="Version.h" />
+ <ClInclude Include="src\Version.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="Src\Events.cpp" />
@@ -187,12 +181,6 @@
</ClCompile>
<ClCompile Include="Src\Utils.cpp" />
</ItemGroup>
- <ItemGroup>
- <None Include="res\btnClose.ico" />
- <None Include="res\btnOk.ico" />
- <None Include="res\delete.ico" />
- <None Include="res\menu.ico" />
- </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
diff --git a/plugins/PackUpdater/PackUpdater_10.vcxproj.filters b/plugins/PackUpdater/PackUpdater_10.vcxproj.filters
index 87e02ef233..8cf91236fb 100644
--- a/plugins/PackUpdater/PackUpdater_10.vcxproj.filters
+++ b/plugins/PackUpdater/PackUpdater_10.vcxproj.filters
@@ -15,18 +15,18 @@
</Filter>
</ItemGroup>
<ItemGroup>
- <ResourceCompile Include="Resource.rc">
+ <ResourceCompile Include="res\Resource.rc">
<Filter>Resource Files</Filter>
</ResourceCompile>
- <ResourceCompile Include="Version.rc">
+ <ResourceCompile Include="res\Version.rc">
<Filter>Resource Files</Filter>
</ResourceCompile>
</ItemGroup>
<ItemGroup>
- <ClInclude Include="Resource.h">
+ <ClInclude Include="src\Resource.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="Version.h">
+ <ClInclude Include="src\Version.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Src\Common.h">
@@ -53,18 +53,4 @@
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
- <ItemGroup>
- <None Include="res\menu.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\delete.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\btnOk.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\btnClose.ico">
- <Filter>Resource Files</Filter>
- </None>
- </ItemGroup>
</Project> \ No newline at end of file
diff --git a/plugins/PackUpdater/Resource.rc b/plugins/PackUpdater/Res/Resource.rc
index 3f4039b06c..a0cb6f52a3 100644
--- a/plugins/PackUpdater/Resource.rc
+++ b/plugins/PackUpdater/Res/Resource.rc
@@ -1,6 +1,6 @@
// Microsoft Visual C++ generated resource script.
//
-#include "resource.h"
+#include "..\src\resource.h"
#define APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
@@ -26,10 +26,10 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
// Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems.
-IDI_MENU ICON "res/menu.ico"
-IDI_DELETE ICON "res/delete.ico"
-IDI_OK ICON "res/btnOk.ico"
-IDI_CANCEL ICON "res/btnClose.ico"
+IDI_MENU ICON "menu.ico"
+IDI_DELETE ICON "delete.ico"
+IDI_OK ICON "btnOk.ico"
+IDI_CANCEL ICON "btnClose.ico"
/////////////////////////////////////////////////////////////////////////////
//
@@ -141,7 +141,7 @@ END
1 TEXTINCLUDE
BEGIN
- "resource.h\0"
+ "..\\src\\resource.h\0"
END
2 TEXTINCLUDE
diff --git a/plugins/PackUpdater/Version.rc b/plugins/PackUpdater/Res/Version.rc
index d1da5e8d6a..d741488c4f 100644
--- a/plugins/PackUpdater/Version.rc
+++ b/plugins/PackUpdater/Res/Version.rc
@@ -5,7 +5,7 @@
#endif //APSTUDIO_INVOKED
#include "afxres.h"
-#include "version.h"
+#include "..\src\version.h"
#ifdef _WIN32
LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
diff --git a/plugins/PackUpdater/Src/Common.h b/plugins/PackUpdater/Src/Common.h
index 3e38692d49..f32ab13461 100644
--- a/plugins/PackUpdater/Src/Common.h
+++ b/plugins/PackUpdater/Src/Common.h
@@ -17,6 +17,8 @@ not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA.
*/
+#define _CRT_SECURE_NO_WARNINGS
+
#define MIRANDA_VER 0x0A00
// Windows Header Files:
@@ -45,8 +47,8 @@ Boston, MA 02111-1307, USA.
#include <m_folders.h>
#include "m_popup2.h"
-#include "..\version.h"
-#include "..\resource.h"
+#include "version.h"
+#include "resource.h"
#include "Notifications.h"
#define MODNAME "PackUpdater"
diff --git a/plugins/PackUpdater/Version.h b/plugins/PackUpdater/Src/Version.h
index b0c7fcfd58..b0c7fcfd58 100644
--- a/plugins/PackUpdater/Version.h
+++ b/plugins/PackUpdater/Src/Version.h
diff --git a/plugins/PackUpdater/resource.h b/plugins/PackUpdater/Src/resource.h
index fd3b5c14f0..fd3b5c14f0 100644
--- a/plugins/PackUpdater/resource.h
+++ b/plugins/PackUpdater/Src/resource.h
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-18 17:20:01 +0000