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

8 files changed, 23 insertions, 29 deletions

diff --git a/plugins/Clist_nicer/skineditor/CHANGELOG b/plugins/Clist_nicer/skineditor/docs/CHANGELOG
index e69de29bb2..e69de29bb2 100644
--- a/plugins/Clist_nicer/skineditor/CHANGELOG
+++ b/plugins/Clist_nicer/skineditor/docs/CHANGELOG
diff --git a/plugins/Clist_nicer/skineditor/README b/plugins/Clist_nicer/skineditor/docs/README
index 48f1084404..48f1084404 100644
--- a/plugins/Clist_nicer/skineditor/README
+++ b/plugins/Clist_nicer/skineditor/docs/README
diff --git a/plugins/Clist_nicer/skineditor/skinedit.rc b/plugins/Clist_nicer/skineditor/res/skinedit.rc
index 760d20b00d..c5d8875b20 100644
--- a/plugins/Clist_nicer/skineditor/skinedit.rc
+++ b/plugins/Clist_nicer/skineditor/res/skinedit.rc
@@ -1,6 +1,6 @@
 // Microsoft Visual C++ generated resource script.

 //

-#include "skineditres.h"

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

 

 #define APSTUDIO_READONLY_SYMBOLS

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

@@ -105,9 +105,9 @@ BEGIN
     BEGIN

         BLOCK "0c0704b0"

         BEGIN

-            VALUE "FileDescription", "Skin Editor (UNICODE)"

+            VALUE "FileDescription", "Skin Editor"

             VALUE "FileVersion", "0, 0, 0, 2"

-            VALUE "InternalName", "CLN SkinEdit (UNICODE)"

+            VALUE "InternalName", "CLN SkinEdit"

             VALUE "LegalCopyright", "Copyright (C) 2006"

             VALUE "LegalTrademarks", "GPL"

             VALUE "OriginalFilename", "cln_skinedit.dll"

@@ -144,7 +144,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 

 1 TEXTINCLUDE 

 BEGIN

-    "skineditres.h\0"

+    "..\src\skineditres.h\0"

 END

 

 2 TEXTINCLUDE 

diff --git a/plugins/Clist_nicer/skineditor/skinedit_10.vcxproj b/plugins/Clist_nicer/skineditor/skinedit_10.vcxproj
index 721b578247..6bfbbe4c98 100644
--- a/plugins/Clist_nicer/skineditor/skinedit_10.vcxproj
+++ b/plugins/Clist_nicer/skineditor/skinedit_10.vcxproj
@@ -75,17 +75,16 @@
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

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

-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

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

       <StringPooling>true</StringPooling>

       <FunctionLevelLinking>true</FunctionLevelLinking>

       <WarningLevel>Level3</WarningLevel>

-      <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>

       <ExceptionHandling>false</ExceptionHandling>

       <FloatingPointModel>Fast</FloatingPointModel>

       <BufferSecurityCheck>false</BufferSecurityCheck>

     </ClCompile>

     <ResourceCompile>

-      <PreprocessorDefinitions>NDEBUG;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

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

     </ResourceCompile>

     <Link>

@@ -103,15 +102,14 @@
     <ClCompile>

       <Optimization>Disabled</Optimization>

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

-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

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

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

       <WarningLevel>Level3</WarningLevel>

       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

-      <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>

     </ClCompile>

     <ResourceCompile>

-      <PreprocessorDefinitions>_DEBUG;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

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

     </ResourceCompile>

     <Link>

@@ -129,17 +127,16 @@
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

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

-      <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

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

       <StringPooling>true</StringPooling>

       <FunctionLevelLinking>true</FunctionLevelLinking>

       <WarningLevel>Level3</WarningLevel>

-      <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>

       <ExceptionHandling>false</ExceptionHandling>

       <FloatingPointModel>Fast</FloatingPointModel>

       <BufferSecurityCheck>false</BufferSecurityCheck>

     </ClCompile>

     <ResourceCompile>

-      <PreprocessorDefinitions>NDEBUG;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

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

     </ResourceCompile>

     <Link>

@@ -157,14 +154,13 @@
     <ClCompile>

       <Optimization>Disabled</Optimization>

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

-      <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

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

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

       <WarningLevel>Level3</WarningLevel>

-      <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>

     </ClCompile>

     <ResourceCompile>

-      <PreprocessorDefinitions>_DEBUG;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

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

     </ResourceCompile>

     <Link>

@@ -177,14 +173,14 @@
     </Link>

   </ItemDefinitionGroup>

   <ItemGroup>

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

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

   </ItemGroup>

   <ItemGroup>

-    <ResourceCompile Include="skinedit.rc" />

+    <ResourceCompile Include="res\skinedit.rc" />

   </ItemGroup>

   <ItemGroup>

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

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

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

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

   </ItemGroup>

   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

   <ImportGroup Label="ExtensionTargets">

diff --git a/plugins/Clist_nicer/skineditor/skinedit_10.vcxproj.filters b/plugins/Clist_nicer/skineditor/skinedit_10.vcxproj.filters
index db3db0a81f..9527aaed45 100644
--- a/plugins/Clist_nicer/skineditor/skinedit_10.vcxproj.filters
+++ b/plugins/Clist_nicer/skineditor/skinedit_10.vcxproj.filters
@@ -13,25 +13,22 @@
       <UniqueIdentifier>{3527c0e6-563d-4d23-9b58-2087fa7f94b0}</UniqueIdentifier>

       <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>

     </Filter>

-    <Filter Include="Docs">

-      <UniqueIdentifier>{7ee02dac-0457-4fee-92e9-6e8387ff910f}</UniqueIdentifier>

-    </Filter>

   </ItemGroup>

   <ItemGroup>

-    <ClCompile Include="main.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

   </ItemGroup>

   <ItemGroup>

-    <ResourceCompile Include="skinedit.rc">

-      <Filter>Source Files</Filter>

+    <ResourceCompile Include="res\skinedit.rc">

+      <Filter>Resource Files</Filter>

     </ResourceCompile>

   </ItemGroup>

   <ItemGroup>

-    <ClInclude Include="commonheaders.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="skineditres.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

   </ItemGroup>

diff --git a/plugins/Clist_nicer/skineditor/commonheaders.h b/plugins/Clist_nicer/skineditor/src/commonheaders.h
index 8717562195..1d6d88b245 100644
--- a/plugins/Clist_nicer/skineditor/commonheaders.h
+++ b/plugins/Clist_nicer/skineditor/src/commonheaders.h
@@ -21,6 +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

 

 #include <m_stdhdr.h>

@@ -54,7 +55,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <m_addcontact.h>

 #include <m_png.h>

 

-#include "../include/m_cln_skinedit.h"

+#include "../../src/include/m_cln_skinedit.h"

 

 // shared vars

 extern HINSTANCE g_hInst;

diff --git a/plugins/Clist_nicer/skineditor/main.cpp b/plugins/Clist_nicer/skineditor/src/main.cpp
index de1996f2f5..de1996f2f5 100644
--- a/plugins/Clist_nicer/skineditor/main.cpp
+++ b/plugins/Clist_nicer/skineditor/src/main.cpp
diff --git a/plugins/Clist_nicer/skineditor/skineditres.h b/plugins/Clist_nicer/skineditor/src/skineditres.h
index 33183de397..33183de397 100644
--- a/plugins/Clist_nicer/skineditor/skineditres.h
+++ b/plugins/Clist_nicer/skineditor/src/skineditres.h