diff options
| author | George Hazan <george.hazan@gmail.com> | 2014-06-28 15:28:16 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2014-06-28 15:28:16 +0000 |
| commit | 3c5fc7455ff6b5f2ae7c9b331bccb1afdd7e525c (patch) | |
| tree | 282a508641e092c03cb034f7c08f43f12f437bf0 | |
| parent | 68168428784405945513229f6133ac00b8425b16 (diff) | |
compilation fix
git-svn-id: http://svn.miranda-ng.org/main/trunk@9598 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
| -rw-r--r-- | plugins/PluginUpdater/PluginUpdaterIM_10.vcxproj | 1 | ||||
| -rw-r--r-- | plugins/PluginUpdater/PluginUpdaterIM_10.vcxproj.filters | 3 | ||||
| -rw-r--r-- | plugins/PluginUpdater/PluginUpdaterIM_12.vcxproj | 4 | ||||
| -rw-r--r-- | plugins/PluginUpdater/PluginUpdaterIM_12.vcxproj.filters | 8 | ||||
| -rw-r--r-- | plugins/PluginUpdater/src/Common.h | 4 | ||||
| -rw-r--r-- | plugins/PluginUpdater/src/Compat/compat.h | 2 | ||||
| -rw-r--r-- | plugins/PluginUpdater/src/DlgUpdate.cpp | 2 |
7 files changed, 20 insertions, 4 deletions
diff --git a/plugins/PluginUpdater/PluginUpdaterIM_10.vcxproj b/plugins/PluginUpdater/PluginUpdaterIM_10.vcxproj index a2752fdbf3..48f3e00614 100644 --- a/plugins/PluginUpdater/PluginUpdaterIM_10.vcxproj +++ b/plugins/PluginUpdater/PluginUpdaterIM_10.vcxproj @@ -192,6 +192,7 @@ </ItemGroup>
<ItemGroup>
<ClCompile Include="src\checksum.cpp" />
+ <ClCompile Include="src\DlgListNew.cpp" />
<ClCompile Include="src\DlgUpdate.cpp" />
<ClCompile Include="src\Events.cpp" />
<ClCompile Include="src\Minizip\ioapi.c">
diff --git a/plugins/PluginUpdater/PluginUpdaterIM_10.vcxproj.filters b/plugins/PluginUpdater/PluginUpdaterIM_10.vcxproj.filters index d87dddc0b2..7d5832ef80 100644 --- a/plugins/PluginUpdater/PluginUpdaterIM_10.vcxproj.filters +++ b/plugins/PluginUpdater/PluginUpdaterIM_10.vcxproj.filters @@ -97,6 +97,9 @@ <ClCompile Include="src\DlgUpdate.cpp">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="src\DlgListNew.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<None Include="res\menu.ico">
diff --git a/plugins/PluginUpdater/PluginUpdaterIM_12.vcxproj b/plugins/PluginUpdater/PluginUpdaterIM_12.vcxproj index ca0d3fb8a1..933a29d280 100644 --- a/plugins/PluginUpdater/PluginUpdaterIM_12.vcxproj +++ b/plugins/PluginUpdater/PluginUpdaterIM_12.vcxproj @@ -169,6 +169,7 @@ <ResourceCompile Include="res\Version.rc" />
</ItemGroup>
<ItemGroup>
+ <ClInclude Include="src\compat.h" />
<ClInclude Include="src\Minizip\crypt.h" />
<ClInclude Include="src\Minizip\ioapi.h" />
<ClInclude Include="src\Minizip\iowin32.h" />
@@ -183,6 +184,8 @@ </ItemGroup>
<ItemGroup>
<ClCompile Include="src\checksum.cpp" />
+ <ClCompile Include="src\DlgListNew.cpp" />
+ <ClCompile Include="src\DlgUpdate.cpp" />
<ClCompile Include="src\Events.cpp" />
<ClCompile Include="src\Minizip\ioapi.c">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'">NotUsing</PrecompiledHeader>
@@ -207,7 +210,6 @@ <ClCompile Include="src\PluginUpdater.cpp">
<PrecompiledHeader>Create</PrecompiledHeader>
</ClCompile>
- <ClCompile Include="src\Scanner.cpp" />
<ClCompile Include="src\unzipfile.cpp" />
<ClCompile Include="src\Utils.cpp" />
</ItemGroup>
diff --git a/plugins/PluginUpdater/PluginUpdaterIM_12.vcxproj.filters b/plugins/PluginUpdater/PluginUpdaterIM_12.vcxproj.filters index 595ed68903..7d5832ef80 100644 --- a/plugins/PluginUpdater/PluginUpdaterIM_12.vcxproj.filters +++ b/plugins/PluginUpdater/PluginUpdaterIM_12.vcxproj.filters @@ -59,6 +59,9 @@ <ClInclude Include="src\Minizip\zlib.h">
<Filter>Source Files\Minizip</Filter>
</ClInclude>
+ <ClInclude Include="src\compat.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="src\Notifications.cpp">
@@ -91,7 +94,10 @@ <ClCompile Include="src\Minizip\unzip.c">
<Filter>Source Files\Minizip</Filter>
</ClCompile>
- <ClCompile Include="src\Scanner.cpp">
+ <ClCompile Include="src\DlgUpdate.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="src\DlgListNew.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
diff --git a/plugins/PluginUpdater/src/Common.h b/plugins/PluginUpdater/src/Common.h index 102a585e02..b829e92eae 100644 --- a/plugins/PluginUpdater/src/Common.h +++ b/plugins/PluginUpdater/src/Common.h @@ -46,12 +46,14 @@ Boston, MA 02111-1307, USA. #include "version.h"
#include "resource.h"
-#include "Notifications.h"
#if MIRANDA_VER < 0x0A00
+#include <m_popup2.h>
#include "compat.h"
#endif
+#include "Notifications.h"
+
// Enable Visual Style
#if defined _M_IX86
#pragma comment(linker,"/manifestdependency:\"type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='x86' publicKeyToken='6595b64144ccf1df' language='*'\"")
diff --git a/plugins/PluginUpdater/src/Compat/compat.h b/plugins/PluginUpdater/src/Compat/compat.h index 6afc901e17..e46bdc2354 100644 --- a/plugins/PluginUpdater/src/Compat/compat.h +++ b/plugins/PluginUpdater/src/Compat/compat.h @@ -1,3 +1,5 @@ +#define OUF_TCHAR 1
+
#define db_free(A) DBFreeVariant(A)
#define db_get_b(A,B,C,D) DBGetContactSettingByte(A,B,C,D)
diff --git a/plugins/PluginUpdater/src/DlgUpdate.cpp b/plugins/PluginUpdater/src/DlgUpdate.cpp index 9341df53ce..a64da26ab8 100644 --- a/plugins/PluginUpdater/src/DlgUpdate.cpp +++ b/plugins/PluginUpdater/src/DlgUpdate.cpp @@ -56,7 +56,7 @@ static void ApplyUpdates(void *param) AutoHandle pipe(hPipe);
HWND hwndList = GetDlgItem(hDlg, IDC_LIST_UPDATES);
- TCHAR tszBuff[2048], tszFileTemp[MAX_PATH], tszFileBack[MAX_PATH];
+ TCHAR tszFileTemp[MAX_PATH], tszFileBack[MAX_PATH];
mir_sntprintf(tszFileBack, SIZEOF(tszFileBack), _T("%s\\Backups"), tszRoot);
SafeCreateDirectory(tszFileBack);
|