Clist_mw, Clist_nicer, CmdLine, Console: folder structure change

git-svn-id: http://svn.miranda-ng.org/main/trunk@988 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

14 files changed, 44 insertions, 119 deletions

diff --git a/plugins/Console/Console.vcxproj b/plugins/Console/Console.vcxproj
index 821004cc92..578ba3c195 100644
--- a/plugins/Console/Console.vcxproj
+++ b/plugins/Console/Console.vcxproj
@@ -73,7 +73,7 @@
     <ClCompile>

       <Optimization>Disabled</Optimization>

       <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;Console_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;Console_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

       <PrecompiledHeader>Use</PrecompiledHeader>

@@ -97,7 +97,7 @@
     <ClCompile>

       <Optimization>Disabled</Optimization>

       <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;Console_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;Console_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

       <PrecompiledHeader>Use</PrecompiledHeader>

@@ -121,7 +121,7 @@
       <Optimization>Full</Optimization>

       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>

       <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;Console_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;Console_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <StringPooling>true</StringPooling>

       <FunctionLevelLinking>true</FunctionLevelLinking>

       <PrecompiledHeader>Use</PrecompiledHeader>

@@ -148,7 +148,7 @@
       <Optimization>Full</Optimization>

       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>

       <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;Console_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;Console_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <StringPooling>true</StringPooling>

       <FunctionLevelLinking>true</FunctionLevelLinking>

       <PrecompiledHeader>Use</PrecompiledHeader>

@@ -171,38 +171,20 @@
     </Link>

   </ItemDefinitionGroup>

   <ItemGroup>

-    <ClCompile Include="Commonheaders.cpp">

+    <ClCompile Include="src\Commonheaders.cpp">

       <PrecompiledHeader>Create</PrecompiledHeader>

     </ClCompile>

-    <ClCompile Include="Console.cpp" />

-    <ClCompile Include="init.cpp" />

+    <ClCompile Include="src\Console.cpp" />

+    <ClCompile Include="src\init.cpp" />

   </ItemGroup>

   <ItemGroup>

-    <ClInclude Include="Commonheaders.h" />

-    <ClInclude Include="resource.h" />

-    <ClInclude Include="version.h" />

+    <ClInclude Include="src\Commonheaders.h" />

+    <ClInclude Include="src\resource.h" />

+    <ClInclude Include="src\version.h" />

   </ItemGroup>

   <ItemGroup>

-    <None Include="res\btn_dn.ico" />

-    <None Include="res\btn_up.ico" />

-    <None Include="res\close.ico" />

-    <None Include="Res\console.ico" />

-    <None Include="Res\console_dn.bmp" />

-    <None Include="Res\console_up.bmp" />

-    <None Include="Res\copy.ico" />

-    <None Include="Res\delete.ico" />

-    <None Include="res\noscroll.ico" />

-    <None Include="Res\options.ico" />

-    <None Include="res\pause.ico" />

-    <None Include="res\paused.ico" />

-    <None Include="Res\Save.ico" />

-    <None Include="res\scroll.ico" />

-    <None Include="res\start.ico" />

-    <None Include="res\started.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/Console/Console.vcxproj.filters b/plugins/Console/Console.vcxproj.filters
index 7cb1fc485a..ddbba4e23a 100644
--- a/plugins/Console/Console.vcxproj.filters
+++ b/plugins/Console/Console.vcxproj.filters
@@ -15,82 +15,32 @@
     </Filter>

   </ItemGroup>

   <ItemGroup>

-    <ClCompile Include="Commonheaders.cpp">

+    <ClCompile Include="src\Commonheaders.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="Console.cpp">

+    <ClCompile Include="src\Console.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="init.cpp">

+    <ClCompile Include="src\init.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

   </ItemGroup>

   <ItemGroup>

-    <ClInclude Include="Commonheaders.h">

+    <ClInclude Include="src\Commonheaders.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <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>

   </ItemGroup>

   <ItemGroup>

-    <None Include="res\btn_dn.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="res\btn_up.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="res\close.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="Res\console.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="Res\console_dn.bmp">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="Res\console_up.bmp">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="Res\copy.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="Res\delete.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="res\noscroll.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="Res\options.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="res\pause.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="res\paused.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="Res\Save.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="res\scroll.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="res\start.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="res\started.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-  </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>

diff --git a/plugins/Console/Console_history.txt b/plugins/Console/docs/Console_history.txt
index 337cf95b0c..337cf95b0c 100644
--- a/plugins/Console/Console_history.txt
+++ b/plugins/Console/docs/Console_history.txt
diff --git a/plugins/Console/Console_readme.txt b/plugins/Console/docs/Console_readme.txt
index 6d66f9b061..6d66f9b061 100644
--- a/plugins/Console/Console_readme.txt
+++ b/plugins/Console/docs/Console_readme.txt
diff --git a/plugins/Console/console-translation.txt b/plugins/Console/docs/console-translation.txt
index b590fbda35..b590fbda35 100644
--- a/plugins/Console/console-translation.txt
+++ b/plugins/Console/docs/console-translation.txt
diff --git a/plugins/Console/gpl.txt b/plugins/Console/docs/gpl.txt
index 45645b4b53..45645b4b53 100644
--- a/plugins/Console/gpl.txt
+++ b/plugins/Console/docs/gpl.txt
diff --git a/plugins/Console/resource.rc b/plugins/Console/res/resource.rc
index 77507e3c77..c6c2718250 100644
--- a/plugins/Console/resource.rc
+++ b/plugins/Console/res/resource.rc
@@ -1,6 +1,6 @@
 // Microsoft Visual C++ generated resource script.

 //

-#include "resource.h"

+#include "..\src\resource.h"

 

 #define APSTUDIO_READONLY_SYMBOLS

 /////////////////////////////////////////////////////////////////////////////

@@ -8,7 +8,6 @@
 // Generated from the TEXTINCLUDE 2 resource.

 //

 #include <winres.h>

-#include <version.h>

 /////////////////////////////////////////////////////////////////////////////

 #undef APSTUDIO_READONLY_SYMBOLS

 

@@ -100,11 +99,7 @@ END
 

 2 TEXTINCLUDE

 BEGIN

-    "#include <windows.h>\r\n"

     "#include <winres.h>\r\n"

-    "#include <tchar.h>\r\n"

-    "#include <m_button.h>\r\n"

-    "#include <version.h>\0"

 END

 

 3 TEXTINCLUDE

@@ -123,27 +118,27 @@ END
 

 // Icon with lowest ID value placed first to ensure application icon

 // remains consistent on all systems.

-IDI_COPY                ICON                    "Res\\copy.ico"

-IDI_CONSOLE             ICON                    "res\\console.ico"

-IDI_NOSCROLL            ICON                    "Res\\noscroll.ico"

-IDI_SCROLL              ICON                    "Res\\scroll.ico"

-IDI_SAVE                ICON                    "Res\\save.ico"

-IDI_DELETE              ICON                    "Res\\delete.ico"

-IDI_OPTIONS             ICON                    "Res\\options.ico"

-IDI_PAUSED              ICON                    "Res\\paused.ico"

-IDI_STARTED             ICON                    "Res\\started.ico"

-IDI_BTN_UP              ICON                    "Res\\btn_up.ico"

-IDI_BTN_DN              ICON                    "Res\\btn_dn.ico"

-IDI_CLOSE               ICON                    "Res\\close.ico"

-IDI_PAUSE               ICON                    "Res\\pause.ico"

-IDI_START               ICON                    "Res\\start.ico"

-IDI_IN                  ICON                    "Res\\in.ico"

-IDI_OUT                 ICON                    "Res\\out.ico"

-IDI_ARROW               ICON                    "Res\\arrow.ico"

-IDI_INFO                ICON                    "Res\\info.ico"

-IDI_EMPTY               ICON                    "Res\\empty.ico"

-IDI_CONSOLE_UP          ICON                    "Res\\console_up.ico"

-IDI_CONSOLE_DOWN        ICON                    "Res\\console_dn.ico"

+IDI_COPY                ICON                    "copy.ico"

+IDI_CONSOLE             ICON                    "console.ico"

+IDI_NOSCROLL            ICON                    "noscroll.ico"

+IDI_SCROLL              ICON                    "scroll.ico"

+IDI_SAVE                ICON                    "save.ico"

+IDI_DELETE              ICON                    "delete.ico"

+IDI_OPTIONS             ICON                    "options.ico"

+IDI_PAUSED              ICON                    "paused.ico"

+IDI_STARTED             ICON                    "started.ico"

+IDI_BTN_UP              ICON                    "btn_up.ico"

+IDI_BTN_DN              ICON                    "btn_dn.ico"

+IDI_CLOSE               ICON                    "close.ico"

+IDI_PAUSE               ICON                    "pause.ico"

+IDI_START               ICON                    "start.ico"

+IDI_IN                  ICON                    "in.ico"

+IDI_OUT                 ICON                    "out.ico"

+IDI_ARROW               ICON                    "arrow.ico"

+IDI_INFO                ICON                    "info.ico"

+IDI_EMPTY               ICON                    "empty.ico"

+IDI_CONSOLE_UP          ICON                    "console_up.ico"

+IDI_CONSOLE_DOWN        ICON                    "console_dn.ico"

 

 /////////////////////////////////////////////////////////////////////////////

 //

diff --git a/plugins/Console/version.rc b/plugins/Console/res/version.rc
index 9981077b9f..d095fdddac 100644
--- a/plugins/Console/version.rc
+++ b/plugins/Console/res/version.rc
@@ -4,15 +4,13 @@
 #error this file is not editable by Microsoft Visual C++

 #endif //APSTUDIO_INVOKED

 

-#include "resource.h"

-

 #define APSTUDIO_READONLY_SYMBOLS

 /////////////////////////////////////////////////////////////////////////////

 //

 // Generated from the TEXTINCLUDE 2 resource.

 //

 #include <winres.h>

-#include <version.h>

+#include <..\src\version.h>

 /////////////////////////////////////////////////////////////////////////////

 #undef APSTUDIO_READONLY_SYMBOLS

 

diff --git a/plugins/Console/Console.cpp b/plugins/Console/src/Console.cpp
index b04be4dc39..b04be4dc39 100644
--- a/plugins/Console/Console.cpp
+++ b/plugins/Console/src/Console.cpp
diff --git a/plugins/Console/commonheaders.cpp b/plugins/Console/src/commonheaders.cpp
index cbfb79d624..cbfb79d624 100644
--- a/plugins/Console/commonheaders.cpp
+++ b/plugins/Console/src/commonheaders.cpp
diff --git a/plugins/Console/commonheaders.h b/plugins/Console/src/commonheaders.h
index 63f5a61622..7689c7dce2 100644
--- a/plugins/Console/commonheaders.h
+++ b/plugins/Console/src/commonheaders.h
@@ -21,7 +21,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

 

-

+#define _CRT_SECURE_NO_WARNINGS

 #define _WIN32_WINNT 0x0501

 

 #pragma comment( lib, "comctl32.lib")

diff --git a/plugins/Console/init.cpp b/plugins/Console/src/init.cpp
index 58943d2c6a..58943d2c6a 100644
--- a/plugins/Console/init.cpp
+++ b/plugins/Console/src/init.cpp
diff --git a/plugins/Console/resource.h b/plugins/Console/src/resource.h
index a8947819a4..a8947819a4 100644
--- a/plugins/Console/resource.h
+++ b/plugins/Console/src/resource.h
diff --git a/plugins/Console/version.h b/plugins/Console/src/version.h
index c91b5628e0..c91b5628e0 100644
--- a/plugins/Console/version.h
+++ b/plugins/Console/src/version.h