diff options
| author | Vadim Dashevskiy <watcherhd@gmail.com> | 2012-07-23 11:56:59 +0000 |
|---|---|---|
| committer | Vadim Dashevskiy <watcherhd@gmail.com> | 2012-07-23 11:56:59 +0000 |
| commit | 177c84716db384c8be095219c58d0a68f87101fe (patch) | |
| tree | 84449f27f215b253da99729ddb0aaf6df40bef0c | |
| parent | cbb10e8c9089dfc99946ddc784afdb126e2128a8 (diff) | |
NotesAndReminders, Nudge, OpenFolder, PackUpdater: changed folder structure
git-svn-id: http://svn.miranda-ng.org/main/trunk@1116 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
| -rw-r--r-- | plugins/NotesAndReminders/NotesReminders.vcxproj | 32 | ||||
| -rw-r--r-- | plugins/NotesAndReminders/NotesReminders.vcxproj.filters | 31 | ||||
| -rw-r--r-- | plugins/NotesAndReminders/docs/N&R - langpack.txt (renamed from plugins/NotesAndReminders/N&R - langpack.txt) | 0 | ||||
| -rw-r--r-- | plugins/NotesAndReminders/docs/N&R - readme.txt (renamed from plugins/NotesAndReminders/N&R - readme.txt) | 0 | ||||
| -rw-r--r-- | plugins/NotesAndReminders/res/addremin.ico (renamed from plugins/NotesAndReminders/icons/addremin.ico) | bin | 1406 -> 1406 bytes | |||
| -rw-r--r-- | plugins/NotesAndReminders/res/bringfront.ico (renamed from plugins/NotesAndReminders/icons/bringfront.ico) | bin | 1406 -> 1406 bytes | |||
| -rw-r--r-- | plugins/NotesAndReminders/res/captioni.ico (renamed from plugins/NotesAndReminders/icons/captioni.ico) | bin | 766 -> 766 bytes | |||
| -rw-r--r-- | plugins/NotesAndReminders/res/captionn.ico (renamed from plugins/NotesAndReminders/icons/captionn.ico) | bin | 766 -> 766 bytes | |||
| -rw-r--r-- | plugins/NotesAndReminders/res/deleteic.ico (renamed from plugins/NotesAndReminders/icons/deleteic.ico) | bin | 1406 -> 1406 bytes | |||
| -rw-r--r-- | plugins/NotesAndReminders/res/deletere.ico (renamed from plugins/NotesAndReminders/icons/deletere.ico) | bin | 1406 -> 1406 bytes | |||
| -rw-r--r-- | plugins/NotesAndReminders/res/hidenote.ico (renamed from plugins/NotesAndReminders/icons/hidenote.ico) | bin | 766 -> 766 bytes | |||
| -rw-r--r-- | plugins/NotesAndReminders/res/noteicon.ico (renamed from plugins/NotesAndReminders/icons/noteicon.ico) | bin | 1406 -> 1406 bytes | |||
| -rw-r--r-- | plugins/NotesAndReminders/res/playsound.ico (renamed from plugins/NotesAndReminders/icons/playsound.ico) | bin | 318 -> 318 bytes | |||
| -rw-r--r-- | plugins/NotesAndReminders/res/reminder.ico (renamed from plugins/NotesAndReminders/icons/reminder.ico) | bin | 1406 -> 1406 bytes | |||
| -rw-r--r-- | plugins/NotesAndReminders/res/removeno.ico (renamed from plugins/NotesAndReminders/icons/removeno.ico) | bin | 766 -> 766 bytes | |||
| -rw-r--r-- | plugins/NotesAndReminders/res/resource.rc (renamed from plugins/NotesAndReminders/resource.rc) | 32 | ||||
| -rw-r--r-- | plugins/NotesAndReminders/res/showhide.ico (renamed from plugins/NotesAndReminders/icons/showhide.ico) | bin | 1406 -> 1406 bytes | |||
| -rw-r--r-- | plugins/NotesAndReminders/res/viewnotes.ico (renamed from plugins/NotesAndReminders/icons/viewnotes.ico) | bin | 3638 -> 3638 bytes | |||
| -rw-r--r-- | plugins/NotesAndReminders/res/viewremi.ico (renamed from plugins/NotesAndReminders/icons/viewremi.ico) | bin | 3638 -> 3638 bytes | |||
| -rw-r--r-- | plugins/NotesAndReminders/src/globals.h (renamed from plugins/NotesAndReminders/globals.h) | 0 | ||||
| -rw-r--r-- | plugins/NotesAndReminders/src/hotkeys.cpp (renamed from plugins/NotesAndReminders/hotkeys.cpp) | 0 | ||||
| -rw-r--r-- | plugins/NotesAndReminders/src/main.cpp (renamed from plugins/NotesAndReminders/main.cpp) | 0 | ||||
| -rw-r--r-- | plugins/NotesAndReminders/src/miscutils.cpp (renamed from plugins/NotesAndReminders/miscutils.cpp) | 0 | ||||
| -rw-r--r-- | plugins/NotesAndReminders/src/miscutils.h (renamed from plugins/NotesAndReminders/miscutils.h) | 0 | ||||
| -rw-r--r-- | plugins/NotesAndReminders/src/notes.cpp (renamed from plugins/NotesAndReminders/notes.cpp) | 0 | ||||
| -rw-r--r-- | plugins/NotesAndReminders/src/options.cpp (renamed from plugins/NotesAndReminders/options.cpp) | 0 | ||||
| -rw-r--r-- | plugins/NotesAndReminders/src/reminders.cpp (renamed from plugins/NotesAndReminders/reminders.cpp) | 0 | ||||
| -rw-r--r-- | plugins/NotesAndReminders/src/resource.h (renamed from plugins/NotesAndReminders/resource.h) | 0 | ||||
| -rw-r--r-- | plugins/Nudge/docs/ChangeLog.txt (renamed from plugins/Nudge/ChangeLog.txt) | 0 | ||||
| -rw-r--r-- | plugins/Nudge/docs/Sounds/nudge.wav (renamed from plugins/Nudge/Sounds/nudge.wav) | bin | 164500 -> 164500 bytes | |||
| -rw-r--r-- | plugins/Nudge/docs/autoexec_nudge.ini (renamed from plugins/Nudge/autoexec_nudge.ini) | 0 | ||||
| -rw-r--r-- | plugins/Nudge/docs/nudge-translation.txt (renamed from plugins/Nudge/nudge-translation.txt) | 0 | ||||
| -rw-r--r-- | plugins/Nudge/miranda.ico | bin | 3638 -> 0 bytes | |||
| -rw-r--r-- | plugins/Nudge/nudge_10.vcxproj | 45 | ||||
| -rw-r--r-- | plugins/Nudge/nudge_10.vcxproj.filters | 68 | ||||
| -rw-r--r-- | plugins/Nudge/res/Nudge.ico (renamed from plugins/Nudge/resources/Nudge.ico) | bin | 2038 -> 2038 bytes | |||
| -rw-r--r-- | plugins/Nudge/res/NudgeIRC.ico (renamed from plugins/Nudge/resources/NudgeIRC.ico) | bin | 2038 -> 2038 bytes | |||
| -rw-r--r-- | plugins/Nudge/res/NudgeMSN.ico (renamed from plugins/Nudge/resources/NudgeMSN.ico) | bin | 2038 -> 2038 bytes | |||
| -rw-r--r-- | plugins/Nudge/res/NudgeMeta.ico (renamed from plugins/Nudge/resources/NudgeMeta.ico) | bin | 2038 -> 2038 bytes | |||
| -rw-r--r-- | plugins/Nudge/res/NudgeTlen.ico (renamed from plugins/Nudge/resources/NudgeTlen.ico) | bin | 2038 -> 2038 bytes | |||
| -rw-r--r-- | plugins/Nudge/res/NudgeYahoo.ico (renamed from plugins/Nudge/resources/NudgeYahoo.ico) | bin | 2038 -> 2038 bytes | |||
| -rw-r--r-- | plugins/Nudge/res/resource.rc (renamed from plugins/Nudge/resource.rc) | 18 | ||||
| -rw-r--r-- | plugins/Nudge/resources/nudge msn.ico | bin | 1406 -> 0 bytes | |||
| -rw-r--r-- | plugins/Nudge/src/headers.h (renamed from plugins/Nudge/headers.h) | 2 | ||||
| -rw-r--r-- | plugins/Nudge/src/main.cpp (renamed from plugins/Nudge/main.cpp) | 0 | ||||
| -rw-r--r-- | plugins/Nudge/src/main.h (renamed from plugins/Nudge/main.h) | 0 | ||||
| -rw-r--r-- | plugins/Nudge/src/nudge.cpp (renamed from plugins/Nudge/nudge.cpp) | 0 | ||||
| -rw-r--r-- | plugins/Nudge/src/nudge.h (renamed from plugins/Nudge/nudge.h) | 0 | ||||
| -rw-r--r-- | plugins/Nudge/src/options.cpp (renamed from plugins/Nudge/options.cpp) | 0 | ||||
| -rw-r--r-- | plugins/Nudge/src/options.h (renamed from plugins/Nudge/options.h) | 0 | ||||
| -rw-r--r-- | plugins/Nudge/src/resource.h (renamed from plugins/Nudge/resource.h) | 0 | ||||
| -rw-r--r-- | plugins/Nudge/src/shake.cpp (renamed from plugins/Nudge/shake.cpp) | 0 | ||||
| -rw-r--r-- | plugins/Nudge/src/shake.h (renamed from plugins/Nudge/shake.h) | 0 | ||||
| -rw-r--r-- | plugins/OpenFolder/openFolder.vcxproj | 114 | ||||
| -rw-r--r-- | plugins/OpenFolder/openFolder.vcxproj.filters | 13 | ||||
| -rw-r--r-- | plugins/OpenFolder/res/resource.rc (renamed from plugins/OpenFolder/resource.rc) | 6 | ||||
| -rw-r--r-- | plugins/OpenFolder/src/openFolder.cpp (renamed from plugins/OpenFolder/openFolder.cpp) | 0 | ||||
| -rw-r--r-- | plugins/OpenFolder/src/openFolder.h (renamed from plugins/OpenFolder/openFolder.h) | 0 | ||||
| -rw-r--r-- | plugins/OpenFolder/src/resource.h (renamed from plugins/OpenFolder/resource.h) | 0 | ||||
| -rw-r--r-- | plugins/PackUpdater/Docs/packupdater-translation.txt (renamed from plugins/PackUpdater/packupdater-translation.txt) | 0 | ||||
| -rw-r--r-- | plugins/PackUpdater/PackUpdater_10.vcxproj | 28 | ||||
| -rw-r--r-- | plugins/PackUpdater/PackUpdater_10.vcxproj.filters | 22 | ||||
| -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.h | 6 | ||||
| -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 |
67 files changed, 131 insertions, 300 deletions
diff --git a/plugins/NotesAndReminders/NotesReminders.vcxproj b/plugins/NotesAndReminders/NotesReminders.vcxproj index 21a616736d..d77a0f481c 100644 --- a/plugins/NotesAndReminders/NotesReminders.vcxproj +++ b/plugins/NotesAndReminders/NotesReminders.vcxproj @@ -45,13 +45,14 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
- <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;NETSEND_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<WarningLevel>Level3</WarningLevel>
<AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
<PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>globals.h</PrecompiledHeaderFile>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -72,7 +73,7 @@ <Optimization>Full</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
- <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;NETSEND_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<FunctionLevelLinking>true</FunctionLevelLinking>
<WarningLevel>Level3</WarningLevel>
@@ -97,27 +98,22 @@ </Link>
</ItemDefinitionGroup>
<ItemGroup>
- <ClCompile Include="hotkeys.cpp" />
- <ClCompile Include="main.cpp">
- <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
- <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
+ <ClCompile Include="src\hotkeys.cpp" />
+ <ClCompile Include="src\main.cpp">
+ <PrecompiledHeader>Create</PrecompiledHeader>
</ClCompile>
- <ClCompile Include="miscutils.cpp" />
- <ClCompile Include="notes.cpp" />
- <ClCompile Include="options.cpp" />
- <ClCompile Include="reminders.cpp" />
+ <ClCompile Include="src\miscutils.cpp" />
+ <ClCompile Include="src\notes.cpp" />
+ <ClCompile Include="src\options.cpp" />
+ <ClCompile Include="src\reminders.cpp" />
</ItemGroup>
<ItemGroup>
- <ClInclude Include="globals.h" />
- <ClInclude Include="miscutils.h" />
- <ClInclude Include="resource.h" />
+ <ClInclude Include="src\globals.h" />
+ <ClInclude Include="src\miscutils.h" />
+ <ClInclude Include="src\resource.h" />
</ItemGroup>
<ItemGroup>
- <None Include="N&R - langpack.txt" />
- <None Include="N&R - readme.txt" />
- </ItemGroup>
- <ItemGroup>
- <ResourceCompile Include="resource.rc" />
+ <ResourceCompile Include="res\resource.rc" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
diff --git a/plugins/NotesAndReminders/NotesReminders.vcxproj.filters b/plugins/NotesAndReminders/NotesReminders.vcxproj.filters index 6ccf89abc3..5eccb5444e 100644 --- a/plugins/NotesAndReminders/NotesReminders.vcxproj.filters +++ b/plugins/NotesAndReminders/NotesReminders.vcxproj.filters @@ -13,51 +13,40 @@ <UniqueIdentifier>{38ee8469-7af5-4130-90a1-f4e8c620f475}</UniqueIdentifier>
<Extensions>ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>
</Filter>
- <Filter Include="Custom Files">
- <UniqueIdentifier>{81e2a913-4aac-4c50-aa77-6c231f934c76}</UniqueIdentifier>
- </Filter>
</ItemGroup>
<ItemGroup>
- <ClCompile Include="hotkeys.cpp">
+ <ClCompile Include="src\hotkeys.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="main.cpp">
+ <ClCompile Include="src\main.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="miscutils.cpp">
+ <ClCompile Include="src\miscutils.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="notes.cpp">
+ <ClCompile Include="src\notes.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="options.cpp">
+ <ClCompile Include="src\options.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="reminders.cpp">
+ <ClCompile Include="src\reminders.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
- <ClInclude Include="globals.h">
+ <ClInclude Include="src\globals.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="miscutils.h">
+ <ClInclude Include="src\miscutils.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="resource.h">
+ <ClInclude Include="src\resource.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
- <None Include="N&R - langpack.txt">
- <Filter>Custom Files</Filter>
- </None>
- <None Include="N&R - readme.txt">
- <Filter>Custom Files</Filter>
- </None>
- </ItemGroup>
- <ItemGroup>
- <ResourceCompile Include="resource.rc">
+ <ResourceCompile Include="res\resource.rc">
<Filter>Resource Files</Filter>
</ResourceCompile>
</ItemGroup>
diff --git a/plugins/NotesAndReminders/N&R - langpack.txt b/plugins/NotesAndReminders/docs/N&R - langpack.txt index ebb446c99b..ebb446c99b 100644 --- a/plugins/NotesAndReminders/N&R - langpack.txt +++ b/plugins/NotesAndReminders/docs/N&R - langpack.txt diff --git a/plugins/NotesAndReminders/N&R - readme.txt b/plugins/NotesAndReminders/docs/N&R - readme.txt index 30ced4b8f1..30ced4b8f1 100644 --- a/plugins/NotesAndReminders/N&R - readme.txt +++ b/plugins/NotesAndReminders/docs/N&R - readme.txt diff --git a/plugins/NotesAndReminders/icons/addremin.ico b/plugins/NotesAndReminders/res/addremin.ico Binary files differindex 0264fd1716..0264fd1716 100644 --- a/plugins/NotesAndReminders/icons/addremin.ico +++ b/plugins/NotesAndReminders/res/addremin.ico diff --git a/plugins/NotesAndReminders/icons/bringfront.ico b/plugins/NotesAndReminders/res/bringfront.ico Binary files differindex 11984568a8..11984568a8 100644 --- a/plugins/NotesAndReminders/icons/bringfront.ico +++ b/plugins/NotesAndReminders/res/bringfront.ico diff --git a/plugins/NotesAndReminders/icons/captioni.ico b/plugins/NotesAndReminders/res/captioni.ico Binary files differindex c7543c075f..c7543c075f 100644 --- a/plugins/NotesAndReminders/icons/captioni.ico +++ b/plugins/NotesAndReminders/res/captioni.ico diff --git a/plugins/NotesAndReminders/icons/captionn.ico b/plugins/NotesAndReminders/res/captionn.ico Binary files differindex fd925f0660..fd925f0660 100644 --- a/plugins/NotesAndReminders/icons/captionn.ico +++ b/plugins/NotesAndReminders/res/captionn.ico diff --git a/plugins/NotesAndReminders/icons/deleteic.ico b/plugins/NotesAndReminders/res/deleteic.ico Binary files differindex 5aa90434c1..5aa90434c1 100644 --- a/plugins/NotesAndReminders/icons/deleteic.ico +++ b/plugins/NotesAndReminders/res/deleteic.ico diff --git a/plugins/NotesAndReminders/icons/deletere.ico b/plugins/NotesAndReminders/res/deletere.ico Binary files differindex 8560fc8f5e..8560fc8f5e 100644 --- a/plugins/NotesAndReminders/icons/deletere.ico +++ b/plugins/NotesAndReminders/res/deletere.ico diff --git a/plugins/NotesAndReminders/icons/hidenote.ico b/plugins/NotesAndReminders/res/hidenote.ico Binary files differindex bada524874..bada524874 100644 --- a/plugins/NotesAndReminders/icons/hidenote.ico +++ b/plugins/NotesAndReminders/res/hidenote.ico diff --git a/plugins/NotesAndReminders/icons/noteicon.ico b/plugins/NotesAndReminders/res/noteicon.ico Binary files differindex 5479ed29e7..5479ed29e7 100644 --- a/plugins/NotesAndReminders/icons/noteicon.ico +++ b/plugins/NotesAndReminders/res/noteicon.ico diff --git a/plugins/NotesAndReminders/icons/playsound.ico b/plugins/NotesAndReminders/res/playsound.ico Binary files differindex 0e3711dbc5..0e3711dbc5 100644 --- a/plugins/NotesAndReminders/icons/playsound.ico +++ b/plugins/NotesAndReminders/res/playsound.ico diff --git a/plugins/NotesAndReminders/icons/reminder.ico b/plugins/NotesAndReminders/res/reminder.ico Binary files differindex d3bed91d4d..d3bed91d4d 100644 --- a/plugins/NotesAndReminders/icons/reminder.ico +++ b/plugins/NotesAndReminders/res/reminder.ico diff --git a/plugins/NotesAndReminders/icons/removeno.ico b/plugins/NotesAndReminders/res/removeno.ico Binary files differindex d2aae887a6..d2aae887a6 100644 --- a/plugins/NotesAndReminders/icons/removeno.ico +++ b/plugins/NotesAndReminders/res/removeno.ico diff --git a/plugins/NotesAndReminders/resource.rc b/plugins/NotesAndReminders/res/resource.rc index d438fabc25..064efb6453 100644 --- a/plugins/NotesAndReminders/resource.rc +++ b/plugins/NotesAndReminders/res/resource.rc @@ -1,6 +1,6 @@ // Microsoft Visual C++ generated resource script.
//
-#include "resource.h"
+#include "..\src\resource.h"
#define APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
@@ -29,7 +29,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL 1 TEXTINCLUDE
BEGIN
- "resource.h\0"
+ "..\\src\\resource.h\0"
END
2 TEXTINCLUDE
@@ -213,20 +213,20 @@ END // Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems.
-IDI_ADDREMINDER ICON "icons/addremin.ico"
-IDI_DELETEICON ICON "icons/deleteic.ico"
-IDI_NOTEICON ICON "icons/noteicon.ico"
-IDI_SHOWHIDE ICON "icons/showhide.ico"
-IDI_CAPTIONICON ICON "icons/captioni.ico"
-IDI_DELETEREMINDER ICON "icons/deletere.ico"
-IDI_VIEWREMINDERS ICON "icons/viewremi.ico"
-IDI_CAPTIONICONNOTTOP ICON "icons/captionn.ico"
-IDI_HIDENOTE ICON "icons/hidenote.ico"
-IDI_REMOVENOTE ICON "icons/removeno.ico"
-IDI_REMINDER ICON "icons/reminder.ico"
-IDI_BRINGFRONT ICON "icons/bringfront.ico"
-IDI_PLAYSOUND ICON "icons/playsound.ico"
-IDI_VIEWNOTES ICON "icons/viewnotes.ico"
+IDI_ADDREMINDER ICON "addremin.ico"
+IDI_DELETEICON ICON "deleteic.ico"
+IDI_NOTEICON ICON "noteicon.ico"
+IDI_SHOWHIDE ICON "showhide.ico"
+IDI_CAPTIONICON ICON "captioni.ico"
+IDI_DELETEREMINDER ICON "deletere.ico"
+IDI_VIEWREMINDERS ICON "viewremi.ico"
+IDI_CAPTIONICONNOTTOP ICON "captionn.ico"
+IDI_HIDENOTE ICON "hidenote.ico"
+IDI_REMOVENOTE ICON "removeno.ico"
+IDI_REMINDER ICON "reminder.ico"
+IDI_BRINGFRONT ICON "bringfront.ico"
+IDI_PLAYSOUND ICON "playsound.ico"
+IDI_VIEWNOTES ICON "viewnotes.ico"
/////////////////////////////////////////////////////////////////////////////
//
diff --git a/plugins/NotesAndReminders/icons/showhide.ico b/plugins/NotesAndReminders/res/showhide.ico Binary files differindex 99b241d4fb..99b241d4fb 100644 --- a/plugins/NotesAndReminders/icons/showhide.ico +++ b/plugins/NotesAndReminders/res/showhide.ico diff --git a/plugins/NotesAndReminders/icons/viewnotes.ico b/plugins/NotesAndReminders/res/viewnotes.ico Binary files differindex 18057a372a..18057a372a 100644 --- a/plugins/NotesAndReminders/icons/viewnotes.ico +++ b/plugins/NotesAndReminders/res/viewnotes.ico diff --git a/plugins/NotesAndReminders/icons/viewremi.ico b/plugins/NotesAndReminders/res/viewremi.ico Binary files differindex b9e8bce9d5..b9e8bce9d5 100644 --- a/plugins/NotesAndReminders/icons/viewremi.ico +++ b/plugins/NotesAndReminders/res/viewremi.ico diff --git a/plugins/NotesAndReminders/globals.h b/plugins/NotesAndReminders/src/globals.h index f8cc794e4a..f8cc794e4a 100644 --- a/plugins/NotesAndReminders/globals.h +++ b/plugins/NotesAndReminders/src/globals.h diff --git a/plugins/NotesAndReminders/hotkeys.cpp b/plugins/NotesAndReminders/src/hotkeys.cpp index a8bd8d3c53..a8bd8d3c53 100644 --- a/plugins/NotesAndReminders/hotkeys.cpp +++ b/plugins/NotesAndReminders/src/hotkeys.cpp diff --git a/plugins/NotesAndReminders/main.cpp b/plugins/NotesAndReminders/src/main.cpp index 2165a8e49b..2165a8e49b 100644 --- a/plugins/NotesAndReminders/main.cpp +++ b/plugins/NotesAndReminders/src/main.cpp diff --git a/plugins/NotesAndReminders/miscutils.cpp b/plugins/NotesAndReminders/src/miscutils.cpp index b4de98404c..b4de98404c 100644 --- a/plugins/NotesAndReminders/miscutils.cpp +++ b/plugins/NotesAndReminders/src/miscutils.cpp diff --git a/plugins/NotesAndReminders/miscutils.h b/plugins/NotesAndReminders/src/miscutils.h index 104de5313c..104de5313c 100644 --- a/plugins/NotesAndReminders/miscutils.h +++ b/plugins/NotesAndReminders/src/miscutils.h diff --git a/plugins/NotesAndReminders/notes.cpp b/plugins/NotesAndReminders/src/notes.cpp index 5f98768d8b..5f98768d8b 100644 --- a/plugins/NotesAndReminders/notes.cpp +++ b/plugins/NotesAndReminders/src/notes.cpp diff --git a/plugins/NotesAndReminders/options.cpp b/plugins/NotesAndReminders/src/options.cpp index 8e15946db9..8e15946db9 100644 --- a/plugins/NotesAndReminders/options.cpp +++ b/plugins/NotesAndReminders/src/options.cpp diff --git a/plugins/NotesAndReminders/reminders.cpp b/plugins/NotesAndReminders/src/reminders.cpp index 0d545056f9..0d545056f9 100644 --- a/plugins/NotesAndReminders/reminders.cpp +++ b/plugins/NotesAndReminders/src/reminders.cpp diff --git a/plugins/NotesAndReminders/resource.h b/plugins/NotesAndReminders/src/resource.h index 0ddf8b4031..0ddf8b4031 100644 --- a/plugins/NotesAndReminders/resource.h +++ b/plugins/NotesAndReminders/src/resource.h diff --git a/plugins/Nudge/ChangeLog.txt b/plugins/Nudge/docs/ChangeLog.txt index 140671c177..140671c177 100644 --- a/plugins/Nudge/ChangeLog.txt +++ b/plugins/Nudge/docs/ChangeLog.txt diff --git a/plugins/Nudge/Sounds/nudge.wav b/plugins/Nudge/docs/Sounds/nudge.wav Binary files differindex 938812970c..938812970c 100644 --- a/plugins/Nudge/Sounds/nudge.wav +++ b/plugins/Nudge/docs/Sounds/nudge.wav diff --git a/plugins/Nudge/autoexec_nudge.ini b/plugins/Nudge/docs/autoexec_nudge.ini index d5e9a563da..d5e9a563da 100644 --- a/plugins/Nudge/autoexec_nudge.ini +++ b/plugins/Nudge/docs/autoexec_nudge.ini diff --git a/plugins/Nudge/nudge-translation.txt b/plugins/Nudge/docs/nudge-translation.txt index 454dd7ef60..454dd7ef60 100644 --- a/plugins/Nudge/nudge-translation.txt +++ b/plugins/Nudge/docs/nudge-translation.txt diff --git a/plugins/Nudge/miranda.ico b/plugins/Nudge/miranda.ico Binary files differdeleted file mode 100644 index 4fba0d431a..0000000000 --- a/plugins/Nudge/miranda.ico +++ /dev/null diff --git a/plugins/Nudge/nudge_10.vcxproj b/plugins/Nudge/nudge_10.vcxproj index 80400c5152..f5b50a0d35 100644 --- a/plugins/Nudge/nudge_10.vcxproj +++ b/plugins/Nudge/nudge_10.vcxproj @@ -21,7 +21,6 @@ <PropertyGroup Label="Globals">
<ProjectName>Nudge</ProjectName>
<ProjectGuid>{8190CFAA-3B73-43D8-9101-8368E21F1864}</ProjectGuid>
- <RootNamespace>nudge</RootNamespace>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
@@ -74,14 +73,13 @@ <ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;nudge_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<PrecompiledHeader>Use</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
<PrecompiledHeaderFile>headers.h</PrecompiledHeaderFile>
- <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -100,13 +98,12 @@ <ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;nudge_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<PrecompiledHeader>Use</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<PrecompiledHeaderFile>headers.h</PrecompiledHeaderFile>
- <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -128,12 +125,11 @@ <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
<OmitFramePointers>false</OmitFramePointers>
<AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;nudge_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<FunctionLevelLinking>true</FunctionLevelLinking>
<PrecompiledHeader>Use</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
- <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<PrecompiledHeaderFile>headers.h</PrecompiledHeaderFile>
</ClCompile>
<ResourceCompile>
@@ -158,12 +154,11 @@ <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
<OmitFramePointers>false</OmitFramePointers>
<AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;nudge_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<FunctionLevelLinking>true</FunctionLevelLinking>
<PrecompiledHeader>Use</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
- <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<PrecompiledHeaderFile>headers.h</PrecompiledHeaderFile>
</ClCompile>
<ResourceCompile>
@@ -182,33 +177,23 @@ </Link>
</ItemDefinitionGroup>
<ItemGroup>
- <ClCompile Include="main.cpp">
+ <ClCompile Include="src\main.cpp">
<PrecompiledHeader>Create</PrecompiledHeader>
</ClCompile>
- <ClCompile Include="nudge.cpp" />
- <ClCompile Include="options.cpp" />
- <ClCompile Include="shake.cpp" />
+ <ClCompile Include="src\nudge.cpp" />
+ <ClCompile Include="src\options.cpp" />
+ <ClCompile Include="src\shake.cpp" />
</ItemGroup>
<ItemGroup>
- <ClInclude Include="headers.h" />
- <ClInclude Include="main.h" />
- <ClInclude Include="nudge.h" />
- <ClInclude Include="options.h" />
- <ClInclude Include="resource.h" />
- <ClInclude Include="shake.h" />
+ <ClInclude Include="src\headers.h" />
+ <ClInclude Include="src\main.h" />
+ <ClInclude Include="src\nudge.h" />
+ <ClInclude Include="src\options.h" />
+ <ClInclude Include="src\resource.h" />
+ <ClInclude Include="src\shake.h" />
</ItemGroup>
<ItemGroup>
- <None Include="miranda.ico" />
- <None Include="ChangeLog.txt" />
- <None Include="resources\Nudge.ico" />
- <None Include="resources\NudgeIRC.ico" />
- <None Include="resources\NudgeMeta.ico" />
- <None Include="resources\NudgeMSN.ico" />
- <None Include="resources\NudgeTlen.ico" />
- <None Include="resources\NudgeYahoo.ico" />
- </ItemGroup>
- <ItemGroup>
- <ResourceCompile Include="resource.rc" />
+ <ResourceCompile Include="res\resource.rc" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
diff --git a/plugins/Nudge/nudge_10.vcxproj.filters b/plugins/Nudge/nudge_10.vcxproj.filters index d21def2c41..87af4fd86d 100644 --- a/plugins/Nudge/nudge_10.vcxproj.filters +++ b/plugins/Nudge/nudge_10.vcxproj.filters @@ -1,76 +1,52 @@ <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
- <ClCompile Include="main.cpp">
+ <Filter Include="Source Files">
+ <UniqueIdentifier>{021e1c6f-a1a3-4538-b5a1-7df818ac8791}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="Header Files">
+ <UniqueIdentifier>{24214ff5-3fda-4081-a191-e7d6bbf80014}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="Resource Files">
+ <UniqueIdentifier>{3041ddc0-6ef1-4fb6-a3bd-e81f1ce388eb}</UniqueIdentifier>
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="src\main.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="shake.cpp">
+ <ClCompile Include="src\shake.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="options.cpp">
+ <ClCompile Include="src\options.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="nudge.cpp">
+ <ClCompile Include="src\nudge.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
- <ClInclude Include="headers.h">
+ <ClInclude Include="src\headers.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="main.h">
+ <ClInclude Include="src\main.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="nudge.h">
+ <ClInclude Include="src\nudge.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="options.h">
+ <ClInclude Include="src\options.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="resource.h">
+ <ClInclude Include="src\resource.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="shake.h">
+ <ClInclude Include="src\shake.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
- <None Include="ChangeLog.txt" />
- <None Include="miranda.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="resources\Nudge.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="resources\NudgeIRC.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="resources\NudgeMeta.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="resources\NudgeMSN.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="resources\NudgeYahoo.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="resources\NudgeTlen.ico">
- <Filter>Resource Files</Filter>
- </None>
- </ItemGroup>
- <ItemGroup>
- <Filter Include="Source Files">
- <UniqueIdentifier>{021e1c6f-a1a3-4538-b5a1-7df818ac8791}</UniqueIdentifier>
- </Filter>
- <Filter Include="Header Files">
- <UniqueIdentifier>{24214ff5-3fda-4081-a191-e7d6bbf80014}</UniqueIdentifier>
- </Filter>
- <Filter Include="Resource Files">
- <UniqueIdentifier>{3041ddc0-6ef1-4fb6-a3bd-e81f1ce388eb}</UniqueIdentifier>
- </Filter>
- </ItemGroup>
- <ItemGroup>
- <ResourceCompile Include="resource.rc">
+ <ResourceCompile Include="res\resource.rc">
<Filter>Resource Files</Filter>
</ResourceCompile>
</ItemGroup>
diff --git a/plugins/Nudge/resources/Nudge.ico b/plugins/Nudge/res/Nudge.ico Binary files differindex 29d9911214..29d9911214 100644 --- a/plugins/Nudge/resources/Nudge.ico +++ b/plugins/Nudge/res/Nudge.ico diff --git a/plugins/Nudge/resources/NudgeIRC.ico b/plugins/Nudge/res/NudgeIRC.ico Binary files differindex f950403fa5..f950403fa5 100644 --- a/plugins/Nudge/resources/NudgeIRC.ico +++ b/plugins/Nudge/res/NudgeIRC.ico diff --git a/plugins/Nudge/resources/NudgeMSN.ico b/plugins/Nudge/res/NudgeMSN.ico Binary files differindex c52057bc9e..c52057bc9e 100644 --- a/plugins/Nudge/resources/NudgeMSN.ico +++ b/plugins/Nudge/res/NudgeMSN.ico diff --git a/plugins/Nudge/resources/NudgeMeta.ico b/plugins/Nudge/res/NudgeMeta.ico Binary files differindex fabd329f70..fabd329f70 100644 --- a/plugins/Nudge/resources/NudgeMeta.ico +++ b/plugins/Nudge/res/NudgeMeta.ico diff --git a/plugins/Nudge/resources/NudgeTlen.ico b/plugins/Nudge/res/NudgeTlen.ico Binary files differindex d4a2c06930..d4a2c06930 100644 --- a/plugins/Nudge/resources/NudgeTlen.ico +++ b/plugins/Nudge/res/NudgeTlen.ico diff --git a/plugins/Nudge/resources/NudgeYahoo.ico b/plugins/Nudge/res/NudgeYahoo.ico Binary files differindex 7bed3ca103..7bed3ca103 100644 --- a/plugins/Nudge/resources/NudgeYahoo.ico +++ b/plugins/Nudge/res/NudgeYahoo.ico diff --git a/plugins/Nudge/resource.rc b/plugins/Nudge/res/resource.rc index 4188b695b4..4bdb574ccd 100644 --- a/plugins/Nudge/resource.rc +++ b/plugins/Nudge/res/resource.rc @@ -1,6 +1,6 @@ // Microsoft Visual C++ generated resource script.
//
-#include "resource.h"
+#include "..\src\resource.h"
#define APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
@@ -27,7 +27,7 @@ LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT 1 TEXTINCLUDE
BEGIN
- "resource.h\0"
+ "..\\src\\resource.h\0"
END
2 TEXTINCLUDE
@@ -262,16 +262,16 @@ END // Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems.
-IDI_NUDGE ICON "resources\\Nudge.ico"
-IDI_NUGDE_YAHOO ICON "resources\\NudgeYahoo.ico"
-IDI_NUDGE_IRC ICON "resources\\NudgeIRC.ico"
-IDI_NUDGE_MSN ICON "resources\\NudgeMSN.ico"
-IDI_NUDGE_TLEN ICON "resources\\NudgeTlen.ico"
-IDI_NUDGE_META ICON "resources\\NudgeMeta.ico"
+IDI_NUDGE ICON "Nudge.ico"
+IDI_NUGDE_YAHOO ICON "NudgeYahoo.ico"
+IDI_NUDGE_IRC ICON "NudgeIRC.ico"
+IDI_NUDGE_MSN ICON "NudgeMSN.ico"
+IDI_NUDGE_TLEN ICON "NudgeTlen.ico"
+IDI_NUDGE_META ICON "NudgeMeta.ico"
#endif // Neutral resources
/////////////////////////////////////////////////////////////////////////////
-
+
#ifndef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
diff --git a/plugins/Nudge/resources/nudge msn.ico b/plugins/Nudge/resources/nudge msn.ico Binary files differdeleted file mode 100644 index 77ad817b45..0000000000 --- a/plugins/Nudge/resources/nudge msn.ico +++ /dev/null diff --git a/plugins/Nudge/headers.h b/plugins/Nudge/src/headers.h index 456af2d7ed..eb931c6da8 100644 --- a/plugins/Nudge/headers.h +++ b/plugins/Nudge/src/headers.h @@ -3,6 +3,8 @@ // are changed infrequently
//
+#define _CRT_SECURE_NO_WARNINGS
+
#pragma once
// Modify the following defines if you have to target a platform prior to the ones specified below.
diff --git a/plugins/Nudge/main.cpp b/plugins/Nudge/src/main.cpp index c673ebe0c5..c673ebe0c5 100644 --- a/plugins/Nudge/main.cpp +++ b/plugins/Nudge/src/main.cpp diff --git a/plugins/Nudge/main.h b/plugins/Nudge/src/main.h index 556ee0070b..556ee0070b 100644 --- a/plugins/Nudge/main.h +++ b/plugins/Nudge/src/main.h diff --git a/plugins/Nudge/nudge.cpp b/plugins/Nudge/src/nudge.cpp index 0afa6edee0..0afa6edee0 100644 --- a/plugins/Nudge/nudge.cpp +++ b/plugins/Nudge/src/nudge.cpp diff --git a/plugins/Nudge/nudge.h b/plugins/Nudge/src/nudge.h index 8a531639ca..8a531639ca 100644 --- a/plugins/Nudge/nudge.h +++ b/plugins/Nudge/src/nudge.h diff --git a/plugins/Nudge/options.cpp b/plugins/Nudge/src/options.cpp index b0369143dc..b0369143dc 100644 --- a/plugins/Nudge/options.cpp +++ b/plugins/Nudge/src/options.cpp diff --git a/plugins/Nudge/options.h b/plugins/Nudge/src/options.h index 68f648a0bb..68f648a0bb 100644 --- a/plugins/Nudge/options.h +++ b/plugins/Nudge/src/options.h diff --git a/plugins/Nudge/resource.h b/plugins/Nudge/src/resource.h index 60a56388e2..60a56388e2 100644 --- a/plugins/Nudge/resource.h +++ b/plugins/Nudge/src/resource.h diff --git a/plugins/Nudge/shake.cpp b/plugins/Nudge/src/shake.cpp index f396c4f535..f396c4f535 100644 --- a/plugins/Nudge/shake.cpp +++ b/plugins/Nudge/src/shake.cpp diff --git a/plugins/Nudge/shake.h b/plugins/Nudge/src/shake.h index 73e460cb41..73e460cb41 100644 --- a/plugins/Nudge/shake.h +++ b/plugins/Nudge/src/shake.h diff --git a/plugins/OpenFolder/openFolder.vcxproj b/plugins/OpenFolder/openFolder.vcxproj index 59757a60b5..735a83c5c0 100644 --- a/plugins/OpenFolder/openFolder.vcxproj +++ b/plugins/OpenFolder/openFolder.vcxproj @@ -20,30 +20,25 @@ </ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{8D233B9A-2744-4B62-94FC-7872FDDA4683}</ProjectGuid>
- <RootNamespace>openFolder</RootNamespace>
<ProjectName>OpenFolder</ProjectName>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
<CharacterSet>Unicode</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|X64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
<CharacterSet>Unicode</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|X64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
@@ -51,19 +46,15 @@ </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|X64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|X64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
@@ -72,186 +63,107 @@ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">$(SolutionDir)$(Configuration)64\Plugins\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\Obj\$(ProjectName)\</IntDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">$(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">true</LinkIncremental>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\Plugins\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|X64'">$(SolutionDir)$(Configuration)64\Plugins\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\Obj\$(ProjectName)\</IntDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|X64'">$(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|X64'">false</LinkIncremental>
+ <IgnoreImportLibrary>true</IgnoreImportLibrary>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <Midl>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TargetEnvironment>Win32</TargetEnvironment>
- <TypeLibraryName>.\Debug/openFolder.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;openFolder_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x0809</Culture>
+ <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
- <SuppressStartupBanner>true</SuppressStartupBanner>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
- <TargetMachine>MachineX86</TargetMachine>
<AdditionalLibraryDirectories>$(SolutionDir)\lib</AdditionalLibraryDirectories>
</Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </Bscmake>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">
- <Midl>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TypeLibraryName>.\Debug/openFolder.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;openFolder_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x0809</Culture>
+ <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
- <SuppressStartupBanner>true</SuppressStartupBanner>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
<AdditionalLibraryDirectories>$(SolutionDir)\lib</AdditionalLibraryDirectories>
</Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </Bscmake>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <Midl>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TargetEnvironment>Win32</TargetEnvironment>
- <TypeLibraryName>.\Release/openFolder.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
<ClCompile>
<Optimization>Full</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;openFolder_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
<WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
<FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x0809</Culture>
+ <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
- <SuppressStartupBanner>true</SuppressStartupBanner>
<ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
- <TargetMachine>MachineX86</TargetMachine>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalLibraryDirectories>$(SolutionDir)\lib</AdditionalLibraryDirectories>
<OptimizeReferences>true</OptimizeReferences>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
</Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </Bscmake>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|X64'">
- <Midl>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TypeLibraryName>.\Release/openFolder.tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
<ClCompile>
<Optimization>Full</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;openFolder_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
<WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
<FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x0809</Culture>
+ <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
- <SuppressStartupBanner>true</SuppressStartupBanner>
<ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalLibraryDirectories>$(SolutionDir)\lib</AdditionalLibraryDirectories>
<OptimizeReferences>true</OptimizeReferences>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
</Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </Bscmake>
</ItemDefinitionGroup>
<ItemGroup>
- <ClCompile Include="openFolder.cpp">
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|X64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|X64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ClCompile>
- </ItemGroup>
- <ItemGroup>
- <ResourceCompile Include="resource.rc">
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|X64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ResourceCompile>
+ <ClCompile Include="src\openFolder.cpp" />
</ItemGroup>
<ItemGroup>
- <ClInclude Include="openFolder.h" />
- <ClInclude Include="resource.h" />
+ <ResourceCompile Include="res\resource.rc" />
</ItemGroup>
<ItemGroup>
- <None Include="openFolder.ico" />
+ <ClInclude Include="src\openFolder.h" />
+ <ClInclude Include="src\resource.h" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
diff --git a/plugins/OpenFolder/openFolder.vcxproj.filters b/plugins/OpenFolder/openFolder.vcxproj.filters index 08b4522bf9..730e3a5a42 100644 --- a/plugins/OpenFolder/openFolder.vcxproj.filters +++ b/plugins/OpenFolder/openFolder.vcxproj.filters @@ -15,25 +15,20 @@ </Filter>
</ItemGroup>
<ItemGroup>
- <ClInclude Include="openFolder.h">
+ <ClInclude Include="src\openFolder.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="resource.h">
+ <ClInclude Include="src\resource.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
- <None Include="openFolder.ico">
- <Filter>Resource Files</Filter>
- </None>
- </ItemGroup>
- <ItemGroup>
- <ResourceCompile Include="resource.rc">
+ <ResourceCompile Include="res\resource.rc">
<Filter>Resource Files</Filter>
</ResourceCompile>
</ItemGroup>
<ItemGroup>
- <ClCompile Include="openFolder.cpp">
+ <ClCompile Include="src\openFolder.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
diff --git a/plugins/OpenFolder/resource.rc b/plugins/OpenFolder/res/resource.rc index 5aafd26f8d..5984045ffd 100644 --- a/plugins/OpenFolder/resource.rc +++ b/plugins/OpenFolder/res/resource.rc @@ -1,6 +1,6 @@ // Microsoft Visual C++ generated resource script.
//
-#include "resource.h"
+#include "..\src\resource.h"
#define APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
@@ -28,7 +28,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK // Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems.
-IDI_FOLDER ICON "res/openfolder.ico"
+IDI_FOLDER ICON "openfolder.ico"
#endif // English (U.K.) resources
/////////////////////////////////////////////////////////////////////////////
@@ -48,7 +48,7 @@ IDI_FOLDER ICON "res/openfolder.ico" 1 TEXTINCLUDE
BEGIN
- "resource.h\0"
+ "..\\src\\resource.h\0"
END
2 TEXTINCLUDE
diff --git a/plugins/OpenFolder/openFolder.cpp b/plugins/OpenFolder/src/openFolder.cpp index a39420ae73..a39420ae73 100644 --- a/plugins/OpenFolder/openFolder.cpp +++ b/plugins/OpenFolder/src/openFolder.cpp diff --git a/plugins/OpenFolder/openFolder.h b/plugins/OpenFolder/src/openFolder.h index d7eb02dad8..d7eb02dad8 100644 --- a/plugins/OpenFolder/openFolder.h +++ b/plugins/OpenFolder/src/openFolder.h diff --git a/plugins/OpenFolder/resource.h b/plugins/OpenFolder/src/resource.h index 599c82bbba..599c82bbba 100644 --- a/plugins/OpenFolder/resource.h +++ b/plugins/OpenFolder/src/resource.h 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 |