1 files changed, 53 insertions, 60 deletions
diff --git a/plugins/Variables/Variables_10.vcxproj b/plugins/Variables/Variables_10.vcxproj
index ec80e2139f..f9ac10a27e 100644
--- a/plugins/Variables/Variables_10.vcxproj
+++ b/plugins/Variables/Variables_10.vcxproj
@@ -72,13 +72,12 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;pcre\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;VARIABLES_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;src\pcre\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>variables.h</PrecompiledHeaderFile>
     </ClCompile>
@@ -92,7 +91,7 @@
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
       <SubSystem>Windows</SubSystem>
-      <AdditionalLibraryDirectories>pcre\lib;$(SolutionDir)\lib</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>src\pcre\lib;$(SolutionDir)\lib</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -100,12 +99,11 @@
       <Optimization>Full</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
-      <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;pcre\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;VARIABLES_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;src\pcre\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <WarningLevel>Level3</WarningLevel>
-      <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>variables.h</PrecompiledHeaderFile>
     </ClCompile>
@@ -121,18 +119,17 @@
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
       <SubSystem>Windows</SubSystem>
-      <AdditionalLibraryDirectories>pcre\lib;$(SolutionDir)\lib</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>src\pcre\lib;$(SolutionDir)\lib</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;pcre\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;VARIABLES_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;src\pcre\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Optimization>Full</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
       <WarningLevel>Level3</WarningLevel>
-      <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
       <StringPooling>true</StringPooling>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PrecompiledHeader>Use</PrecompiledHeader>
@@ -146,7 +143,7 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <SubSystem>Windows</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <AdditionalLibraryDirectories>pcre\lib64;$(SolutionDir)\lib</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>src\pcre\lib64;$(SolutionDir)\lib</AdditionalLibraryDirectories>
     </Link>
     <ResourceCompile>
       <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>
@@ -155,10 +152,9 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;pcre\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;VARIABLES_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;src\pcre\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <WarningLevel>Level3</WarningLevel>
-      <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
       <Optimization>Disabled</Optimization>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -171,7 +167,7 @@
       <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
       <SubSystem>Windows</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <AdditionalLibraryDirectories>pcre\lib64;$(SolutionDir)\lib</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>src\pcre\lib64;$(SolutionDir)\lib</AdditionalLibraryDirectories>
     </Link>
     <ResourceCompile>
       <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>
@@ -179,63 +175,60 @@
     </ResourceCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="contact.cpp" />
-    <ClCompile Include="help.cpp" />
-    <ClCompile Include="lookup3.cpp">
+    <ClCompile Include="src\contact.cpp" />
+    <ClCompile Include="src\help.cpp" />
+    <ClCompile Include="src\lookup3.cpp">
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="main.cpp">
+    <ClCompile Include="src\main.cpp">
       <PrecompiledHeader>Create</PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="options.cpp" />
-    <ClCompile Include="tokenregister.cpp" />
-    <ClCompile Include="variables.cpp" />
-    <ClCompile Include="enumprocs.cpp">
+    <ClCompile Include="src\options.cpp" />
+    <ClCompile Include="src\tokenregister.cpp" />
+    <ClCompile Include="src\variables.cpp" />
+    <ClCompile Include="src\enumprocs.cpp">
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="parse_alias.cpp" />
-    <ClCompile Include="parse_external.cpp" />
-    <ClCompile Include="parse_inet.cpp" />
-    <ClCompile Include="parse_logic.cpp" />
-    <ClCompile Include="parse_math.cpp" />
-    <ClCompile Include="parse_metacontacts.cpp" />
-    <ClCompile Include="parse_miranda.cpp" />
-    <ClCompile Include="parse_regexp.cpp" />
-    <ClCompile Include="parse_str.cpp" />
-    <ClCompile Include="parse_system.cpp" />
-    <ClCompile Include="parse_variables.cpp" />
-    <ClCompile Include="parse_xml.cpp" />
-    <ClCompile Include="action_variables.cpp" />
-    <ClCompile Include="condition_variables.cpp" />
-    <ClCompile Include="trigger_variables.cpp" />
+    <ClCompile Include="src\parse_alias.cpp" />
+    <ClCompile Include="src\parse_external.cpp" />
+    <ClCompile Include="src\parse_inet.cpp" />
+    <ClCompile Include="src\parse_logic.cpp" />
+    <ClCompile Include="src\parse_math.cpp" />
+    <ClCompile Include="src\parse_metacontacts.cpp" />
+    <ClCompile Include="src\parse_miranda.cpp" />
+    <ClCompile Include="src\parse_regexp.cpp" />
+    <ClCompile Include="src\parse_str.cpp" />
+    <ClCompile Include="src\parse_system.cpp" />
+    <ClCompile Include="src\parse_variables.cpp" />
+    <ClCompile Include="src\parse_xml.cpp" />
+    <ClCompile Include="src\action_variables.cpp" />
+    <ClCompile Include="src\condition_variables.cpp" />
+    <ClCompile Include="src\trigger_variables.cpp" />
     <ClCompile Include="..\helpers\gen_helpers.cpp">
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="contact.h" />
-    <ClInclude Include="variables.h" />
-    <ClInclude Include="enumprocs.h" />
-    <ClInclude Include="parse_alias.h" />
-    <ClInclude Include="parse_external.h" />
-    <ClInclude Include="parse_inet.h" />
-    <ClInclude Include="parse_logic.h" />
-    <ClInclude Include="parse_math.h" />
-    <ClInclude Include="parse_metacontacts.h" />
-    <ClInclude Include="parse_miranda.h" />
-    <ClInclude Include="parse_regexp.h" />
-    <ClInclude Include="parse_str.h" />
-    <ClInclude Include="parse_system.h" />
-    <ClInclude Include="parse_variables.h" />
-    <ClInclude Include="parse_xml.h" />
-    <ClInclude Include="trigger_variables.h" />
+    <ClInclude Include="src\contact.h" />
+    <ClInclude Include="src\variables.h" />
+    <ClInclude Include="src\enumprocs.h" />
+    <ClInclude Include="src\parse_alias.h" />
+    <ClInclude Include="src\parse_external.h" />
+    <ClInclude Include="src\parse_inet.h" />
+    <ClInclude Include="src\parse_logic.h" />
+    <ClInclude Include="src\parse_math.h" />
+    <ClInclude Include="src\parse_metacontacts.h" />
+    <ClInclude Include="src\parse_miranda.h" />
+    <ClInclude Include="src\parse_regexp.h" />
+    <ClInclude Include="src\parse_str.h" />
+    <ClInclude Include="src\parse_system.h" />
+    <ClInclude Include="src\parse_variables.h" />
+    <ClInclude Include="src\parse_xml.h" />
+    <ClInclude Include="src\trigger_variables.h" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="V.ico" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="Variables.rc" />
-    <ResourceCompile Include="version.rc" />
+    <ResourceCompile Include="res\Variables.rc" />
+    <ResourceCompile Include="res\version.rc" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">