diff options
| -rw-r--r-- | plugins/Import/docs/import-translation.txt (renamed from plugins/Import/import-translation.txt) | 0 | ||||
| -rw-r--r-- | plugins/Import/import_10.vcxproj | 39 | ||||
| -rw-r--r-- | plugins/Import/import_10.vcxproj.filters | 27 | ||||
| -rw-r--r-- | plugins/Import/res/import.ico (renamed from plugins/Import/import.ico) | bin | 5430 -> 5430 bytes | |||
| -rw-r--r-- | plugins/Import/res/resource.rc (renamed from plugins/Import/resource.rc) | 4 | ||||
| -rw-r--r-- | plugins/Import/src/ICQserver.cpp (renamed from plugins/Import/ICQserver.cpp) | 0 | ||||
| -rw-r--r-- | plugins/Import/src/ICQserver.h (renamed from plugins/Import/ICQserver.h) | 0 | ||||
| -rw-r--r-- | plugins/Import/src/import.h (renamed from plugins/Import/import.h) | 3 | ||||
| -rw-r--r-- | plugins/Import/src/main.cpp (renamed from plugins/Import/main.cpp) | 0 | ||||
| -rw-r--r-- | plugins/Import/src/mirabilis.cpp (renamed from plugins/Import/mirabilis.cpp) | 0 | ||||
| -rw-r--r-- | plugins/Import/src/mirabilis.h (renamed from plugins/Import/mirabilis.h) | 0 | ||||
| -rw-r--r-- | plugins/Import/src/miranda.cpp (renamed from plugins/Import/miranda.cpp) | 0 | ||||
| -rw-r--r-- | plugins/Import/src/mirandadb0700.h (renamed from plugins/Import/mirandadb0700.h) | 0 | ||||
| -rw-r--r-- | plugins/Import/src/mirandahistory.cpp (renamed from plugins/Import/mirandahistory.cpp) | 0 | ||||
| -rw-r--r-- | plugins/Import/src/progress.cpp (renamed from plugins/Import/progress.cpp) | 0 | ||||
| -rw-r--r-- | plugins/Import/src/resource.h (renamed from plugins/Import/resource.h) | 0 | ||||
| -rw-r--r-- | plugins/Import/src/version.h (renamed from plugins/Import/version.h) | 0 | ||||
| -rw-r--r-- | plugins/Import/src/wizard.cpp (renamed from plugins/Import/wizard.cpp) | 0 | ||||
| -rw-r--r-- | plugins/KeyboardNotify/KeyboardNotify_10.vcxproj | 54 | ||||
| -rw-r--r-- | plugins/KeyboardNotify/KeyboardNotify_10.vcxproj.filters | 42 | ||||
| -rw-r--r-- | plugins/KeyboardNotify/docs/keyboardnotify-translation.txt (renamed from plugins/KeyboardNotify/keyboardnotify-translation.txt) | 0 | ||||
| -rw-r--r-- | plugins/KeyboardNotify/res/resources.rc (renamed from plugins/KeyboardNotify/resources.rc) | 10 | ||||
| -rw-r--r-- | plugins/KeyboardNotify/src/AggressiveOptimize.h (renamed from plugins/KeyboardNotify/AggressiveOptimize.h) | 0 | ||||
| -rw-r--r-- | plugins/KeyboardNotify/src/EnumProc.cpp (renamed from plugins/KeyboardNotify/EnumProc.cpp) | 0 | ||||
| -rw-r--r-- | plugins/KeyboardNotify/src/EnumProc.h (renamed from plugins/KeyboardNotify/EnumProc.h) | 0 | ||||
| -rw-r--r-- | plugins/KeyboardNotify/src/constants.h (renamed from plugins/KeyboardNotify/constants.h) | 0 | ||||
| -rw-r--r-- | plugins/KeyboardNotify/src/flash.cpp (renamed from plugins/KeyboardNotify/flash.cpp) | 0 | ||||
| -rw-r--r-- | plugins/KeyboardNotify/src/flash.h (renamed from plugins/KeyboardNotify/flash.h) | 0 | ||||
| -rw-r--r-- | plugins/KeyboardNotify/src/ignore.cpp (renamed from plugins/KeyboardNotify/ignore.cpp) | 0 | ||||
| -rw-r--r-- | plugins/KeyboardNotify/src/ignore.h (renamed from plugins/KeyboardNotify/ignore.h) | 0 | ||||
| -rw-r--r-- | plugins/KeyboardNotify/src/keyboard.cpp (renamed from plugins/KeyboardNotify/keyboard.cpp) | 0 | ||||
| -rw-r--r-- | plugins/KeyboardNotify/src/keyboard.h (renamed from plugins/KeyboardNotify/keyboard.h) | 0 | ||||
| -rw-r--r-- | plugins/KeyboardNotify/src/keypresses.cpp (renamed from plugins/KeyboardNotify/keypresses.cpp) | 0 | ||||
| -rw-r--r-- | plugins/KeyboardNotify/src/keypresses.h (renamed from plugins/KeyboardNotify/keypresses.h) | 0 | ||||
| -rw-r--r-- | plugins/KeyboardNotify/src/main.cpp (renamed from plugins/KeyboardNotify/main.cpp) | 0 | ||||
| -rw-r--r-- | plugins/KeyboardNotify/src/options.cpp (renamed from plugins/KeyboardNotify/options.cpp) | 0 | ||||
| -rw-r--r-- | plugins/KeyboardNotify/src/protolist.h (renamed from plugins/KeyboardNotify/protolist.h) | 0 | ||||
| -rw-r--r-- | plugins/KeyboardNotify/src/resource.h (renamed from plugins/KeyboardNotify/resource.h) | 0 | ||||
| -rw-r--r-- | plugins/KeyboardNotify/src/trigger.cpp (renamed from plugins/KeyboardNotify/trigger.cpp) | 0 | ||||
| -rw-r--r-- | plugins/KeyboardNotify/src/trigger.h (renamed from plugins/KeyboardNotify/trigger.h) | 0 | ||||
| -rw-r--r-- | plugins/KeyboardNotify/src/utils.cpp (renamed from plugins/KeyboardNotify/utils.cpp) | 0 | ||||
| -rw-r--r-- | plugins/KeyboardNotify/src/utils.h (renamed from plugins/KeyboardNotify/utils.h) | 0 |
42 files changed, 84 insertions, 95 deletions
diff --git a/plugins/Import/import-translation.txt b/plugins/Import/docs/import-translation.txt index 18838c6ad9..18838c6ad9 100644 --- a/plugins/Import/import-translation.txt +++ b/plugins/Import/docs/import-translation.txt diff --git a/plugins/Import/import_10.vcxproj b/plugins/Import/import_10.vcxproj index 59b817462f..55f52a577a 100644 --- a/plugins/Import/import_10.vcxproj +++ b/plugins/Import/import_10.vcxproj @@ -73,7 +73,7 @@ <ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;IMPORT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
@@ -82,7 +82,6 @@ <PrecompiledHeaderFile>import.h</PrecompiledHeaderFile>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -106,14 +105,13 @@ <ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;IMPORT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
<PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>import.h</PrecompiledHeaderFile>
<WarningLevel>Level3</WarningLevel>
- <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -139,7 +137,7 @@ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
<AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;IMPORT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<ExceptionHandling>false</ExceptionHandling>
<BufferSecurityCheck>false</BufferSecurityCheck>
@@ -148,14 +146,12 @@ <PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>import.h</PrecompiledHeaderFile>
<WarningLevel>Level3</WarningLevel>
- <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
- <AdditionalOptions>/ALIGN:4096 /ignore:4108 %(AdditionalOptions)</AdditionalOptions>
<AdditionalDependencies>comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalManifestDependencies>type=%27Win32%27 name=%27Microsoft.Windows.Common-Controls%27 version=%276.0.0.0%27 processorArchitecture=%27X86%27 publicKeyToken=%276595b64144ccf1df%27 language=%27*%27;%(AdditionalManifestDependencies)</AdditionalManifestDependencies>
<GenerateDebugInformation>true</GenerateDebugInformation>
@@ -177,7 +173,7 @@ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
<AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;IMPORT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<ExceptionHandling>false</ExceptionHandling>
<BufferSecurityCheck>false</BufferSecurityCheck>
@@ -186,14 +182,12 @@ <PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>import.h</PrecompiledHeaderFile>
<WarningLevel>Level3</WarningLevel>
- <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
- <AdditionalOptions>/ALIGN:4096 /ignore:4108 %(AdditionalOptions)</AdditionalOptions>
<AdditionalDependencies>comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalManifestDependencies>type=%27Win32%27 name=%27Microsoft.Windows.Common-Controls%27 version=%276.0.0.0%27 processorArchitecture=%27*%27 publicKeyToken=%276595b64144ccf1df%27 language=%27*%27;%(AdditionalManifestDependencies)</AdditionalManifestDependencies>
<GenerateDebugInformation>true</GenerateDebugInformation>
@@ -210,31 +204,30 @@ </PreBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>
- <ClCompile Include="ICQserver.cpp" />
- <ClCompile Include="main.cpp">
+ <ClCompile Include="src\ICQserver.cpp" />
+ <ClCompile Include="src\main.cpp">
<PrecompiledHeader>Create</PrecompiledHeader>
</ClCompile>
- <ClCompile Include="mirabilis.cpp" />
- <ClCompile Include="miranda.cpp" />
- <ClCompile Include="progress.cpp" />
- <ClCompile Include="wizard.cpp" />
+ <ClCompile Include="src\mirabilis.cpp" />
+ <ClCompile Include="src\miranda.cpp" />
+ <ClCompile Include="src\progress.cpp" />
+ <ClCompile Include="src\wizard.cpp" />
</ItemGroup>
<ItemGroup>
- <ClInclude Include="ICQserver.h" />
- <ClInclude Include="import.h" />
- <ClInclude Include="mirabilis.h" />
- <ClInclude Include="mirandadb0700.h" />
- <ClInclude Include="resource.h" />
+ <ClInclude Include="src\ICQserver.h" />
+ <ClInclude Include="src\import.h" />
+ <ClInclude Include="src\mirabilis.h" />
+ <ClInclude Include="src\mirandadb0700.h" />
+ <ClInclude Include="src\resource.h" />
</ItemGroup>
<ItemGroup>
- <None Include="import.ico" />
<None Include="docs\import-ICQ_Db_Specs.txt" />
<None Include="docs\import-license.txt" />
<None Include="docs\import-readme.txt" />
<None Include="docs\import-translation.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/Import/import_10.vcxproj.filters b/plugins/Import/import_10.vcxproj.filters index 48118ce444..33a708cb33 100644 --- a/plugins/Import/import_10.vcxproj.filters +++ b/plugins/Import/import_10.vcxproj.filters @@ -18,46 +18,43 @@ </Filter>
</ItemGroup>
<ItemGroup>
- <ClCompile Include="ICQserver.cpp">
+ <ClCompile Include="src\ICQserver.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="main.cpp">
+ <ClCompile Include="src\main.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="mirabilis.cpp">
+ <ClCompile Include="src\mirabilis.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="miranda.cpp">
+ <ClCompile Include="src\miranda.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="progress.cpp">
+ <ClCompile Include="src\progress.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="wizard.cpp">
+ <ClCompile Include="src\wizard.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
- <ClInclude Include="ICQserver.h">
+ <ClInclude Include="src\ICQserver.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="import.h">
+ <ClInclude Include="src\import.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="mirabilis.h">
+ <ClInclude Include="src\mirabilis.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="mirandadb0700.h">
+ <ClInclude Include="src\mirandadb0700.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="resource.h">
+ <ClInclude Include="src\resource.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
- <None Include="import.ico">
- <Filter>Resource Files</Filter>
- </None>
<None Include="docs\import-ICQ_Db_Specs.txt">
<Filter>Documentation</Filter>
</None>
@@ -72,7 +69,7 @@ </None>
</ItemGroup>
<ItemGroup>
- <ResourceCompile Include="resource.rc">
+ <ResourceCompile Include="res\resource.rc">
<Filter>Resource Files</Filter>
</ResourceCompile>
</ItemGroup>
diff --git a/plugins/Import/import.ico b/plugins/Import/res/import.ico Binary files differindex bf7417ae50..bf7417ae50 100644 --- a/plugins/Import/import.ico +++ b/plugins/Import/res/import.ico diff --git a/plugins/Import/resource.rc b/plugins/Import/res/resource.rc index 4ca038ce47..103ad9c908 100644 --- a/plugins/Import/resource.rc +++ b/plugins/Import/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_ENGLISH, SUBLANG_ENGLISH_UK 1 TEXTINCLUDE
BEGIN
- "resource.h\0"
+ "..\\src\\resource.h\0"
END
2 TEXTINCLUDE
diff --git a/plugins/Import/ICQserver.cpp b/plugins/Import/src/ICQserver.cpp index 372c0cb92c..372c0cb92c 100644 --- a/plugins/Import/ICQserver.cpp +++ b/plugins/Import/src/ICQserver.cpp diff --git a/plugins/Import/ICQserver.h b/plugins/Import/src/ICQserver.h index 864890a978..864890a978 100644 --- a/plugins/Import/ICQserver.h +++ b/plugins/Import/src/ICQserver.h diff --git a/plugins/Import/import.h b/plugins/Import/src/import.h index cbb6111a35..d0cb865c02 100644 --- a/plugins/Import/import.h +++ b/plugins/Import/src/import.h @@ -23,6 +23,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. //#define _LOGGING 1
+#define _CRT_SECURE_NO_WARNINGS
+#define _CRT_NONSTDC_NO_DEPRECATE
+
#define MIRANDA_VER 0x0A00
#define WINVER 0x0501
diff --git a/plugins/Import/main.cpp b/plugins/Import/src/main.cpp index 8b7524c040..8b7524c040 100644 --- a/plugins/Import/main.cpp +++ b/plugins/Import/src/main.cpp diff --git a/plugins/Import/mirabilis.cpp b/plugins/Import/src/mirabilis.cpp index 1f032827af..1f032827af 100644 --- a/plugins/Import/mirabilis.cpp +++ b/plugins/Import/src/mirabilis.cpp diff --git a/plugins/Import/mirabilis.h b/plugins/Import/src/mirabilis.h index 47f10141e1..47f10141e1 100644 --- a/plugins/Import/mirabilis.h +++ b/plugins/Import/src/mirabilis.h diff --git a/plugins/Import/miranda.cpp b/plugins/Import/src/miranda.cpp index 4f616fb714..4f616fb714 100644 --- a/plugins/Import/miranda.cpp +++ b/plugins/Import/src/miranda.cpp diff --git a/plugins/Import/mirandadb0700.h b/plugins/Import/src/mirandadb0700.h index 2c77588951..2c77588951 100644 --- a/plugins/Import/mirandadb0700.h +++ b/plugins/Import/src/mirandadb0700.h diff --git a/plugins/Import/mirandahistory.cpp b/plugins/Import/src/mirandahistory.cpp index ba7a923df7..ba7a923df7 100644 --- a/plugins/Import/mirandahistory.cpp +++ b/plugins/Import/src/mirandahistory.cpp diff --git a/plugins/Import/progress.cpp b/plugins/Import/src/progress.cpp index 99412f647a..99412f647a 100644 --- a/plugins/Import/progress.cpp +++ b/plugins/Import/src/progress.cpp diff --git a/plugins/Import/resource.h b/plugins/Import/src/resource.h index 7bf769f14d..7bf769f14d 100644 --- a/plugins/Import/resource.h +++ b/plugins/Import/src/resource.h diff --git a/plugins/Import/version.h b/plugins/Import/src/version.h index 58f9cf348c..58f9cf348c 100644 --- a/plugins/Import/version.h +++ b/plugins/Import/src/version.h diff --git a/plugins/Import/wizard.cpp b/plugins/Import/src/wizard.cpp index 780501a10a..780501a10a 100644 --- a/plugins/Import/wizard.cpp +++ b/plugins/Import/src/wizard.cpp diff --git a/plugins/KeyboardNotify/KeyboardNotify_10.vcxproj b/plugins/KeyboardNotify/KeyboardNotify_10.vcxproj index 9b64f36c80..8e39f9709e 100644 --- a/plugins/KeyboardNotify/KeyboardNotify_10.vcxproj +++ b/plugins/KeyboardNotify/KeyboardNotify_10.vcxproj @@ -73,11 +73,10 @@ <ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;KEYBORDNOTIFY_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- <DisableSpecificWarnings>4996</DisableSpecificWarnings>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
@@ -96,10 +95,9 @@ <ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;KEYBORDNOTIFY_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<WarningLevel>Level3</WarningLevel>
- <DisableSpecificWarnings>4996</DisableSpecificWarnings>
</ClCompile>
<Link>
<AdditionalDependencies>comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -119,9 +117,8 @@ <Optimization>Full</Optimization>
<FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
<AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;KEYBORDNOTIFY_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<WarningLevel>Level3</WarningLevel>
- <DisableSpecificWarnings>4996</DisableSpecificWarnings>
</ClCompile>
<Link>
<AdditionalDependencies>comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -143,9 +140,8 @@ <Optimization>Full</Optimization>
<FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
<AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;KEYBORDNOTIFY_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<WarningLevel>Level3</WarningLevel>
- <DisableSpecificWarnings>4996</DisableSpecificWarnings>
</ClCompile>
<Link>
<AdditionalDependencies>comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -163,31 +159,31 @@ </ResourceCompile>
</ItemDefinitionGroup>
<ItemGroup>
- <ClInclude Include="AggressiveOptimize.h" />
- <ClInclude Include="constants.h" />
- <ClInclude Include="EnumProc.h" />
- <ClInclude Include="flash.h" />
- <ClInclude Include="ignore.h" />
- <ClInclude Include="keyboard.h" />
- <ClInclude Include="keypresses.h" />
- <ClInclude Include="protolist.h" />
- <ClInclude Include="resource.h" />
- <ClInclude Include="trigger.h" />
- <ClInclude Include="utils.h" />
+ <ClInclude Include="src\AggressiveOptimize.h" />
+ <ClInclude Include="src\constants.h" />
+ <ClInclude Include="src\EnumProc.h" />
+ <ClInclude Include="src\flash.h" />
+ <ClInclude Include="src\ignore.h" />
+ <ClInclude Include="src\keyboard.h" />
+ <ClInclude Include="src\keypresses.h" />
+ <ClInclude Include="src\protolist.h" />
+ <ClInclude Include="src\resource.h" />
+ <ClInclude Include="src\trigger.h" />
+ <ClInclude Include="src\utils.h" />
</ItemGroup>
<ItemGroup>
- <ClCompile Include="EnumProc.cpp" />
- <ClCompile Include="flash.cpp" />
- <ClCompile Include="ignore.cpp" />
- <ClCompile Include="keyboard.cpp" />
- <ClCompile Include="keypresses.cpp" />
- <ClCompile Include="main.cpp" />
- <ClCompile Include="options.cpp" />
- <ClCompile Include="trigger.cpp" />
- <ClCompile Include="utils.cpp" />
+ <ClCompile Include="src\EnumProc.cpp" />
+ <ClCompile Include="src\flash.cpp" />
+ <ClCompile Include="src\ignore.cpp" />
+ <ClCompile Include="src\keyboard.cpp" />
+ <ClCompile Include="src\keypresses.cpp" />
+ <ClCompile Include="src\main.cpp" />
+ <ClCompile Include="src\options.cpp" />
+ <ClCompile Include="src\trigger.cpp" />
+ <ClCompile Include="src\utils.cpp" />
</ItemGroup>
<ItemGroup>
- <ResourceCompile Include="resources.rc" />
+ <ResourceCompile Include="res\resources.rc" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
diff --git a/plugins/KeyboardNotify/KeyboardNotify_10.vcxproj.filters b/plugins/KeyboardNotify/KeyboardNotify_10.vcxproj.filters index 35c9d4b195..8fe859e1ea 100644 --- a/plugins/KeyboardNotify/KeyboardNotify_10.vcxproj.filters +++ b/plugins/KeyboardNotify/KeyboardNotify_10.vcxproj.filters @@ -12,71 +12,71 @@ </Filter>
</ItemGroup>
<ItemGroup>
- <ClInclude Include="AggressiveOptimize.h">
+ <ClInclude Include="src\AggressiveOptimize.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="constants.h">
+ <ClInclude Include="src\constants.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="EnumProc.h">
+ <ClInclude Include="src\EnumProc.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="flash.h">
+ <ClInclude Include="src\flash.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="ignore.h">
+ <ClInclude Include="src\ignore.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="keyboard.h">
+ <ClInclude Include="src\keyboard.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="keypresses.h">
+ <ClInclude Include="src\keypresses.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="protolist.h">
+ <ClInclude Include="src\protolist.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="resource.h">
+ <ClInclude Include="src\resource.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="trigger.h">
+ <ClInclude Include="src\trigger.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="utils.h">
+ <ClInclude Include="src\utils.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
- <ClCompile Include="EnumProc.cpp">
+ <ClCompile Include="src\EnumProc.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="utils.cpp">
+ <ClCompile Include="src\utils.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="flash.cpp">
+ <ClCompile Include="src\flash.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="ignore.cpp">
+ <ClCompile Include="src\ignore.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="keyboard.cpp">
+ <ClCompile Include="src\keyboard.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="keypresses.cpp">
+ <ClCompile Include="src\keypresses.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="main.cpp">
+ <ClCompile Include="src\main.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="options.cpp">
+ <ClCompile Include="src\options.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="trigger.cpp">
+ <ClCompile Include="src\trigger.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
- <ResourceCompile Include="resources.rc">
+ <ResourceCompile Include="res\resources.rc">
<Filter>Resource Files</Filter>
</ResourceCompile>
</ItemGroup>
diff --git a/plugins/KeyboardNotify/keyboardnotify-translation.txt b/plugins/KeyboardNotify/docs/keyboardnotify-translation.txt index f73628491f..f73628491f 100644 --- a/plugins/KeyboardNotify/keyboardnotify-translation.txt +++ b/plugins/KeyboardNotify/docs/keyboardnotify-translation.txt diff --git a/plugins/KeyboardNotify/resources.rc b/plugins/KeyboardNotify/res/resources.rc index 7bbf535460..f63ee9d214 100644 --- a/plugins/KeyboardNotify/resources.rc +++ b/plugins/KeyboardNotify/res/resources.rc @@ -1,6 +1,6 @@ //Microsoft Developer Studio generated resource script.
//
-#include "resource.h"
+#include "..\src\resource.h"
#define APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
@@ -388,18 +388,18 @@ LANGUAGE LANG_FRENCH, SUBLANG_FRENCH_CANADIAN // TEXTINCLUDE
//
-1 TEXTINCLUDE DISCARDABLE
+1 TEXTINCLUDE
BEGIN
- "resource.h\0"
+ "..\\src\\resource.h\0"
END
-2 TEXTINCLUDE DISCARDABLE
+2 TEXTINCLUDE
BEGIN
"#include ""afxres.h""\r\n"
"\0"
END
-3 TEXTINCLUDE DISCARDABLE
+3 TEXTINCLUDE
BEGIN
"\r\n"
"\0"
diff --git a/plugins/KeyboardNotify/AggressiveOptimize.h b/plugins/KeyboardNotify/src/AggressiveOptimize.h index 34c6074320..34c6074320 100644 --- a/plugins/KeyboardNotify/AggressiveOptimize.h +++ b/plugins/KeyboardNotify/src/AggressiveOptimize.h diff --git a/plugins/KeyboardNotify/EnumProc.cpp b/plugins/KeyboardNotify/src/EnumProc.cpp index 7a5a23f0e3..7a5a23f0e3 100644 --- a/plugins/KeyboardNotify/EnumProc.cpp +++ b/plugins/KeyboardNotify/src/EnumProc.cpp diff --git a/plugins/KeyboardNotify/EnumProc.h b/plugins/KeyboardNotify/src/EnumProc.h index 09b3cba8d6..09b3cba8d6 100644 --- a/plugins/KeyboardNotify/EnumProc.h +++ b/plugins/KeyboardNotify/src/EnumProc.h diff --git a/plugins/KeyboardNotify/constants.h b/plugins/KeyboardNotify/src/constants.h index d50ded6d23..d50ded6d23 100644 --- a/plugins/KeyboardNotify/constants.h +++ b/plugins/KeyboardNotify/src/constants.h diff --git a/plugins/KeyboardNotify/flash.cpp b/plugins/KeyboardNotify/src/flash.cpp index aa0014a329..aa0014a329 100644 --- a/plugins/KeyboardNotify/flash.cpp +++ b/plugins/KeyboardNotify/src/flash.cpp diff --git a/plugins/KeyboardNotify/flash.h b/plugins/KeyboardNotify/src/flash.h index f60706fc76..f60706fc76 100644 --- a/plugins/KeyboardNotify/flash.h +++ b/plugins/KeyboardNotify/src/flash.h diff --git a/plugins/KeyboardNotify/ignore.cpp b/plugins/KeyboardNotify/src/ignore.cpp index 57fcceb8a6..57fcceb8a6 100644 --- a/plugins/KeyboardNotify/ignore.cpp +++ b/plugins/KeyboardNotify/src/ignore.cpp diff --git a/plugins/KeyboardNotify/ignore.h b/plugins/KeyboardNotify/src/ignore.h index a72df7b6f6..a72df7b6f6 100644 --- a/plugins/KeyboardNotify/ignore.h +++ b/plugins/KeyboardNotify/src/ignore.h diff --git a/plugins/KeyboardNotify/keyboard.cpp b/plugins/KeyboardNotify/src/keyboard.cpp index df1033fce7..df1033fce7 100644 --- a/plugins/KeyboardNotify/keyboard.cpp +++ b/plugins/KeyboardNotify/src/keyboard.cpp diff --git a/plugins/KeyboardNotify/keyboard.h b/plugins/KeyboardNotify/src/keyboard.h index 8fe6b52fe9..8fe6b52fe9 100644 --- a/plugins/KeyboardNotify/keyboard.h +++ b/plugins/KeyboardNotify/src/keyboard.h diff --git a/plugins/KeyboardNotify/keypresses.cpp b/plugins/KeyboardNotify/src/keypresses.cpp index 6d1cef58e6..6d1cef58e6 100644 --- a/plugins/KeyboardNotify/keypresses.cpp +++ b/plugins/KeyboardNotify/src/keypresses.cpp diff --git a/plugins/KeyboardNotify/keypresses.h b/plugins/KeyboardNotify/src/keypresses.h index 57e99aa25c..57e99aa25c 100644 --- a/plugins/KeyboardNotify/keypresses.h +++ b/plugins/KeyboardNotify/src/keypresses.h diff --git a/plugins/KeyboardNotify/main.cpp b/plugins/KeyboardNotify/src/main.cpp index e82cc2cfdc..e82cc2cfdc 100644 --- a/plugins/KeyboardNotify/main.cpp +++ b/plugins/KeyboardNotify/src/main.cpp diff --git a/plugins/KeyboardNotify/options.cpp b/plugins/KeyboardNotify/src/options.cpp index d74902aec8..d74902aec8 100644 --- a/plugins/KeyboardNotify/options.cpp +++ b/plugins/KeyboardNotify/src/options.cpp diff --git a/plugins/KeyboardNotify/protolist.h b/plugins/KeyboardNotify/src/protolist.h index 5a08d929da..5a08d929da 100644 --- a/plugins/KeyboardNotify/protolist.h +++ b/plugins/KeyboardNotify/src/protolist.h diff --git a/plugins/KeyboardNotify/resource.h b/plugins/KeyboardNotify/src/resource.h index 4ebfb19cd0..4ebfb19cd0 100644 --- a/plugins/KeyboardNotify/resource.h +++ b/plugins/KeyboardNotify/src/resource.h diff --git a/plugins/KeyboardNotify/trigger.cpp b/plugins/KeyboardNotify/src/trigger.cpp index df3d7daaf3..df3d7daaf3 100644 --- a/plugins/KeyboardNotify/trigger.cpp +++ b/plugins/KeyboardNotify/src/trigger.cpp diff --git a/plugins/KeyboardNotify/trigger.h b/plugins/KeyboardNotify/src/trigger.h index 41d830938c..41d830938c 100644 --- a/plugins/KeyboardNotify/trigger.h +++ b/plugins/KeyboardNotify/src/trigger.h diff --git a/plugins/KeyboardNotify/utils.cpp b/plugins/KeyboardNotify/src/utils.cpp index 9c710ba217..9c710ba217 100644 --- a/plugins/KeyboardNotify/utils.cpp +++ b/plugins/KeyboardNotify/src/utils.cpp diff --git a/plugins/KeyboardNotify/utils.h b/plugins/KeyboardNotify/src/utils.h index 66917754ed..66917754ed 100644 --- a/plugins/KeyboardNotify/utils.h +++ b/plugins/KeyboardNotify/src/utils.h |