summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--plugins/PackUpdater/PackUpdater_10.vcxproj14
-rw-r--r--plugins/PackUpdater/PackUpdater_10.vcxproj.filters14
-rw-r--r--plugins/PackUpdater/PackUpdater_11.vcxproj14
-rw-r--r--plugins/PackUpdater/PackUpdater_11.vcxproj.filters14
-rw-r--r--plugins/PackUpdater/Res/Version.rc4
-rw-r--r--plugins/PackUpdater/Src/Common.h16
-rw-r--r--plugins/PackUpdater/Src/Version.h8
7 files changed, 14 insertions, 70 deletions
diff --git a/plugins/PackUpdater/PackUpdater_10.vcxproj b/plugins/PackUpdater/PackUpdater_10.vcxproj
index dde93e6522..2291cdce14 100644
--- a/plugins/PackUpdater/PackUpdater_10.vcxproj
+++ b/plugins/PackUpdater/PackUpdater_10.vcxproj
@@ -73,7 +73,7 @@
<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>
@@ -97,7 +97,7 @@
<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>
@@ -121,7 +121,7 @@
<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>
@@ -149,7 +149,7 @@
<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>
@@ -187,12 +187,6 @@
<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>
- <ItemGroup>
<ResourceCompile Include="Res\Resource.rc" />
<ResourceCompile Include="Res\Version.rc" />
</ItemGroup>
diff --git a/plugins/PackUpdater/PackUpdater_10.vcxproj.filters b/plugins/PackUpdater/PackUpdater_10.vcxproj.filters
index 54a9c78af0..df206c7835 100644
--- a/plugins/PackUpdater/PackUpdater_10.vcxproj.filters
+++ b/plugins/PackUpdater/PackUpdater_10.vcxproj.filters
@@ -49,20 +49,6 @@
</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>
- <ItemGroup>
<ResourceCompile Include="Res\Resource.rc">
<Filter>Resource Files</Filter>
</ResourceCompile>
diff --git a/plugins/PackUpdater/PackUpdater_11.vcxproj b/plugins/PackUpdater/PackUpdater_11.vcxproj
index d547c80179..55dedcb2e0 100644
--- a/plugins/PackUpdater/PackUpdater_11.vcxproj
+++ b/plugins/PackUpdater/PackUpdater_11.vcxproj
@@ -77,7 +77,7 @@
<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>
@@ -101,7 +101,7 @@
<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>
@@ -125,7 +125,7 @@
<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>
@@ -153,7 +153,7 @@
<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>
@@ -191,12 +191,6 @@
<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>
- <ItemGroup>
<ResourceCompile Include="Res\Resource.rc" />
<ResourceCompile Include="Res\Version.rc" />
</ItemGroup>
diff --git a/plugins/PackUpdater/PackUpdater_11.vcxproj.filters b/plugins/PackUpdater/PackUpdater_11.vcxproj.filters
index 54a9c78af0..df206c7835 100644
--- a/plugins/PackUpdater/PackUpdater_11.vcxproj.filters
+++ b/plugins/PackUpdater/PackUpdater_11.vcxproj.filters
@@ -49,20 +49,6 @@
</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>
- <ItemGroup>
<ResourceCompile Include="Res\Resource.rc">
<Filter>Resource Files</Filter>
</ResourceCompile>
diff --git a/plugins/PackUpdater/Res/Version.rc b/plugins/PackUpdater/Res/Version.rc
index d741488c4f..5bfbab4754 100644
--- a/plugins/PackUpdater/Res/Version.rc
+++ b/plugins/PackUpdater/Res/Version.rc
@@ -7,10 +7,6 @@
#include "afxres.h"
#include "..\src\version.h"
-#ifdef _WIN32
-LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
-#endif //_WIN32
-
VS_VERSION_INFO VERSIONINFO
FILEVERSION __FILEVERSION_STRING
PRODUCTVERSION __FILEVERSION_STRING
diff --git a/plugins/PackUpdater/Src/Common.h b/plugins/PackUpdater/Src/Common.h
index 8f8a25aa8a..5317428f06 100644
--- a/plugins/PackUpdater/Src/Common.h
+++ b/plugins/PackUpdater/Src/Common.h
@@ -17,33 +17,28 @@ not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA.
*/
-#define MIRANDA_VER 0x0A00
-
// Windows Header Files:
-#include <time.h>
-#include <stdio.h>
#include <windows.h>
#include <Windowsx.h>
-#include "vector" // stl vector header
+#include <time.h>
+#include <vector>
#include <Shlobj.h>
// Miranda header files
-#include "win2k.h"
+#include <win2k.h>
#include <newpluginapi.h>
#include <m_clist.h>
#include <m_skin.h>
#include <m_langpack.h>
#include <m_options.h>
#include <m_database.h>
-#include <m_utils.h>
-#include <m_system.h>
#include <m_popup.h>
#include <m_hotkeys.h>
#include <m_netlib.h>
#include <m_icolib.h>
#include <m_folders.h>
-#include "m_popup2.h"
+#include <m_popup2.h>
#include "version.h"
#include "resource.h"
@@ -51,10 +46,9 @@ Boston, MA 02111-1307, USA.
#define MODNAME "PackUpdater"
#define MODULEA "Pack Updater"
-#define MODULEW L"Pack Updater"
+#define MODULE L"Pack Updater"
#define DEFAULT_UPDATES_FOLDER L"Pack Updates"
typedef std::wstring tString;
-#define MODULE MODULEW
struct FILEURL
{
diff --git a/plugins/PackUpdater/Src/Version.h b/plugins/PackUpdater/Src/Version.h
index 4f1950f3bb..d6687f0239 100644
--- a/plugins/PackUpdater/Src/Version.h
+++ b/plugins/PackUpdater/Src/Version.h
@@ -4,14 +4,8 @@
#define __BUILD_NUM 1
#define __FILEVERSION_STRING __MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM
-#define __FILEVERSION_DOTS __MAJOR_VERSION.__MINOR_VERSION.__RELEASE_NUM.__BUILD_NUM
-#define __STRINGIFY_IMPL(x) #x
-#define __STRINGIFY(x) __STRINGIFY_IMPL(x)
-#define __VERSION_STRING __STRINGIFY(__FILEVERSION_DOTS)
-
-#define __PLUGIN_NAME "Pack Updater"
-#define __INTERNAL_NAME "PackUpdater"
+#define __PLUGIN_NAME "Pack updater"
#define __FILENAME "PackUpdater.dll"
#define __DESCRIPTION "Simple updater for Miranda NG premodified packs."
#define __AUTHOR "Mataes, ZERO_BiT"
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-15 04:10:16 +0000