diff options
Diffstat (limited to 'plugins/SimpleAR')
-rw-r--r-- | plugins/SimpleAR/Res/Resource.rc (renamed from plugins/SimpleAR/Resource.rc) | 8 | ||||
-rw-r--r-- | plugins/SimpleAR/Res/Version.rc (renamed from plugins/SimpleAR/Version.rc) | 2 | ||||
-rw-r--r-- | plugins/SimpleAR/SimpleAR_10.vcxproj | 30 | ||||
-rw-r--r-- | plugins/SimpleAR/SimpleAR_10.vcxproj.filters | 28 | ||||
-rw-r--r-- | plugins/SimpleAR/Src/Common.h | 5 | ||||
-rw-r--r-- | plugins/SimpleAR/Src/Resource.h (renamed from plugins/SimpleAR/Resource.h) | 0 | ||||
-rw-r--r-- | plugins/SimpleAR/Src/Version.h (renamed from plugins/SimpleAR/Version.h) | 0 | ||||
-rw-r--r-- | plugins/SimpleAR/docs/simplear-translation.txt (renamed from plugins/SimpleAR/simplear-translation.txt) | 0 |
8 files changed, 29 insertions, 44 deletions
diff --git a/plugins/SimpleAR/Resource.rc b/plugins/SimpleAR/Res/Resource.rc index 9a3b32351f..4a43561be7 100644 --- a/plugins/SimpleAR/Resource.rc +++ b/plugins/SimpleAR/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_US 1 TEXTINCLUDE
BEGIN
- "resource.h\0"
+ "..\\src\\resource.h\0"
END
2 TEXTINCLUDE
@@ -76,8 +76,8 @@ END // Icon
// remains consistent on all systems.
-IDI_ON ICON "Res/On.ico"
-IDI_OFF ICON "Res/Off.ico"
+IDI_ON ICON "On.ico"
+IDI_OFF ICON "Off.ico"
/////////////////////////////////////////////////////////////////////////////
diff --git a/plugins/SimpleAR/Version.rc b/plugins/SimpleAR/Res/Version.rc index d1da5e8d6a..d741488c4f 100644 --- a/plugins/SimpleAR/Version.rc +++ b/plugins/SimpleAR/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/SimpleAR/SimpleAR_10.vcxproj b/plugins/SimpleAR/SimpleAR_10.vcxproj index 9f3318be48..e0f8f32914 100644 --- a/plugins/SimpleAR/SimpleAR_10.vcxproj +++ b/plugins/SimpleAR/SimpleAR_10.vcxproj @@ -73,12 +73,11 @@ <ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;SAR_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>Common.h</PrecompiledHeaderFile>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
</ClCompile>
<Link>
@@ -99,12 +98,11 @@ <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
<FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
<AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;SAR_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>Common.h</PrecompiledHeaderFile>
<WarningLevel>Level3</WarningLevel>
- <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
@@ -124,11 +122,10 @@ <ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;SAR_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>Common.h</PrecompiledHeaderFile>
<WarningLevel>Level3</WarningLevel>
- <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
</ClCompile>
<Link>
@@ -149,12 +146,11 @@ <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
<FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
<AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;SAR_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>Common.h</PrecompiledHeaderFile>
<WarningLevel>Level3</WarningLevel>
- <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
@@ -171,23 +167,19 @@ </ResourceCompile>
</ItemDefinitionGroup>
<ItemGroup>
- <ClCompile Include="Src\Main.cpp">
+ <ClCompile Include="src\Main.cpp">
<PrecompiledHeader>Create</PrecompiledHeader>
</ClCompile>
- <ClCompile Include="Src\Options.cpp" />
+ <ClCompile Include="src\Options.cpp" />
</ItemGroup>
<ItemGroup>
- <ClInclude Include="Src\Common.h" />
- <ClInclude Include="Resource.h" />
- <ClInclude Include="Version.h" />
+ <ClInclude Include="src\Common.h" />
+ <ClInclude Include="src\Resource.h" />
+ <ClInclude Include="src\Version.h" />
</ItemGroup>
<ItemGroup>
- <None Include="Res\Off.ico" />
- <None Include="Res\On.ico" />
- </ItemGroup>
- <ItemGroup>
- <ResourceCompile Include="Resource.rc" />
- <ResourceCompile Include="Version.rc" />
+ <ResourceCompile Include="res\Resource.rc" />
+ <ResourceCompile Include="res\Version.rc" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
diff --git a/plugins/SimpleAR/SimpleAR_10.vcxproj.filters b/plugins/SimpleAR/SimpleAR_10.vcxproj.filters index 11860e6f80..5e00533b00 100644 --- a/plugins/SimpleAR/SimpleAR_10.vcxproj.filters +++ b/plugins/SimpleAR/SimpleAR_10.vcxproj.filters @@ -1,51 +1,43 @@ <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
- <Filter Include="Source">
+ <Filter Include="Source Files">
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
<Extensions>cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
</Filter>
- <Filter Include="Header">
+ <Filter Include="Header Files">
<UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
<Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
</Filter>
- <Filter Include="Resource">
+ <Filter Include="Resource Files">
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx</Extensions>
</Filter>
</ItemGroup>
<ItemGroup>
- <ClCompile Include="Src\Main.cpp">
+ <ClCompile Include="src\Main.cpp">
<Filter>Source</Filter>
</ClCompile>
- <ClCompile Include="Src\Options.cpp">
+ <ClCompile Include="src\Options.cpp">
<Filter>Source</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
- <ClInclude Include="Src\Common.h">
+ <ClInclude Include="src\Common.h">
<Filter>Header</Filter>
</ClInclude>
- <ClInclude Include="Resource.h">
+ <ClInclude Include="src\Resource.h">
<Filter>Header</Filter>
</ClInclude>
- <ClInclude Include="Version.h">
+ <ClInclude Include="src\Version.h">
<Filter>Header</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
- <None Include="Res\Off.ico">
- <Filter>Resource</Filter>
- </None>
- <None Include="Res\On.ico">
- <Filter>Resource</Filter>
- </None>
- </ItemGroup>
- <ItemGroup>
- <ResourceCompile Include="Resource.rc">
+ <ResourceCompile Include="res\Resource.rc">
<Filter>Resource</Filter>
</ResourceCompile>
- <ResourceCompile Include="Version.rc">
+ <ResourceCompile Include="res\Version.rc">
<Filter>Resource</Filter>
</ResourceCompile>
</ItemGroup>
diff --git a/plugins/SimpleAR/Src/Common.h b/plugins/SimpleAR/Src/Common.h index 085786d869..ca873cb2ae 100644 --- a/plugins/SimpleAR/Src/Common.h +++ b/plugins/SimpleAR/Src/Common.h @@ -1,4 +1,5 @@ #define MIRANDA_VER 0x0A00
+#define _CRT_SECURE_NO_WARNINGS
// Windows Header Files
#include <windows.h>
@@ -30,8 +31,8 @@ #include "m_clc.h"
#include <m_variables.h>
-#include "..\Resource.h"
-#include "..\Version.h"
+#include "Resource.h"
+#include "Version.h"
#define protocolname "SimpleAutoReplier" //no spaces here :)
diff --git a/plugins/SimpleAR/Resource.h b/plugins/SimpleAR/Src/Resource.h index 384930dd39..384930dd39 100644 --- a/plugins/SimpleAR/Resource.h +++ b/plugins/SimpleAR/Src/Resource.h diff --git a/plugins/SimpleAR/Version.h b/plugins/SimpleAR/Src/Version.h index 76395a436a..76395a436a 100644 --- a/plugins/SimpleAR/Version.h +++ b/plugins/SimpleAR/Src/Version.h diff --git a/plugins/SimpleAR/simplear-translation.txt b/plugins/SimpleAR/docs/simplear-translation.txt index 215cfdcb9d..215cfdcb9d 100644 --- a/plugins/SimpleAR/simplear-translation.txt +++ b/plugins/SimpleAR/docs/simplear-translation.txt |