diff options
| author | Vadim Dashevskiy <watcherhd@gmail.com> | 2012-07-16 16:31:53 +0000 |
|---|---|---|
| committer | Vadim Dashevskiy <watcherhd@gmail.com> | 2012-07-16 16:31:53 +0000 |
| commit | 5b0a53a6d3f1b8d70b34631d96d3815d0a334dd3 (patch) | |
| tree | 9b38676d8ae565bac52063f5398dde110082a26f | |
| parent | 1cf47d1eaff4d7d7242d0ab87dd540ae5b400833 (diff) | |
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
| -rw-r--r-- | plugins/Clist_mw/clist_mw_10.vcxproj | 91 | ||||
| -rw-r--r-- | plugins/Clist_mw/clist_mw_10.vcxproj.filters | 130 | ||||
| -rw-r--r-- | plugins/Clist_mw/docs/clist_mw-translation.txt (renamed from plugins/Clist_mw/clist_mw-translation.txt) | 0 | ||||
| -rw-r--r-- | plugins/Clist_mw/res/blank1.ico | bin | 318 -> 0 bytes | |||
| -rw-r--r-- | plugins/Clist_mw/res/resource.rc (renamed from plugins/Clist_mw/resource.rc) | 44 | ||||
| -rw-r--r-- | plugins/Clist_mw/src/BkgrCfg.cpp (renamed from plugins/Clist_mw/BkgrCfg.cpp) | 0 | ||||
| -rw-r--r-- | plugins/Clist_mw/src/BkgrCfg.h (renamed from plugins/Clist_mw/BkgrCfg.h) | 0 | ||||
| -rw-r--r-- | plugins/Clist_mw/src/CLUIFrames/cluiframes.cpp (renamed from plugins/Clist_mw/CLUIFrames/cluiframes.cpp) | 0 | ||||
| -rw-r--r-- | plugins/Clist_mw/src/CLUIFrames/cluiframes.h (renamed from plugins/Clist_mw/CLUIFrames/cluiframes.h) | 0 | ||||
| -rw-r--r-- | plugins/Clist_mw/src/CLUIFrames/extraimage.cpp (renamed from plugins/Clist_mw/CLUIFrames/extraimage.cpp) | 0 | ||||
| -rw-r--r-- | plugins/Clist_mw/src/CLUIFrames/framesmenu.cpp (renamed from plugins/Clist_mw/CLUIFrames/framesmenu.cpp) | 0 | ||||
| -rw-r--r-- | plugins/Clist_mw/src/CLUIFrames/statusbar.cpp (renamed from plugins/Clist_mw/CLUIFrames/statusbar.cpp) | 0 | ||||
| -rw-r--r-- | plugins/Clist_mw/src/clc.cpp (renamed from plugins/Clist_mw/clc.cpp) | 0 | ||||
| -rw-r--r-- | plugins/Clist_mw/src/clc.h (renamed from plugins/Clist_mw/clc.h) | 0 | ||||
| -rw-r--r-- | plugins/Clist_mw/src/clcfonts.cpp (renamed from plugins/Clist_mw/clcfonts.cpp) | 0 | ||||
| -rw-r--r-- | plugins/Clist_mw/src/clcidents.cpp (renamed from plugins/Clist_mw/clcidents.cpp) | 0 | ||||
| -rw-r--r-- | plugins/Clist_mw/src/clcitems.cpp (renamed from plugins/Clist_mw/clcitems.cpp) | 0 | ||||
| -rw-r--r-- | plugins/Clist_mw/src/clcopts.cpp (renamed from plugins/Clist_mw/clcopts.cpp) | 0 | ||||
| -rw-r--r-- | plugins/Clist_mw/src/clcpaint.cpp (renamed from plugins/Clist_mw/clcpaint.cpp) | 0 | ||||
| -rw-r--r-- | plugins/Clist_mw/src/clcutils.cpp (renamed from plugins/Clist_mw/clcutils.cpp) | 0 | ||||
| -rw-r--r-- | plugins/Clist_mw/src/clist.h (renamed from plugins/Clist_mw/clist.h) | 0 | ||||
| -rw-r--r-- | plugins/Clist_mw/src/clistmenus.cpp (renamed from plugins/Clist_mw/clistmenus.cpp) | 0 | ||||
| -rw-r--r-- | plugins/Clist_mw/src/clistmod.cpp (renamed from plugins/Clist_mw/clistmod.cpp) | 0 | ||||
| -rw-r--r-- | plugins/Clist_mw/src/clistopts.cpp (renamed from plugins/Clist_mw/clistopts.cpp) | 0 | ||||
| -rw-r--r-- | plugins/Clist_mw/src/clistsettings.cpp (renamed from plugins/Clist_mw/clistsettings.cpp) | 0 | ||||
| -rw-r--r-- | plugins/Clist_mw/src/clisttray.cpp (renamed from plugins/Clist_mw/clisttray.cpp) | 0 | ||||
| -rw-r--r-- | plugins/Clist_mw/src/clui.cpp (renamed from plugins/Clist_mw/clui.cpp) | 0 | ||||
| -rw-r--r-- | plugins/Clist_mw/src/cluiopts.cpp (renamed from plugins/Clist_mw/cluiopts.cpp) | 0 | ||||
| -rw-r--r-- | plugins/Clist_mw/src/cluiservices.cpp (renamed from plugins/Clist_mw/cluiservices.cpp) | 0 | ||||
| -rw-r--r-- | plugins/Clist_mw/src/commonheaders.cpp (renamed from plugins/Clist_mw/commonheaders.cpp) | 0 | ||||
| -rw-r--r-- | plugins/Clist_mw/src/commonheaders.h (renamed from plugins/Clist_mw/commonheaders.h) | 1 | ||||
| -rw-r--r-- | plugins/Clist_mw/src/contact.cpp (renamed from plugins/Clist_mw/contact.cpp) | 0 | ||||
| -rw-r--r-- | plugins/Clist_mw/src/groupmenu.cpp (renamed from plugins/Clist_mw/groupmenu.cpp) | 0 | ||||
| -rw-r--r-- | plugins/Clist_mw/src/init.cpp (renamed from plugins/Clist_mw/init.cpp) | 0 | ||||
| -rw-r--r-- | plugins/Clist_mw/src/keyboard.cpp (renamed from plugins/Clist_mw/keyboard.cpp) | 0 | ||||
| -rw-r--r-- | plugins/Clist_mw/src/resource.h (renamed from plugins/Clist_mw/resource.h) | 0 | ||||
| -rw-r--r-- | plugins/Clist_nicer/SRC/CLUIFrames/cluiframes.cpp (renamed from plugins/Clist_nicer/CLUIFrames/cluiframes.cpp) | 0 | ||||
| -rw-r--r-- | plugins/Clist_nicer/SRC/CLUIFrames/cluiframes.h (renamed from plugins/Clist_nicer/CLUIFrames/cluiframes.h) | 0 | ||||
| -rw-r--r-- | plugins/Clist_nicer/SRC/CLUIFrames/framesmenu.cpp (renamed from plugins/Clist_nicer/CLUIFrames/framesmenu.cpp) | 0 | ||||
| -rw-r--r-- | plugins/Clist_nicer/SRC/CLUIFrames/groupmenu.cpp (renamed from plugins/Clist_nicer/CLUIFrames/groupmenu.cpp) | 0 | ||||
| -rw-r--r-- | plugins/Clist_nicer/SRC/CLUIFrames/movetogroup.cpp (renamed from plugins/Clist_nicer/CLUIFrames/movetogroup.cpp) | 0 | ||||
| -rw-r--r-- | plugins/Clist_nicer/SRC/Coolsb/coolsb_internal.h (renamed from plugins/Clist_nicer/coolsb/coolsb_internal.h) | 0 | ||||
| -rw-r--r-- | plugins/Clist_nicer/SRC/Coolsb/coolsblib.cpp (renamed from plugins/Clist_nicer/coolsb/coolsblib.cpp) | 0 | ||||
| -rw-r--r-- | plugins/Clist_nicer/SRC/Coolsb/coolsblib.h (renamed from plugins/Clist_nicer/coolsb/coolsblib.h) | 0 | ||||
| -rw-r--r-- | plugins/Clist_nicer/SRC/Coolsb/coolscroll.cpp (renamed from plugins/Clist_nicer/coolsb/coolscroll.cpp) | 0 | ||||
| -rw-r--r-- | plugins/Clist_nicer/SRC/Coolsb/coolscroll.h (renamed from plugins/Clist_nicer/coolsb/coolscroll.h) | 0 | ||||
| -rw-r--r-- | plugins/Clist_nicer/SRC/Coolsb/userdefs.h (renamed from plugins/Clist_nicer/coolsb/userdefs.h) | 0 | ||||
| -rw-r--r-- | plugins/Clist_nicer/SRC/Include/alphablend.h (renamed from plugins/Clist_nicer/INCLUDE/alphablend.h) | 0 | ||||
| -rw-r--r-- | plugins/Clist_nicer/SRC/Include/clc.h (renamed from plugins/Clist_nicer/INCLUDE/clc.h) | 0 | ||||
| -rw-r--r-- | plugins/Clist_nicer/SRC/Include/clist.h (renamed from plugins/Clist_nicer/INCLUDE/clist.h) | 0 | ||||
| -rw-r--r-- | plugins/Clist_nicer/SRC/Include/commonheaders.h (renamed from plugins/Clist_nicer/INCLUDE/commonheaders.h) | 0 | ||||
| -rw-r--r-- | plugins/Clist_nicer/SRC/Include/config.h (renamed from plugins/Clist_nicer/INCLUDE/config.h) | 0 | ||||
| -rw-r--r-- | plugins/Clist_nicer/SRC/Include/extBackg.h (renamed from plugins/Clist_nicer/INCLUDE/extBackg.h) | 0 | ||||
| -rw-r--r-- | plugins/Clist_nicer/SRC/Include/m_cln_skinedit.h (renamed from plugins/Clist_nicer/INCLUDE/m_cln_skinedit.h) | 0 | ||||
| -rw-r--r-- | plugins/Clist_nicer/SRC/Include/resource.h (renamed from plugins/Clist_nicer/INCLUDE/resource.h) | 0 | ||||
| -rw-r--r-- | plugins/Clist_nicer/SRC/Include/rowheight_funcs.h (renamed from plugins/Clist_nicer/INCLUDE/rowheight_funcs.h) | 0 | ||||
| -rw-r--r-- | plugins/Clist_nicer/SRC/Include/vsstyle.h (renamed from plugins/Clist_nicer/INCLUDE/vsstyle.h) | 0 | ||||
| -rw-r--r-- | plugins/Clist_nicer/SRC/Include/vssym32.h (renamed from plugins/Clist_nicer/INCLUDE/vssym32.h) | 0 | ||||
| -rw-r--r-- | plugins/Clist_nicer/clist_nicer_10.vcxproj | 157 | ||||
| -rw-r--r-- | plugins/Clist_nicer/clist_nicer_10.vcxproj.filters | 218 | ||||
| -rw-r--r-- | plugins/Clist_nicer/docs/clist_nicer-translation.txt (renamed from plugins/Clist_nicer/clist_nicer-translation.txt) | 0 | ||||
| -rw-r--r-- | plugins/Clist_nicer/res/resource.rc (renamed from plugins/Clist_nicer/resource.rc) | 87 | ||||
| -rw-r--r-- | plugins/Clist_nicer/res/version.rc (renamed from plugins/Clist_nicer/version.rc) | 13 | ||||
| -rw-r--r-- | plugins/Clist_nicer/skineditor/docs/CHANGELOG (renamed from plugins/Clist_nicer/skineditor/CHANGELOG) | 0 | ||||
| -rw-r--r-- | plugins/Clist_nicer/skineditor/docs/README (renamed from plugins/Clist_nicer/skineditor/README) | 0 | ||||
| -rw-r--r-- | plugins/Clist_nicer/skineditor/res/skinedit.rc (renamed from plugins/Clist_nicer/skineditor/skinedit.rc) | 8 | ||||
| -rw-r--r-- | plugins/Clist_nicer/skineditor/skinedit_10.vcxproj | 28 | ||||
| -rw-r--r-- | plugins/Clist_nicer/skineditor/skinedit_10.vcxproj.filters | 13 | ||||
| -rw-r--r-- | plugins/Clist_nicer/skineditor/src/commonheaders.h (renamed from plugins/Clist_nicer/skineditor/commonheaders.h) | 3 | ||||
| -rw-r--r-- | plugins/Clist_nicer/skineditor/src/main.cpp (renamed from plugins/Clist_nicer/skineditor/main.cpp) | 0 | ||||
| -rw-r--r-- | plugins/Clist_nicer/skineditor/src/skineditres.h (renamed from plugins/Clist_nicer/skineditor/skineditres.h) | 0 | ||||
| -rw-r--r-- | plugins/CmdLine/CmdLine.rc | 63 | ||||
| -rw-r--r-- | plugins/CmdLine/CmdLine.vcxproj | 35 | ||||
| -rw-r--r-- | plugins/CmdLine/CmdLine.vcxproj.filters | 37 | ||||
| -rw-r--r-- | plugins/CmdLine/MimCmd/MimCmd.vcxproj | 14 | ||||
| -rw-r--r-- | plugins/CmdLine/MimCmd/MimCmd.vcxproj.filters | 14 | ||||
| -rw-r--r-- | plugins/CmdLine/MimCmd/res/version.rc (renamed from plugins/CmdLine/version.rc) | 3 | ||||
| -rw-r--r-- | plugins/CmdLine/MimCmd/src/MimCmd.cpp (renamed from plugins/CmdLine/MimCmd/MimCmd.cpp) | 4 | ||||
| -rw-r--r-- | plugins/CmdLine/MimCmd/src/commands.cpp (renamed from plugins/CmdLine/MimCmd/commands.cpp) | 0 | ||||
| -rw-r--r-- | plugins/CmdLine/MimCmd/src/commands.h (renamed from plugins/CmdLine/MimCmd/commands.h) | 0 | ||||
| -rw-r--r-- | plugins/CmdLine/MimCmd/src/common.h (renamed from plugins/CmdLine/MimCmd/common.h) | 2 | ||||
| -rw-r--r-- | plugins/CmdLine/MimCmd/src/resource.h (renamed from plugins/CmdLine/MimCmd/resource.h) | 0 | ||||
| -rw-r--r-- | plugins/CmdLine/res/version.rc (renamed from plugins/CmdLine/MimCmd/version.rc) | 3 | ||||
| -rw-r--r-- | plugins/CmdLine/src/CmdLine.cpp (renamed from plugins/CmdLine/CmdLine.cpp) | 0 | ||||
| -rw-r--r-- | plugins/CmdLine/src/commonheaders.h (renamed from plugins/CmdLine/commonheaders.h) | 0 | ||||
| -rw-r--r-- | plugins/CmdLine/src/hooked_events.cpp (renamed from plugins/CmdLine/hooked_events.cpp) | 0 | ||||
| -rw-r--r-- | plugins/CmdLine/src/hooked_events.h (renamed from plugins/CmdLine/hooked_events.h) | 0 | ||||
| -rw-r--r-- | plugins/CmdLine/src/mimcmd_data.cpp (renamed from plugins/CmdLine/mimcmd_data.cpp) | 0 | ||||
| -rw-r--r-- | plugins/CmdLine/src/mimcmd_data.h (renamed from plugins/CmdLine/mimcmd_data.h) | 0 | ||||
| -rw-r--r-- | plugins/CmdLine/src/mimcmd_handlers.cpp (renamed from plugins/CmdLine/mimcmd_handlers.cpp) | 0 | ||||
| -rw-r--r-- | plugins/CmdLine/src/mimcmd_handlers.h (renamed from plugins/CmdLine/mimcmd_handlers.h) | 0 | ||||
| -rw-r--r-- | plugins/CmdLine/src/mimcmd_ipc.cpp (renamed from plugins/CmdLine/mimcmd_ipc.cpp) | 0 | ||||
| -rw-r--r-- | plugins/CmdLine/src/mimcmd_ipc.h (renamed from plugins/CmdLine/mimcmd_ipc.h) | 0 | ||||
| -rw-r--r-- | plugins/CmdLine/src/resource.h (renamed from plugins/CmdLine/resource.h) | 0 | ||||
| -rw-r--r-- | plugins/CmdLine/src/services.cpp (renamed from plugins/CmdLine/services.cpp) | 0 | ||||
| -rw-r--r-- | plugins/CmdLine/src/services.h (renamed from plugins/CmdLine/services.h) | 0 | ||||
| -rw-r--r-- | plugins/CmdLine/src/utils.cpp (renamed from plugins/CmdLine/utils.cpp) | 0 | ||||
| -rw-r--r-- | plugins/CmdLine/src/utils.h (renamed from plugins/CmdLine/utils.h) | 0 | ||||
| -rw-r--r-- | plugins/CmdLine/src/version.h (renamed from plugins/CmdLine/version.h) | 0 | ||||
| -rw-r--r-- | plugins/Console/Console.vcxproj | 42 | ||||
| -rw-r--r-- | plugins/Console/Console.vcxproj.filters | 66 | ||||
| -rw-r--r-- | plugins/Console/docs/Console_history.txt (renamed from plugins/Console/Console_history.txt) | 0 | ||||
| -rw-r--r-- | plugins/Console/docs/Console_readme.txt (renamed from plugins/Console/Console_readme.txt) | 0 | ||||
| -rw-r--r-- | plugins/Console/docs/console-translation.txt (renamed from plugins/Console/console-translation.txt) | 0 | ||||
| -rw-r--r-- | plugins/Console/docs/gpl.txt (renamed from plugins/Console/gpl.txt) | 0 | ||||
| -rw-r--r-- | plugins/Console/res/resource.rc (renamed from plugins/Console/resource.rc) | 49 | ||||
| -rw-r--r-- | plugins/Console/res/version.rc (renamed from plugins/Console/version.rc) | 4 | ||||
| -rw-r--r-- | plugins/Console/src/Console.cpp (renamed from plugins/Console/Console.cpp) | 0 | ||||
| -rw-r--r-- | plugins/Console/src/commonheaders.cpp (renamed from plugins/Console/commonheaders.cpp) | 0 | ||||
| -rw-r--r-- | plugins/Console/src/commonheaders.h (renamed from plugins/Console/commonheaders.h) | 2 | ||||
| -rw-r--r-- | plugins/Console/src/init.cpp (renamed from plugins/Console/init.cpp) | 0 | ||||
| -rw-r--r-- | plugins/Console/src/resource.h (renamed from plugins/Console/resource.h) | 0 | ||||
| -rw-r--r-- | plugins/Console/src/version.h (renamed from plugins/Console/version.h) | 0 |
113 files changed, 353 insertions, 778 deletions
diff --git a/plugins/Clist_mw/clist_mw_10.vcxproj b/plugins/Clist_mw/clist_mw_10.vcxproj index eccc444cc3..702317ff2a 100644 --- a/plugins/Clist_mw/clist_mw_10.vcxproj +++ b/plugins/Clist_mw/clist_mw_10.vcxproj @@ -82,7 +82,6 @@ <PrecompiledHeaderFile>commonheaders.h</PrecompiledHeaderFile>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -111,7 +110,6 @@ <PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>commonheaders.h</PrecompiledHeaderFile>
<WarningLevel>Level3</WarningLevel>
- <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -124,7 +122,6 @@ <BaseAddress>0x6590000</BaseAddress>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
- <TargetMachine>MachineX64</TargetMachine>
<SubSystem>Windows</SubSystem>
<AdditionalLibraryDirectories>$(SolutionDir)\lib</AdditionalLibraryDirectories>
</Link>
@@ -143,7 +140,6 @@ <PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>commonheaders.h</PrecompiledHeaderFile>
<WarningLevel>Level3</WarningLevel>
- <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -176,7 +172,6 @@ <PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>commonheaders.h</PrecompiledHeaderFile>
<WarningLevel>Level3</WarningLevel>
- <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -196,75 +191,51 @@ </Link>
</ItemDefinitionGroup>
<ItemGroup>
- <ClCompile Include="BkgrCfg.cpp" />
- <ClCompile Include="clc.cpp" />
- <ClCompile Include="clcfonts.cpp" />
- <ClCompile Include="clcidents.cpp" />
- <ClCompile Include="clcitems.cpp" />
- <ClCompile Include="clcopts.cpp" />
- <ClCompile Include="clcpaint.cpp" />
- <ClCompile Include="clcutils.cpp" />
- <ClCompile Include="clistmenus.cpp" />
- <ClCompile Include="clistmod.cpp" />
- <ClCompile Include="clistopts.cpp" />
- <ClCompile Include="clistsettings.cpp" />
- <ClCompile Include="clisttray.cpp" />
- <ClCompile Include="clui.cpp" />
- <ClCompile Include="cluiopts.cpp" />
- <ClCompile Include="cluiservices.cpp" />
- <ClCompile Include="commonheaders.cpp">
+ <ClCompile Include="src\BkgrCfg.cpp" />
+ <ClCompile Include="src\clc.cpp" />
+ <ClCompile Include="src\clcfonts.cpp" />
+ <ClCompile Include="src\clcidents.cpp" />
+ <ClCompile Include="src\clcitems.cpp" />
+ <ClCompile Include="src\clcopts.cpp" />
+ <ClCompile Include="src\clcpaint.cpp" />
+ <ClCompile Include="src\clcutils.cpp" />
+ <ClCompile Include="src\clistmenus.cpp" />
+ <ClCompile Include="src\clistmod.cpp" />
+ <ClCompile Include="src\clistopts.cpp" />
+ <ClCompile Include="src\clistsettings.cpp" />
+ <ClCompile Include="src\clisttray.cpp" />
+ <ClCompile Include="src\clui.cpp" />
+ <ClCompile Include="src\cluiopts.cpp" />
+ <ClCompile Include="src\cluiservices.cpp" />
+ <ClCompile Include="src\commonheaders.cpp">
<PrecompiledHeader>Create</PrecompiledHeader>
</ClCompile>
- <ClCompile Include="contact.cpp" />
- <ClCompile Include="groupmenu.cpp" />
- <ClCompile Include="init.cpp" />
- <ClCompile Include="keyboard.cpp" />
- <ClCompile Include="CLUIFrames\cluiframes.cpp">
+ <ClCompile Include="src\contact.cpp" />
+ <ClCompile Include="src\groupmenu.cpp" />
+ <ClCompile Include="src\init.cpp" />
+ <ClCompile Include="src\keyboard.cpp" />
+ <ClCompile Include="src\CLUIFrames\cluiframes.cpp">
<PrecompiledHeaderFile>..\commonheaders.h</PrecompiledHeaderFile>
</ClCompile>
- <ClCompile Include="CLUIFrames\extraimage.cpp">
+ <ClCompile Include="src\CLUIFrames\extraimage.cpp">
<PrecompiledHeaderFile>..\commonheaders.h</PrecompiledHeaderFile>
</ClCompile>
- <ClCompile Include="CLUIFrames\framesmenu.cpp">
+ <ClCompile Include="src\CLUIFrames\framesmenu.cpp">
<PrecompiledHeaderFile>..\commonheaders.h</PrecompiledHeaderFile>
</ClCompile>
- <ClCompile Include="CLUIFrames\statusbar.cpp">
+ <ClCompile Include="src\CLUIFrames\statusbar.cpp">
<PrecompiledHeaderFile>..\commonheaders.h</PrecompiledHeaderFile>
</ClCompile>
</ItemGroup>
<ItemGroup>
- <ClInclude Include="CLUIFrames\cluiframes.h" />
- <ClInclude Include="clc.h" />
- <ClInclude Include="clist.h" />
- <ClInclude Include="commonheaders.h" />
- <ClInclude Include="resource.h" />
+ <ClInclude Include="src\CLUIFrames\cluiframes.h" />
+ <ClInclude Include="src\clc.h" />
+ <ClInclude Include="src\clist.h" />
+ <ClInclude Include="src\commonheaders.h" />
+ <ClInclude Include="src\resource.h" />
</ItemGroup>
<ItemGroup>
- <None Include="res\1.ico" />
- <None Include="res\2.ico" />
- <None Include="res\3.ico" />
- <None Include="res\4.ico" />
- <None Include="res\5.ico" />
- <None Include="res\6.ico" />
- <None Include="res\7.ico" />
- <None Include="res\8.ico" />
- <None Include="res\addgoupp.ico" />
- <None Include="res\blank.ico" />
- <None Include="res\delete.ico" />
- <None Include="res\dragcopy.cur" />
- <None Include="res\dropuser.cur" />
- <None Include="res\globus.ico" />
- <None Include="res\hyperlin.cur" />
- <None Include="res\icon2.ico" />
- <None Include="res\miranda.ico" />
- <None Include="res\notick.ico" />
- <None Include="res\notick1.ico" />
- <None Include="res\rename.ico" />
- <None Include="res\sendmail.ico" />
- <None Include="res\sms.ico" />
- </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/Clist_mw/clist_mw_10.vcxproj.filters b/plugins/Clist_mw/clist_mw_10.vcxproj.filters index 4573d41161..a8574cbca8 100644 --- a/plugins/Clist_mw/clist_mw_10.vcxproj.filters +++ b/plugins/Clist_mw/clist_mw_10.vcxproj.filters @@ -18,169 +18,101 @@ </Filter>
</ItemGroup>
<ItemGroup>
- <ClCompile Include="BkgrCfg.cpp">
+ <ClCompile Include="src\BkgrCfg.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="clc.cpp">
+ <ClCompile Include="src\clc.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="clcfonts.cpp">
+ <ClCompile Include="src\clcfonts.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="clcidents.cpp">
+ <ClCompile Include="src\clcidents.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="clcitems.cpp">
+ <ClCompile Include="src\clcitems.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="clcopts.cpp">
+ <ClCompile Include="src\clcopts.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="clcpaint.cpp">
+ <ClCompile Include="src\clcpaint.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="clcutils.cpp">
+ <ClCompile Include="src\clcutils.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="clistmenus.cpp">
+ <ClCompile Include="src\clistmenus.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="clistmod.cpp">
+ <ClCompile Include="src\clistmod.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="clistopts.cpp">
+ <ClCompile Include="src\clistopts.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="clistsettings.cpp">
+ <ClCompile Include="src\clistsettings.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="clisttray.cpp">
+ <ClCompile Include="src\clisttray.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="clui.cpp">
+ <ClCompile Include="src\clui.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="cluiopts.cpp">
+ <ClCompile Include="src\cluiopts.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="cluiservices.cpp">
+ <ClCompile Include="src\cluiservices.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="commonheaders.cpp">
+ <ClCompile Include="src\commonheaders.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="contact.cpp">
+ <ClCompile Include="src\contact.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="groupmenu.cpp">
+ <ClCompile Include="src\groupmenu.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="init.cpp">
+ <ClCompile Include="src\init.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="keyboard.cpp">
+ <ClCompile Include="src\keyboard.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="CLUIFrames\cluiframes.cpp">
+ <ClCompile Include="src\CLUIFrames\cluiframes.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="CLUIFrames\extraimage.cpp">
+ <ClCompile Include="src\CLUIFrames\extraimage.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="CLUIFrames\framesmenu.cpp">
+ <ClCompile Include="src\CLUIFrames\framesmenu.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="CLUIFrames\statusbar.cpp">
+ <ClCompile Include="src\CLUIFrames\statusbar.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
- <ClInclude Include="CLUIFrames\cluiframes.h">
+ <ClInclude Include="src\CLUIFrames\cluiframes.h">
<Filter>Source Files\CLUIFrames</Filter>
</ClInclude>
- <ClInclude Include="clc.h">
+ <ClInclude Include="src\clc.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="clist.h">
+ <ClInclude Include="src\clist.h">
<Filter>Header Files</Filter>
</ClInclude>
- <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>
</ItemGroup>
<ItemGroup>
- <None Include="res\1.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\2.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\3.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\4.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\5.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\6.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\7.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\8.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\addgoupp.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\blank.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\delete.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\dragcopy.cur">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\dropuser.cur">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\globus.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\hyperlin.cur">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\icon2.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\miranda.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\notick.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\notick1.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\rename.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\sendmail.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\sms.ico">
- <Filter>Resource Files</Filter>
- </None>
- </ItemGroup>
- <ItemGroup>
- <ResourceCompile Include="resource.rc">
+ <ResourceCompile Include="res\resource.rc">
<Filter>Resource Files</Filter>
</ResourceCompile>
</ItemGroup>
diff --git a/plugins/Clist_mw/clist_mw-translation.txt b/plugins/Clist_mw/docs/clist_mw-translation.txt index 769c437319..769c437319 100644 --- a/plugins/Clist_mw/clist_mw-translation.txt +++ b/plugins/Clist_mw/docs/clist_mw-translation.txt diff --git a/plugins/Clist_mw/res/blank1.ico b/plugins/Clist_mw/res/blank1.ico Binary files differdeleted file mode 100644 index 7845f62fed..0000000000 --- a/plugins/Clist_mw/res/blank1.ico +++ /dev/null diff --git a/plugins/Clist_mw/resource.rc b/plugins/Clist_mw/res/resource.rc index cb5632154a..b561ceb4cc 100644 --- a/plugins/Clist_mw/resource.rc +++ b/plugins/Clist_mw/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,17 +29,17 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT // Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems.
-IDI_SMS ICON "res/sms.ico"
-IDI_ICQC1 ICON "res/1.ico"
-IDI_ICQC2 ICON "res/2.ico"
-IDI_ICQC3 ICON "res/3.ico"
-IDI_ICQC4 ICON "res/4.ico"
-IDI_ICQC5 ICON "res/5.ico"
-IDI_ICQC6 ICON "res/6.ico"
-IDI_ICQC7 ICON "res/7.ico"
-IDI_ICQC8 ICON "res/8.ico"
-IDI_EMAIL ICON "res/sendmail.ico"
-IDI_NEWGROUP2 ICON "res/addgoupp.ico"
+IDI_SMS ICON "sms.ico"
+IDI_ICQC1 ICON "1.ico"
+IDI_ICQC2 ICON "2.ico"
+IDI_ICQC3 ICON "3.ico"
+IDI_ICQC4 ICON "4.ico"
+IDI_ICQC5 ICON "5.ico"
+IDI_ICQC6 ICON "6.ico"
+IDI_ICQC7 ICON "7.ico"
+IDI_ICQC8 ICON "8.ico"
+IDI_EMAIL ICON "sendmail.ico"
+IDI_NEWGROUP2 ICON "addgoupp.ico"
/////////////////////////////////////////////////////////////////////////////
//
@@ -115,12 +115,12 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems.
-IDI_GLOBUS ICON "res/globus.ico"
-IDI_RENAME ICON "res/rename.ico"
-IDI_DELETE ICON "res/delete.ico"
-IDI_NOTICK ICON "res/notick.ico"
-IDI_TICK ICON "res/notick1.ico"
-IDI_BLANK ICON "res/blank.ico"
+IDI_GLOBUS ICON "globus.ico"
+IDI_RENAME ICON "rename.ico"
+IDI_DELETE ICON "delete.ico"
+IDI_NOTICK ICON "notick.ico"
+IDI_TICK ICON "notick1.ico"
+IDI_BLANK ICON "blank.ico"
/////////////////////////////////////////////////////////////////////////////
//
@@ -564,7 +564,7 @@ END 1 TEXTINCLUDE
BEGIN
- "resource.h\0"
+ "..\src\resource.h\0"
END
2 TEXTINCLUDE
@@ -589,9 +589,9 @@ END // Cursor
//
-IDC_HYPERLINKHAND CURSOR "res/hyperlin.cur"
-IDC_DROP CURSOR "res/dragcopy.cur"
-IDC_DROPUSER CURSOR "res/dropuser.cur"
+IDC_HYPERLINKHAND CURSOR "hyperlin.cur"
+IDC_DROP CURSOR "dragcopy.cur"
+IDC_DROPUSER CURSOR "dropuser.cur"
/////////////////////////////////////////////////////////////////////////////
//
diff --git a/plugins/Clist_mw/BkgrCfg.cpp b/plugins/Clist_mw/src/BkgrCfg.cpp index 8753b852d6..8753b852d6 100644 --- a/plugins/Clist_mw/BkgrCfg.cpp +++ b/plugins/Clist_mw/src/BkgrCfg.cpp diff --git a/plugins/Clist_mw/BkgrCfg.h b/plugins/Clist_mw/src/BkgrCfg.h index a47b53a603..a47b53a603 100644 --- a/plugins/Clist_mw/BkgrCfg.h +++ b/plugins/Clist_mw/src/BkgrCfg.h diff --git a/plugins/Clist_mw/CLUIFrames/cluiframes.cpp b/plugins/Clist_mw/src/CLUIFrames/cluiframes.cpp index 26a8a0cb63..26a8a0cb63 100644 --- a/plugins/Clist_mw/CLUIFrames/cluiframes.cpp +++ b/plugins/Clist_mw/src/CLUIFrames/cluiframes.cpp diff --git a/plugins/Clist_mw/CLUIFrames/cluiframes.h b/plugins/Clist_mw/src/CLUIFrames/cluiframes.h index 6430c6655d..6430c6655d 100644 --- a/plugins/Clist_mw/CLUIFrames/cluiframes.h +++ b/plugins/Clist_mw/src/CLUIFrames/cluiframes.h diff --git a/plugins/Clist_mw/CLUIFrames/extraimage.cpp b/plugins/Clist_mw/src/CLUIFrames/extraimage.cpp index 4cec640ebb..4cec640ebb 100644 --- a/plugins/Clist_mw/CLUIFrames/extraimage.cpp +++ b/plugins/Clist_mw/src/CLUIFrames/extraimage.cpp diff --git a/plugins/Clist_mw/CLUIFrames/framesmenu.cpp b/plugins/Clist_mw/src/CLUIFrames/framesmenu.cpp index 7ce6bdd2a1..7ce6bdd2a1 100644 --- a/plugins/Clist_mw/CLUIFrames/framesmenu.cpp +++ b/plugins/Clist_mw/src/CLUIFrames/framesmenu.cpp diff --git a/plugins/Clist_mw/CLUIFrames/statusbar.cpp b/plugins/Clist_mw/src/CLUIFrames/statusbar.cpp index 319f4f8f63..319f4f8f63 100644 --- a/plugins/Clist_mw/CLUIFrames/statusbar.cpp +++ b/plugins/Clist_mw/src/CLUIFrames/statusbar.cpp diff --git a/plugins/Clist_mw/clc.cpp b/plugins/Clist_mw/src/clc.cpp index 40eddc02eb..40eddc02eb 100644 --- a/plugins/Clist_mw/clc.cpp +++ b/plugins/Clist_mw/src/clc.cpp diff --git a/plugins/Clist_mw/clc.h b/plugins/Clist_mw/src/clc.h index 29b7086d20..29b7086d20 100644 --- a/plugins/Clist_mw/clc.h +++ b/plugins/Clist_mw/src/clc.h diff --git a/plugins/Clist_mw/clcfonts.cpp b/plugins/Clist_mw/src/clcfonts.cpp index 1ad20dc2b0..1ad20dc2b0 100644 --- a/plugins/Clist_mw/clcfonts.cpp +++ b/plugins/Clist_mw/src/clcfonts.cpp diff --git a/plugins/Clist_mw/clcidents.cpp b/plugins/Clist_mw/src/clcidents.cpp index 58517fa8c0..58517fa8c0 100644 --- a/plugins/Clist_mw/clcidents.cpp +++ b/plugins/Clist_mw/src/clcidents.cpp diff --git a/plugins/Clist_mw/clcitems.cpp b/plugins/Clist_mw/src/clcitems.cpp index 788cc8f3fd..788cc8f3fd 100644 --- a/plugins/Clist_mw/clcitems.cpp +++ b/plugins/Clist_mw/src/clcitems.cpp diff --git a/plugins/Clist_mw/clcopts.cpp b/plugins/Clist_mw/src/clcopts.cpp index 43634f6fad..43634f6fad 100644 --- a/plugins/Clist_mw/clcopts.cpp +++ b/plugins/Clist_mw/src/clcopts.cpp diff --git a/plugins/Clist_mw/clcpaint.cpp b/plugins/Clist_mw/src/clcpaint.cpp index b4fc20850f..b4fc20850f 100644 --- a/plugins/Clist_mw/clcpaint.cpp +++ b/plugins/Clist_mw/src/clcpaint.cpp diff --git a/plugins/Clist_mw/clcutils.cpp b/plugins/Clist_mw/src/clcutils.cpp index e9253b4082..e9253b4082 100644 --- a/plugins/Clist_mw/clcutils.cpp +++ b/plugins/Clist_mw/src/clcutils.cpp diff --git a/plugins/Clist_mw/clist.h b/plugins/Clist_mw/src/clist.h index 20c8a7ce80..20c8a7ce80 100644 --- a/plugins/Clist_mw/clist.h +++ b/plugins/Clist_mw/src/clist.h diff --git a/plugins/Clist_mw/clistmenus.cpp b/plugins/Clist_mw/src/clistmenus.cpp index db84dca927..db84dca927 100644 --- a/plugins/Clist_mw/clistmenus.cpp +++ b/plugins/Clist_mw/src/clistmenus.cpp diff --git a/plugins/Clist_mw/clistmod.cpp b/plugins/Clist_mw/src/clistmod.cpp index 5f769427f8..5f769427f8 100644 --- a/plugins/Clist_mw/clistmod.cpp +++ b/plugins/Clist_mw/src/clistmod.cpp diff --git a/plugins/Clist_mw/clistopts.cpp b/plugins/Clist_mw/src/clistopts.cpp index b845c5a0a0..b845c5a0a0 100644 --- a/plugins/Clist_mw/clistopts.cpp +++ b/plugins/Clist_mw/src/clistopts.cpp diff --git a/plugins/Clist_mw/clistsettings.cpp b/plugins/Clist_mw/src/clistsettings.cpp index f18a4452f2..f18a4452f2 100644 --- a/plugins/Clist_mw/clistsettings.cpp +++ b/plugins/Clist_mw/src/clistsettings.cpp diff --git a/plugins/Clist_mw/clisttray.cpp b/plugins/Clist_mw/src/clisttray.cpp index d0e6e3ae93..d0e6e3ae93 100644 --- a/plugins/Clist_mw/clisttray.cpp +++ b/plugins/Clist_mw/src/clisttray.cpp diff --git a/plugins/Clist_mw/clui.cpp b/plugins/Clist_mw/src/clui.cpp index bddf0478e0..bddf0478e0 100644 --- a/plugins/Clist_mw/clui.cpp +++ b/plugins/Clist_mw/src/clui.cpp diff --git a/plugins/Clist_mw/cluiopts.cpp b/plugins/Clist_mw/src/cluiopts.cpp index 8fd1c1651e..8fd1c1651e 100644 --- a/plugins/Clist_mw/cluiopts.cpp +++ b/plugins/Clist_mw/src/cluiopts.cpp diff --git a/plugins/Clist_mw/cluiservices.cpp b/plugins/Clist_mw/src/cluiservices.cpp index f75fbc9dac..f75fbc9dac 100644 --- a/plugins/Clist_mw/cluiservices.cpp +++ b/plugins/Clist_mw/src/cluiservices.cpp diff --git a/plugins/Clist_mw/commonheaders.cpp b/plugins/Clist_mw/src/commonheaders.cpp index df68c5385c..df68c5385c 100644 --- a/plugins/Clist_mw/commonheaders.cpp +++ b/plugins/Clist_mw/src/commonheaders.cpp diff --git a/plugins/Clist_mw/commonheaders.h b/plugins/Clist_mw/src/commonheaders.h index bee4da96c1..61af060b38 100644 --- a/plugins/Clist_mw/commonheaders.h +++ b/plugins/Clist_mw/src/commonheaders.h @@ -20,6 +20,7 @@ You should have received a copy of the GNU General Public License 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
#ifndef _COMMON_HEADERS_H_
#define _COMMON_HEADERS_H_ 1
diff --git a/plugins/Clist_mw/contact.cpp b/plugins/Clist_mw/src/contact.cpp index d8cf0f37d4..d8cf0f37d4 100644 --- a/plugins/Clist_mw/contact.cpp +++ b/plugins/Clist_mw/src/contact.cpp diff --git a/plugins/Clist_mw/groupmenu.cpp b/plugins/Clist_mw/src/groupmenu.cpp index 496f98e78c..496f98e78c 100644 --- a/plugins/Clist_mw/groupmenu.cpp +++ b/plugins/Clist_mw/src/groupmenu.cpp diff --git a/plugins/Clist_mw/init.cpp b/plugins/Clist_mw/src/init.cpp index 2bec98ea31..2bec98ea31 100644 --- a/plugins/Clist_mw/init.cpp +++ b/plugins/Clist_mw/src/init.cpp diff --git a/plugins/Clist_mw/keyboard.cpp b/plugins/Clist_mw/src/keyboard.cpp index d099fab37c..d099fab37c 100644 --- a/plugins/Clist_mw/keyboard.cpp +++ b/plugins/Clist_mw/src/keyboard.cpp diff --git a/plugins/Clist_mw/resource.h b/plugins/Clist_mw/src/resource.h index 06c9b4c9df..06c9b4c9df 100644 --- a/plugins/Clist_mw/resource.h +++ b/plugins/Clist_mw/src/resource.h diff --git a/plugins/Clist_nicer/CLUIFrames/cluiframes.cpp b/plugins/Clist_nicer/SRC/CLUIFrames/cluiframes.cpp index 8fbaa547e6..8fbaa547e6 100644 --- a/plugins/Clist_nicer/CLUIFrames/cluiframes.cpp +++ b/plugins/Clist_nicer/SRC/CLUIFrames/cluiframes.cpp diff --git a/plugins/Clist_nicer/CLUIFrames/cluiframes.h b/plugins/Clist_nicer/SRC/CLUIFrames/cluiframes.h index 083066ca6d..083066ca6d 100644 --- a/plugins/Clist_nicer/CLUIFrames/cluiframes.h +++ b/plugins/Clist_nicer/SRC/CLUIFrames/cluiframes.h diff --git a/plugins/Clist_nicer/CLUIFrames/framesmenu.cpp b/plugins/Clist_nicer/SRC/CLUIFrames/framesmenu.cpp index 07b6ebc4e6..07b6ebc4e6 100644 --- a/plugins/Clist_nicer/CLUIFrames/framesmenu.cpp +++ b/plugins/Clist_nicer/SRC/CLUIFrames/framesmenu.cpp diff --git a/plugins/Clist_nicer/CLUIFrames/groupmenu.cpp b/plugins/Clist_nicer/SRC/CLUIFrames/groupmenu.cpp index a784e30883..a784e30883 100644 --- a/plugins/Clist_nicer/CLUIFrames/groupmenu.cpp +++ b/plugins/Clist_nicer/SRC/CLUIFrames/groupmenu.cpp diff --git a/plugins/Clist_nicer/CLUIFrames/movetogroup.cpp b/plugins/Clist_nicer/SRC/CLUIFrames/movetogroup.cpp index 89bc2a42e4..89bc2a42e4 100644 --- a/plugins/Clist_nicer/CLUIFrames/movetogroup.cpp +++ b/plugins/Clist_nicer/SRC/CLUIFrames/movetogroup.cpp diff --git a/plugins/Clist_nicer/coolsb/coolsb_internal.h b/plugins/Clist_nicer/SRC/Coolsb/coolsb_internal.h index 8a394f8a51..8a394f8a51 100644 --- a/plugins/Clist_nicer/coolsb/coolsb_internal.h +++ b/plugins/Clist_nicer/SRC/Coolsb/coolsb_internal.h diff --git a/plugins/Clist_nicer/coolsb/coolsblib.cpp b/plugins/Clist_nicer/SRC/Coolsb/coolsblib.cpp index 42f74c4ca0..42f74c4ca0 100644 --- a/plugins/Clist_nicer/coolsb/coolsblib.cpp +++ b/plugins/Clist_nicer/SRC/Coolsb/coolsblib.cpp diff --git a/plugins/Clist_nicer/coolsb/coolsblib.h b/plugins/Clist_nicer/SRC/Coolsb/coolsblib.h index d9b1c711f3..d9b1c711f3 100644 --- a/plugins/Clist_nicer/coolsb/coolsblib.h +++ b/plugins/Clist_nicer/SRC/Coolsb/coolsblib.h diff --git a/plugins/Clist_nicer/coolsb/coolscroll.cpp b/plugins/Clist_nicer/SRC/Coolsb/coolscroll.cpp index ac31f86c24..ac31f86c24 100644 --- a/plugins/Clist_nicer/coolsb/coolscroll.cpp +++ b/plugins/Clist_nicer/SRC/Coolsb/coolscroll.cpp diff --git a/plugins/Clist_nicer/coolsb/coolscroll.h b/plugins/Clist_nicer/SRC/Coolsb/coolscroll.h index c5fe848a83..c5fe848a83 100644 --- a/plugins/Clist_nicer/coolsb/coolscroll.h +++ b/plugins/Clist_nicer/SRC/Coolsb/coolscroll.h diff --git a/plugins/Clist_nicer/coolsb/userdefs.h b/plugins/Clist_nicer/SRC/Coolsb/userdefs.h index ea7ea1fe92..ea7ea1fe92 100644 --- a/plugins/Clist_nicer/coolsb/userdefs.h +++ b/plugins/Clist_nicer/SRC/Coolsb/userdefs.h diff --git a/plugins/Clist_nicer/INCLUDE/alphablend.h b/plugins/Clist_nicer/SRC/Include/alphablend.h index de0e7c4fa8..de0e7c4fa8 100644 --- a/plugins/Clist_nicer/INCLUDE/alphablend.h +++ b/plugins/Clist_nicer/SRC/Include/alphablend.h diff --git a/plugins/Clist_nicer/INCLUDE/clc.h b/plugins/Clist_nicer/SRC/Include/clc.h index 879fc52553..879fc52553 100644 --- a/plugins/Clist_nicer/INCLUDE/clc.h +++ b/plugins/Clist_nicer/SRC/Include/clc.h diff --git a/plugins/Clist_nicer/INCLUDE/clist.h b/plugins/Clist_nicer/SRC/Include/clist.h index 1969039350..1969039350 100644 --- a/plugins/Clist_nicer/INCLUDE/clist.h +++ b/plugins/Clist_nicer/SRC/Include/clist.h diff --git a/plugins/Clist_nicer/INCLUDE/commonheaders.h b/plugins/Clist_nicer/SRC/Include/commonheaders.h index 91de256f0a..91de256f0a 100644 --- a/plugins/Clist_nicer/INCLUDE/commonheaders.h +++ b/plugins/Clist_nicer/SRC/Include/commonheaders.h diff --git a/plugins/Clist_nicer/INCLUDE/config.h b/plugins/Clist_nicer/SRC/Include/config.h index 4ee9983798..4ee9983798 100644 --- a/plugins/Clist_nicer/INCLUDE/config.h +++ b/plugins/Clist_nicer/SRC/Include/config.h diff --git a/plugins/Clist_nicer/INCLUDE/extBackg.h b/plugins/Clist_nicer/SRC/Include/extBackg.h index 53450dcc0b..53450dcc0b 100644 --- a/plugins/Clist_nicer/INCLUDE/extBackg.h +++ b/plugins/Clist_nicer/SRC/Include/extBackg.h diff --git a/plugins/Clist_nicer/INCLUDE/m_cln_skinedit.h b/plugins/Clist_nicer/SRC/Include/m_cln_skinedit.h index a1e69bb6e1..a1e69bb6e1 100644 --- a/plugins/Clist_nicer/INCLUDE/m_cln_skinedit.h +++ b/plugins/Clist_nicer/SRC/Include/m_cln_skinedit.h diff --git a/plugins/Clist_nicer/INCLUDE/resource.h b/plugins/Clist_nicer/SRC/Include/resource.h index a2b1f5a072..a2b1f5a072 100644 --- a/plugins/Clist_nicer/INCLUDE/resource.h +++ b/plugins/Clist_nicer/SRC/Include/resource.h diff --git a/plugins/Clist_nicer/INCLUDE/rowheight_funcs.h b/plugins/Clist_nicer/SRC/Include/rowheight_funcs.h index 383db5b592..383db5b592 100644 --- a/plugins/Clist_nicer/INCLUDE/rowheight_funcs.h +++ b/plugins/Clist_nicer/SRC/Include/rowheight_funcs.h diff --git a/plugins/Clist_nicer/INCLUDE/vsstyle.h b/plugins/Clist_nicer/SRC/Include/vsstyle.h index b65e223b51..b65e223b51 100644 --- a/plugins/Clist_nicer/INCLUDE/vsstyle.h +++ b/plugins/Clist_nicer/SRC/Include/vsstyle.h diff --git a/plugins/Clist_nicer/INCLUDE/vssym32.h b/plugins/Clist_nicer/SRC/Include/vssym32.h index 4d2b6fd62d..4d2b6fd62d 100644 --- a/plugins/Clist_nicer/INCLUDE/vssym32.h +++ b/plugins/Clist_nicer/SRC/Include/vssym32.h diff --git a/plugins/Clist_nicer/clist_nicer_10.vcxproj b/plugins/Clist_nicer/clist_nicer_10.vcxproj index 40b0971aef..713cbc8ef9 100644 --- a/plugins/Clist_nicer/clist_nicer_10.vcxproj +++ b/plugins/Clist_nicer/clist_nicer_10.vcxproj @@ -71,15 +71,14 @@ </PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
- <AdditionalIncludeDirectories>..\..\include;include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\include;src\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PrecompiledHeaderFile>commonheaders.h</PrecompiledHeaderFile>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<Optimization>Disabled</Optimization>
<PrecompiledHeader>Use</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
- <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;CLIST_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;CLIST_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -101,7 +100,7 @@ <Optimization>Full</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
- <AdditionalIncludeDirectories>..\..\include;include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\include;src\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;CLIST_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<BufferSecurityCheck>false</BufferSecurityCheck>
@@ -131,17 +130,17 @@ </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
- <AdditionalIncludeDirectories>..\..\include;include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\include;src\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<PrecompiledHeaderFile>commonheaders.h</PrecompiledHeaderFile>
<Optimization>Disabled</Optimization>
<PrecompiledHeader>Use</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
- <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;CLIST_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;CLIST_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ResourceCompile>
<AdditionalIncludeDirectories>..\..\include;..\..\include\msapi;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN64;_AMD64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ResourceCompile>
<Link>
<AdditionalDependencies>comctl32.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -156,7 +155,7 @@ </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
- <AdditionalIncludeDirectories>..\..\include;include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\include;src\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<Optimization>Full</Optimization>
<FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
<StringPooling>true</StringPooling>
@@ -171,7 +170,7 @@ </ClCompile>
<ResourceCompile>
<AdditionalIncludeDirectories>..\..\include;..\..\include\msapi;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN64;_AMD64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ResourceCompile>
<Link>
<AdditionalDependencies>comctl32.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -187,103 +186,63 @@ </Link>
</ItemDefinitionGroup>
<ItemGroup>
- <ClCompile Include="CLUIFrames\cluiframes.cpp" />
- <ClCompile Include="CLUIFrames\framesmenu.cpp" />
- <ClCompile Include="CLUIFrames\groupmenu.cpp" />
- <ClCompile Include="CLUIFrames\movetogroup.cpp" />
- <ClCompile Include="coolsb\coolsblib.cpp" />
- <ClCompile Include="coolsb\coolscroll.cpp" />
- <ClCompile Include="SRC\alphablend.cpp" />
- <ClCompile Include="SRC\clc.cpp" />
- <ClCompile Include="SRC\CLCButton.cpp" />
- <ClCompile Include="SRC\clcidents.cpp" />
- <ClCompile Include="SRC\clcitems.cpp" />
- <ClCompile Include="SRC\clcmsgs.cpp" />
- <ClCompile Include="SRC\clcopts.cpp" />
- <ClCompile Include="SRC\clcpaint.cpp" />
- <ClCompile Include="SRC\clcutils.cpp" />
- <ClCompile Include="SRC\clistevents.cpp" />
- <ClCompile Include="SRC\clistmenus.cpp" />
- <ClCompile Include="SRC\clistmod.cpp" />
- <ClCompile Include="SRC\clistopts.cpp" />
- <ClCompile Include="SRC\clistsettings.cpp" />
- <ClCompile Include="SRC\clisttray.cpp" />
- <ClCompile Include="SRC\clnplus.cpp" />
- <ClCompile Include="SRC\clui.cpp" />
- <ClCompile Include="SRC\cluiopts.cpp" />
- <ClCompile Include="SRC\cluiservices.cpp" />
- <ClCompile Include="SRC\commonheaders.cpp">
+ <ClCompile Include="src\CLUIFrames\cluiframes.cpp" />
+ <ClCompile Include="src\CLUIFrames\framesmenu.cpp" />
+ <ClCompile Include="src\CLUIFrames\groupmenu.cpp" />
+ <ClCompile Include="src\CLUIFrames\movetogroup.cpp" />
+ <ClCompile Include="src\Coolsb\coolsblib.cpp" />
+ <ClCompile Include="src\Coolsb\coolscroll.cpp" />
+ <ClCompile Include="src\alphablend.cpp" />
+ <ClCompile Include="src\clc.cpp" />
+ <ClCompile Include="src\CLCButton.cpp" />
+ <ClCompile Include="src\clcidents.cpp" />
+ <ClCompile Include="src\clcitems.cpp" />
+ <ClCompile Include="src\clcmsgs.cpp" />
+ <ClCompile Include="src\clcopts.cpp" />
+ <ClCompile Include="src\clcpaint.cpp" />
+ <ClCompile Include="src\clcutils.cpp" />
+ <ClCompile Include="src\clistevents.cpp" />
+ <ClCompile Include="src\clistmenus.cpp" />
+ <ClCompile Include="src\clistmod.cpp" />
+ <ClCompile Include="src\clistopts.cpp" />
+ <ClCompile Include="src\clistsettings.cpp" />
+ <ClCompile Include="src\clisttray.cpp" />
+ <ClCompile Include="src\clnplus.cpp" />
+ <ClCompile Include="src\clui.cpp" />
+ <ClCompile Include="src\cluiopts.cpp" />
+ <ClCompile Include="src\cluiservices.cpp" />
+ <ClCompile Include="src\commonheaders.cpp">
<PrecompiledHeader>Create</PrecompiledHeader>
</ClCompile>
<ClCompile Include="src\config.cpp" />
- <ClCompile Include="SRC\contact.cpp" />
- <ClCompile Include="SRC\Docking.cpp" />
- <ClCompile Include="SRC\extBackg.cpp" />
- <ClCompile Include="SRC\init.cpp" />
- <ClCompile Include="SRC\rowheight_funcs.cpp" />
- <ClCompile Include="SRC\statusbar.cpp" />
- <ClCompile Include="SRC\statusfloater.cpp" />
- <ClCompile Include="SRC\viewmodes.cpp" />
- <ClCompile Include="SRC\wallpaper.cpp" />
- </ItemGroup>
- <ItemGroup>
- <ClInclude Include="CLUIFrames\cluiframes.h" />
- <ClInclude Include="coolsb\coolsb_internal.h" />
- <ClInclude Include="coolsb\coolsblib.h" />
- <ClInclude Include="coolsb\coolscroll.h" />
- <ClInclude Include="coolsb\userdefs.h" />
- <ClInclude Include="INCLUDE\alphablend.h" />
- <ClInclude Include="INCLUDE\clc.h" />
- <ClInclude Include="INCLUDE\clist.h" />
- <ClInclude Include="INCLUDE\commonheaders.h" />
- <ClInclude Include="include\config.h" />
- <ClInclude Include="INCLUDE\extBackg.h" />
- <ClInclude Include="INCLUDE\resource.h" />
- <ClInclude Include="INCLUDE\rowheight_funcs.h" />
+ <ClCompile Include="src\contact.cpp" />
+ <ClCompile Include="src\Docking.cpp" />
+ <ClCompile Include="src\extBackg.cpp" />
+ <ClCompile Include="src\init.cpp" />
+ <ClCompile Include="src\rowheight_funcs.cpp" />
+ <ClCompile Include="src\statusbar.cpp" />
+ <ClCompile Include="src\statusfloater.cpp" />
+ <ClCompile Include="src\viewmodes.cpp" />
+ <ClCompile Include="src\wallpaper.cpp" />
</ItemGroup>
<ItemGroup>
- <None Include="res\accounts.ico" />
- <None Include="res\addgoupp.ico" />
- <None Include="res\arrow-down.ico" />
- <None Include="res\overlay\away.ico" />
- <None Include="res\blank.ico" />
- <None Include="res\overlay\chat.ico" />
- <None Include="res\connecting.ico" />
- <None Include="res\delete.ico" />
- <None Include="res\overlay\dnd.ico" />
- <None Include="res\dragcopy.cur" />
- <None Include="res\dropuser.cur" />
- <None Include="res\find.ico" />
- <None Include="res\groups.ico" />
- <None Include="res\hyperlin.cur" />
- <None Include="res\invisible.ico" />
- <None Include="res\overlay\invisible.ico" />
- <None Include="res\overlay\lunch.ico" />
- <None Include="res\menu.ico" />
- <None Include="res\minimize.ico" />
- <None Include="res\overlay\NA.ico" />
- <None Include="res\notick.ico" />
- <None Include="res\notick1.ico" />
- <None Include="res\overlay\occupied.ico" />
- <None Include="res\overlay\offline.ico" />
- <None Include="res\online.ico" />
- <None Include="res\overlay\online.ico" />
- <None Include="res\options.ico" />
- <None Include="res\options_clvm.ico" />
- <None Include="res\overlay\phone.ico" />
- <None Include="res\rename.ico" />
- <None Include="res\slist.ico" />
- <None Include="res\sounds_off.ico" />
- <None Include="res\sounds_on.ico" />
- <None Include="res\tabsrmm_menu.ico" />
- <None Include="res\visible.ico" />
- <None Include="docs\CHANGELOG" />
- <None Include="docs\license.txt" />
- <None Include="docs\README" />
- <None Include="docs\Skinning.HOWTO" />
+ <ClInclude Include="src\CLUIFrames\cluiframes.h" />
+ <ClInclude Include="src\Coolsb\coolsb_internal.h" />
+ <ClInclude Include="src\Coolsb\coolsblib.h" />
+ <ClInclude Include="src\Coolsb\coolscroll.h" />
+ <ClInclude Include="src\Coolsb\userdefs.h" />
+ <ClInclude Include="src\Include\alphablend.h" />
+ <ClInclude Include="src\Include\clc.h" />
+ <ClInclude Include="src\Include\clist.h" />
+ <ClInclude Include="src\Include\commonheaders.h" />
+ <ClInclude Include="src\Include\config.h" />
+ <ClInclude Include="src\Include\extBackg.h" />
+ <ClInclude Include="src\Include\resource.h" />
+ <ClInclude Include="src\Include\rowheight_funcs.h" />
</ItemGroup>
<ItemGroup>
- <ResourceCompile Include="resource.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/Clist_nicer/clist_nicer_10.vcxproj.filters b/plugins/Clist_nicer/clist_nicer_10.vcxproj.filters index c704196b5b..32981a6589 100644 --- a/plugins/Clist_nicer/clist_nicer_10.vcxproj.filters +++ b/plugins/Clist_nicer/clist_nicer_10.vcxproj.filters @@ -24,277 +24,161 @@ </Filter>
</ItemGroup>
<ItemGroup>
- <ClCompile Include="SRC\alphablend.cpp">
+ <ClCompile Include="src\alphablend.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="SRC\clc.cpp">
+ <ClCompile Include="src\clc.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="SRC\clcidents.cpp">
+ <ClCompile Include="src\clcidents.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="SRC\clcitems.cpp">
+ <ClCompile Include="src\clcitems.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="SRC\clcmsgs.cpp">
+ <ClCompile Include="src\clcmsgs.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="SRC\clcopts.cpp">
+ <ClCompile Include="src\clcopts.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="SRC\clcpaint.cpp">
+ <ClCompile Include="src\clcpaint.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="SRC\clcutils.cpp">
+ <ClCompile Include="src\clcutils.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="SRC\clistevents.cpp">
+ <ClCompile Include="src\clistevents.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="SRC\clistmenus.cpp">
+ <ClCompile Include="src\clistmenus.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="SRC\clistmod.cpp">
+ <ClCompile Include="src\clistmod.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="SRC\clistopts.cpp">
+ <ClCompile Include="src\clistopts.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="SRC\clistsettings.cpp">
+ <ClCompile Include="src\clistsettings.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="SRC\clisttray.cpp">
+ <ClCompile Include="src\clisttray.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="SRC\clui.cpp">
+ <ClCompile Include="src\clui.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="SRC\cluiopts.cpp">
+ <ClCompile Include="src\cluiopts.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="SRC\cluiservices.cpp">
+ <ClCompile Include="src\cluiservices.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="SRC\commonheaders.cpp">
+ <ClCompile Include="src\commonheaders.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="SRC\contact.cpp">
+ <ClCompile Include="src\contact.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="SRC\Docking.cpp">
+ <ClCompile Include="src\Docking.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="SRC\extBackg.cpp">
+ <ClCompile Include="src\extBackg.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="SRC\init.cpp">
+ <ClCompile Include="src\init.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="SRC\rowheight_funcs.cpp">
+ <ClCompile Include="src\rowheight_funcs.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="SRC\statusbar.cpp">
+ <ClCompile Include="src\statusbar.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="SRC\statusfloater.cpp">
+ <ClCompile Include="src\statusfloater.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="SRC\viewmodes.cpp">
+ <ClCompile Include="src\viewmodes.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="SRC\wallpaper.cpp">
+ <ClCompile Include="src\wallpaper.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="coolsb\coolsblib.cpp">
+ <ClCompile Include="src\Coolsb\coolsblib.cpp">
<Filter>Source Files\COOLSB</Filter>
</ClCompile>
- <ClCompile Include="coolsb\coolscroll.cpp">
+ <ClCompile Include="src\Coolsb\coolscroll.cpp">
<Filter>Source Files\COOLSB</Filter>
</ClCompile>
- <ClCompile Include="CLUIFrames\cluiframes.cpp">
+ <ClCompile Include="src\CLUIFrames\cluiframes.cpp">
<Filter>Source Files\CLUIFrames</Filter>
</ClCompile>
- <ClCompile Include="CLUIFrames\framesmenu.cpp">
+ <ClCompile Include="src\CLUIFrames\framesmenu.cpp">
<Filter>Source Files\CLUIFrames</Filter>
</ClCompile>
- <ClCompile Include="CLUIFrames\groupmenu.cpp">
+ <ClCompile Include="src\CLUIFrames\groupmenu.cpp">
<Filter>Source Files\CLUIFrames</Filter>
</ClCompile>
- <ClCompile Include="CLUIFrames\movetogroup.cpp">
+ <ClCompile Include="src\CLUIFrames\movetogroup.cpp">
<Filter>Source Files\CLUIFrames</Filter>
</ClCompile>
- <ClCompile Include="SRC\clnplus.cpp">
+ <ClCompile Include="src\clnplus.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\config.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="SRC\CLCButton.cpp">
+ <ClCompile Include="src\CLCButton.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
- <ClInclude Include="CLUIFrames\cluiframes.h">
+ <ClInclude Include="src\CLUIFrames\cluiframes.h">
<Filter>Source Files\CLUIFrames</Filter>
</ClInclude>
- <ClInclude Include="coolsb\coolsb_internal.h">
+ <ClInclude Include="src\Coolsb\coolsb_internal.h">
<Filter>Source Files\COOLSB</Filter>
</ClInclude>
- <ClInclude Include="coolsb\coolsblib.h">
+ <ClInclude Include="src\Coolsb\coolsblib.h">
<Filter>Source Files\COOLSB</Filter>
</ClInclude>
- <ClInclude Include="coolsb\coolscroll.h">
+ <ClInclude Include="src\Coolsb\coolscroll.h">
<Filter>Source Files\COOLSB</Filter>
</ClInclude>
- <ClInclude Include="coolsb\userdefs.h">
+ <ClInclude Include="src\Coolsb\userdefs.h">
<Filter>Source Files\COOLSB</Filter>
</ClInclude>
- <ClInclude Include="INCLUDE\alphablend.h">
+ <ClInclude Include="src\Include\alphablend.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="INCLUDE\clc.h">
+ <ClInclude Include="src\Include\clc.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="INCLUDE\clist.h">
+ <ClInclude Include="src\Include\clist.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="INCLUDE\commonheaders.h">
+ <ClInclude Include="src\Include\commonheaders.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="INCLUDE\extBackg.h">
+ <ClInclude Include="src\Include\extBackg.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="INCLUDE\resource.h">
+ <ClInclude Include="src\Include\resource.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="INCLUDE\rowheight_funcs.h">
+ <ClInclude Include="src\Include\rowheight_funcs.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="include\config.h">
+ <ClInclude Include="src\Include\config.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
- <None Include="res\accounts.ico">
+ <ResourceCompile Include="res\resource.rc">
<Filter>Resource Files</Filter>
- </None>
- <None Include="res\addgoupp.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\arrow-down.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\overlay\away.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\blank.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\overlay\chat.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\connecting.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\delete.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\overlay\dnd.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\dragcopy.cur">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\dropuser.cur">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\find.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\groups.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\hyperlin.cur">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\invisible.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\overlay\invisible.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\overlay\lunch.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\menu.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\minimize.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\overlay\NA.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\notick.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\notick1.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\overlay\occupied.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\overlay\offline.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\online.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\overlay\online.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\options.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\options_clvm.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\overlay\phone.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\rename.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\slist.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\sounds_off.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\sounds_on.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\tabsrmm_menu.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\visible.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="docs\CHANGELOG">
- <Filter>Docs</Filter>
- </None>
- <None Include="docs\license.txt">
- <Filter>Docs</Filter>
- </None>
- <None Include="docs\README">
- <Filter>Docs</Filter>
- </None>
- <None Include="docs\Skinning.HOWTO">
- <Filter>Docs</Filter>
- </None>
- </ItemGroup>
- <ItemGroup>
- <ResourceCompile Include="resource.rc">
+ </ResourceCompile>
+ <ResourceCompile Include="res\version.rc">
<Filter>Resource Files</Filter>
</ResourceCompile>
</ItemGroup>
diff --git a/plugins/Clist_nicer/clist_nicer-translation.txt b/plugins/Clist_nicer/docs/clist_nicer-translation.txt index 0eb0d0e5ef..0eb0d0e5ef 100644 --- a/plugins/Clist_nicer/clist_nicer-translation.txt +++ b/plugins/Clist_nicer/docs/clist_nicer-translation.txt diff --git a/plugins/Clist_nicer/resource.rc b/plugins/Clist_nicer/res/resource.rc index 5697605827..23a2f2b569 100644 --- a/plugins/Clist_nicer/resource.rc +++ b/plugins/Clist_nicer/res/resource.rc @@ -1,6 +1,6 @@ // Microsoft Visual C++ generated resource script.
//
-#include "include\resource.h"
+#include "..\src\include\resource.h"
#define APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
@@ -10,7 +10,6 @@ #include <windows.h>
#include <winres.h>
#include <statusmodes.h>
-#include <version.rc>
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
@@ -598,7 +597,7 @@ END 1 TEXTINCLUDE
BEGIN
- "include\\resource.h\0"
+ "..\\src\\include\\resource.h\0"
END
2 TEXTINCLUDE
@@ -606,7 +605,6 @@ BEGIN "#include <windows.h>\r\n"
"#include <winres.h>\r\n"
"#include <statusmodes.h>\r\n"
- "#include <version.rc>\0"
END
3 TEXTINCLUDE
@@ -625,46 +623,46 @@ END // Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems.
-IDI_NOTICK ICON "res/notick.ico"
-IDI_TICK ICON "res/notick1.ico"
-IDI_RENAME ICON "res/rename.ico"
-IDI_DELETE ICON "res/delete.ico"
-IDI_CLVM_OPTIONS ICON "res/options_clvm.ico"
-IDI_CLVM_SELECT ICON "res/arrow-down.ico"
-IDI_BLANK ICON "res/blank.ico"
-IDI_OVL_OFFLINE ICON "res/overlay/offline.ico"
-IDI_OVL_ONLINE ICON "res/overlay/online.ico"
-IDI_OVL_AWAY ICON "res/overlay/away.ico"
-IDI_OVL_DND ICON "res/overlay/dnd.ico"
-IDI_OVL_NA ICON "res/overlay/na.ico"
-IDI_OVL_OCCUPIED ICON "res/overlay/occupied.ico"
-IDI_OVL_FREEFORCHAT ICON "res/overlay/chat.ico"
-IDI_OVL_INVISIBLE ICON "res/overlay/invisible.ico"
-IDI_OVL_ONTHEPHONE ICON "res/overlay/phone.ico"
-IDI_OVL_OUTTOLUNCH ICON "res/overlay/lunch.ico"
-IDI_HIDEOFFLINE ICON "res/online.ico"
-IDI_HIDEGROUPS ICON "res/groups.ico"
-IDI_SOUNDSON ICON "res/sounds_on.ico"
-IDI_FINDANDADD ICON "res/find.ico"
-IDI_TBOPTIONS ICON "res/options.ico"
-IDI_MINIMIZE ICON "res/minimize.ico"
-IDI_SOUNDSOFF ICON "res/sounds_off.ico"
-IDI_TABSRMMSESSIONLIST ICON "res/slist.ico"
-IDI_TABSRMMMENU ICON "res/tabsrmm_menu.ico"
-IDI_CLVISIBLE ICON "res/visible.ico"
-IDI_CLINVISIBLE ICON "res/invisible.ico"
-IDI_PROTOCONNECTING ICON "res/connecting.ico"
-IDI_TBTOPMENU ICON "res/menu.ico"
-IDI_TBACCOUNTS ICON "res/accounts.ico"
+IDI_NOTICK ICON "notick.ico"
+IDI_TICK ICON "notick1.ico"
+IDI_RENAME ICON "rename.ico"
+IDI_DELETE ICON "delete.ico"
+IDI_CLVM_OPTIONS ICON "options_clvm.ico"
+IDI_CLVM_SELECT ICON "arrow-down.ico"
+IDI_BLANK ICON "blank.ico"
+IDI_OVL_OFFLINE ICON "overlay/offline.ico"
+IDI_OVL_ONLINE ICON "overlay/online.ico"
+IDI_OVL_AWAY ICON "overlay/away.ico"
+IDI_OVL_DND ICON "overlay/dnd.ico"
+IDI_OVL_NA ICON "overlay/na.ico"
+IDI_OVL_OCCUPIED ICON "overlay/occupied.ico"
+IDI_OVL_FREEFORCHAT ICON "overlay/chat.ico"
+IDI_OVL_INVISIBLE ICON "overlay/invisible.ico"
+IDI_OVL_ONTHEPHONE ICON "overlay/phone.ico"
+IDI_OVL_OUTTOLUNCH ICON "overlay/lunch.ico"
+IDI_HIDEOFFLINE ICON "online.ico"
+IDI_HIDEGROUPS ICON "groups.ico"
+IDI_SOUNDSON ICON "sounds_on.ico"
+IDI_FINDANDADD ICON "find.ico"
+IDI_TBOPTIONS ICON "options.ico"
+IDI_MINIMIZE ICON "minimize.ico"
+IDI_SOUNDSOFF ICON "sounds_off.ico"
+IDI_TABSRMMSESSIONLIST ICON "slist.ico"
+IDI_TABSRMMMENU ICON "tabsrmm_menu.ico"
+IDI_CLVISIBLE ICON "visible.ico"
+IDI_CLINVISIBLE ICON "invisible.ico"
+IDI_PROTOCONNECTING ICON "connecting.ico"
+IDI_TBTOPMENU ICON "menu.ico"
+IDI_TBACCOUNTS ICON "accounts.ico"
/////////////////////////////////////////////////////////////////////////////
//
// Cursor
//
-IDC_HYPERLINKHAND CURSOR "res/hyperlin.cur"
-IDC_DROP CURSOR "res/DRAGCOPY.CUR"
-IDC_DROPUSER CURSOR "res/dropuser.cur"
+IDC_HYPERLINKHAND CURSOR "hyperlin.cur"
+IDC_DROP CURSOR "DRAGCOPY.CUR"
+IDC_DROPUSER CURSOR "dropuser.cur"
/////////////////////////////////////////////////////////////////////////////
//
@@ -747,14 +745,6 @@ END #ifdef APSTUDIO_INVOKED
GUIDELINES DESIGNINFO
BEGIN
- IDD_OPT_DSPPROFILES, DIALOG
- BEGIN
- END
-
- IDD_OPT_DSPADVANCED, DIALOG
- BEGIN
- END
-
IDD_OPT_XICONS, DIALOG
BEGIN
RIGHTMARGIN, 225
@@ -764,10 +754,6 @@ BEGIN BEGIN
HORZGUIDE, 127
END
-
- IDD_OPT, DIALOG
- BEGIN
- END
END
#endif // APSTUDIO_INVOKED
@@ -785,4 +771,3 @@ END /////////////////////////////////////////////////////////////////////////////
#endif // not APSTUDIO_INVOKED
-
diff --git a/plugins/Clist_nicer/version.rc b/plugins/Clist_nicer/res/version.rc index 4dfc03b5bf..376db28abf 100644 --- a/plugins/Clist_nicer/version.rc +++ b/plugins/Clist_nicer/res/version.rc @@ -2,22 +2,15 @@ #error this file is not editable by Microsoft Visual C++
#endif //APSTUDIO_INVOKED
+#include "winres.h"
+
#define VERSION_STRING "0.10.0.1"
#define VER_MAJOR 0
#define VER_MINOR 10
#define VER_REVISION 0
#define VER_BUILD 1
-
-#if defined(UNICODE)
- #if defined(_WIN64)
- #define RES_FILE_DESC "Clist_Nicer+ (Unicode) x86_amd64"
- #else
- #define RES_FILE_DESC "Clist_Nicer+ (Unicode) x86"
- #endif
-#else
- #define RES_FILE_DESC "Clist_Nicer+ (Ansi)"
-#endif
+#define RES_FILE_DESC "Clist_Nicer+"
VS_VERSION_INFO VERSIONINFO
FILEVERSION VER_MAJOR,VER_MINOR,VER_REVISION,VER_BUILD
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 diff --git a/plugins/CmdLine/CmdLine.rc b/plugins/CmdLine/CmdLine.rc deleted file mode 100644 index 1b7522b7a4..0000000000 --- a/plugins/CmdLine/CmdLine.rc +++ /dev/null @@ -1,63 +0,0 @@ -// Microsoft Visual C++ generated resource script.
-//
-#include "resource.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include "afxres.h"
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page(1252)
-#endif //_WIN32
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE
-BEGIN
- "resource.h\0"
-END
-
-2 TEXTINCLUDE
-BEGIN
- "#include ""afxres.h""\r\n"
- "\0"
-END
-
-3 TEXTINCLUDE
-BEGIN
- "\r\n"
- "\0"
-END
-
-#endif // APSTUDIO_INVOKED
-
-#endif // English (U.S.) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-
-
-/////////////////////////////////////////////////////////////////////////////
-#endif // not APSTUDIO_INVOKED
-
diff --git a/plugins/CmdLine/CmdLine.vcxproj b/plugins/CmdLine/CmdLine.vcxproj index eb36f4cebf..03a5c978ee 100644 --- a/plugins/CmdLine/CmdLine.vcxproj +++ b/plugins/CmdLine/CmdLine.vcxproj @@ -175,30 +175,29 @@ </ProjectReference>
</ItemGroup>
<ItemGroup>
- <ClCompile Include="CmdLine.cpp">
+ <ClCompile Include="src\CmdLine.cpp">
<PrecompiledHeader>Create</PrecompiledHeader>
</ClCompile>
- <ClCompile Include="hooked_events.cpp" />
- <ClCompile Include="mimcmd_data.cpp" />
- <ClCompile Include="mimcmd_handlers.cpp" />
- <ClCompile Include="mimcmd_ipc.cpp" />
- <ClCompile Include="services.cpp" />
- <ClCompile Include="utils.cpp" />
+ <ClCompile Include="src\hooked_events.cpp" />
+ <ClCompile Include="src\mimcmd_data.cpp" />
+ <ClCompile Include="src\mimcmd_handlers.cpp" />
+ <ClCompile Include="src\mimcmd_ipc.cpp" />
+ <ClCompile Include="src\services.cpp" />
+ <ClCompile Include="src\utils.cpp" />
</ItemGroup>
<ItemGroup>
- <ClInclude Include="commonheaders.h" />
- <ClInclude Include="hooked_events.h" />
- <ClInclude Include="mimcmd_data.h" />
- <ClInclude Include="mimcmd_handlers.h" />
- <ClInclude Include="mimcmd_ipc.h" />
- <ClInclude Include="resource.h" />
- <ClInclude Include="services.h" />
- <ClInclude Include="utils.h" />
- <ClInclude Include="version.h" />
+ <ClInclude Include="src\commonheaders.h" />
+ <ClInclude Include="src\hooked_events.h" />
+ <ClInclude Include="src\mimcmd_data.h" />
+ <ClInclude Include="src\mimcmd_handlers.h" />
+ <ClInclude Include="src\mimcmd_ipc.h" />
+ <ClInclude Include="src\resource.h" />
+ <ClInclude Include="src\services.h" />
+ <ClInclude Include="src\utils.h" />
+ <ClInclude Include="src\version.h" />
</ItemGroup>
<ItemGroup>
- <ResourceCompile Include="CmdLine.rc" />
- <ResourceCompile Include="version.rc" />
+ <ResourceCompile Include="res\version.rc" />
</ItemGroup>
<ItemGroup>
<None Include="docs\CmdLine_readme.txt" />
diff --git a/plugins/CmdLine/CmdLine.vcxproj.filters b/plugins/CmdLine/CmdLine.vcxproj.filters index 28af4c7c70..6ba388ddf3 100644 --- a/plugins/CmdLine/CmdLine.vcxproj.filters +++ b/plugins/CmdLine/CmdLine.vcxproj.filters @@ -15,62 +15,59 @@ </Filter>
</ItemGroup>
<ItemGroup>
- <ClCompile Include="CmdLine.cpp">
+ <ClCompile Include="src\CmdLine.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="hooked_events.cpp">
+ <ClCompile Include="src\hooked_events.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="mimcmd_data.cpp">
+ <ClCompile Include="src\mimcmd_data.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="mimcmd_handlers.cpp">
+ <ClCompile Include="src\mimcmd_handlers.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="mimcmd_ipc.cpp">
+ <ClCompile Include="src\mimcmd_ipc.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="services.cpp">
+ <ClCompile Include="src\services.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="utils.cpp">
+ <ClCompile Include="src\utils.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
- <ClInclude Include="commonheaders.h">
+ <ClInclude Include="src\commonheaders.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="hooked_events.h">
+ <ClInclude Include="src\hooked_events.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="mimcmd_data.h">
+ <ClInclude Include="src\mimcmd_data.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="mimcmd_handlers.h">
+ <ClInclude Include="src\mimcmd_handlers.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="mimcmd_ipc.h">
+ <ClInclude Include="src\mimcmd_ipc.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="resource.h">
+ <ClInclude Include="src\resource.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="services.h">
+ <ClInclude Include="src\services.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="utils.h">
+ <ClInclude Include="src\utils.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="version.h">
+ <ClInclude Include="src\version.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
- <ResourceCompile Include="CmdLine.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/CmdLine/MimCmd/MimCmd.vcxproj b/plugins/CmdLine/MimCmd/MimCmd.vcxproj index 00e04c32c2..439370c027 100644 --- a/plugins/CmdLine/MimCmd/MimCmd.vcxproj +++ b/plugins/CmdLine/MimCmd/MimCmd.vcxproj @@ -166,21 +166,21 @@ </ResourceCompile>
</ItemDefinitionGroup>
<ItemGroup>
- <ClCompile Include="commands.cpp" />
- <ClCompile Include="MimCmd.cpp">
+ <ClCompile Include="src\commands.cpp" />
+ <ClCompile Include="src\MimCmd.cpp">
<PrecompiledHeader>Create</PrecompiledHeader>
</ClCompile>
- <ClCompile Include="..\mimcmd_ipc.cpp">
+ <ClCompile Include="..\src\mimcmd_ipc.cpp">
<PrecompiledHeader>NotUsing</PrecompiledHeader>
</ClCompile>
</ItemGroup>
<ItemGroup>
- <ClInclude Include="commands.h" />
- <ClInclude Include="common.h" />
- <ClInclude Include="resource.h" />
+ <ClInclude Include="src\commands.h" />
+ <ClInclude Include="src\common.h" />
+ <ClInclude Include="src\resource.h" />
</ItemGroup>
<ItemGroup>
- <ResourceCompile Include="version.rc" />
+ <ResourceCompile Include="res\version.rc" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
diff --git a/plugins/CmdLine/MimCmd/MimCmd.vcxproj.filters b/plugins/CmdLine/MimCmd/MimCmd.vcxproj.filters index 11c62edbef..4352e86988 100644 --- a/plugins/CmdLine/MimCmd/MimCmd.vcxproj.filters +++ b/plugins/CmdLine/MimCmd/MimCmd.vcxproj.filters @@ -15,29 +15,29 @@ </Filter>
</ItemGroup>
<ItemGroup>
- <ClCompile Include="commands.cpp">
+ <ClCompile Include="src\commands.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="MimCmd.cpp">
+ <ClCompile Include="src\MimCmd.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\mimcmd_ipc.cpp">
+ <ClCompile Include="..\src\mimcmd_ipc.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
- <ClInclude Include="commands.h">
+ <ClInclude Include="src\commands.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="resource.h">
+ <ClInclude Include="src\resource.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="common.h">
+ <ClInclude Include="src\common.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
- <ResourceCompile Include="version.rc">
+ <ResourceCompile Include="res\version.rc">
<Filter>Resource Files</Filter>
</ResourceCompile>
</ItemGroup>
diff --git a/plugins/CmdLine/version.rc b/plugins/CmdLine/MimCmd/res/version.rc index 737644cfab..b5257e17ef 100644 --- a/plugins/CmdLine/version.rc +++ b/plugins/CmdLine/MimCmd/res/version.rc @@ -4,8 +4,7 @@ #error this file is not editable by Microsoft Visual C++
#endif //APSTUDIO_INVOKED
-#include "resource.h"
-#include "version.h"
+#include "..\..\src\version.h"
#define APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
diff --git a/plugins/CmdLine/MimCmd/MimCmd.cpp b/plugins/CmdLine/MimCmd/src/MimCmd.cpp index cfd0e9b835..07daf85a0c 100644 --- a/plugins/CmdLine/MimCmd/MimCmd.cpp +++ b/plugins/CmdLine/MimCmd/src/MimCmd.cpp @@ -19,8 +19,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
#include "common.h"
-#include "..\utils.h"
-#include "..\version.h"
+#include "..\..\src\utils.h"
+#include "..\..\src\version.h"
int hLangpack = 0;
diff --git a/plugins/CmdLine/MimCmd/commands.cpp b/plugins/CmdLine/MimCmd/src/commands.cpp index bae47b089c..bae47b089c 100644 --- a/plugins/CmdLine/MimCmd/commands.cpp +++ b/plugins/CmdLine/MimCmd/src/commands.cpp diff --git a/plugins/CmdLine/MimCmd/commands.h b/plugins/CmdLine/MimCmd/src/commands.h index 4c60b49565..4c60b49565 100644 --- a/plugins/CmdLine/MimCmd/commands.h +++ b/plugins/CmdLine/MimCmd/src/commands.h diff --git a/plugins/CmdLine/MimCmd/common.h b/plugins/CmdLine/MimCmd/src/common.h index a733743e07..0086237671 100644 --- a/plugins/CmdLine/MimCmd/common.h +++ b/plugins/CmdLine/MimCmd/src/common.h @@ -30,7 +30,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include <newpluginapi.h>
#include <m_langpack.h>
-#include "..\mimcmd_ipc.h"
+#include "..\..\src\mimcmd_ipc.h"
#include "commands.h"
int lpprintf(const char *format, ...);
diff --git a/plugins/CmdLine/MimCmd/resource.h b/plugins/CmdLine/MimCmd/src/resource.h index c3bc570152..c3bc570152 100644 --- a/plugins/CmdLine/MimCmd/resource.h +++ b/plugins/CmdLine/MimCmd/src/resource.h diff --git a/plugins/CmdLine/MimCmd/version.rc b/plugins/CmdLine/res/version.rc index 36d39c3d33..057f549377 100644 --- a/plugins/CmdLine/MimCmd/version.rc +++ b/plugins/CmdLine/res/version.rc @@ -4,8 +4,7 @@ #error this file is not editable by Microsoft Visual C++
#endif //APSTUDIO_INVOKED
-#include "resource.h"
-#include "..\..\CmdLine\version.h"
+#include "..\src\version.h"
#define APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
diff --git a/plugins/CmdLine/CmdLine.cpp b/plugins/CmdLine/src/CmdLine.cpp index 4d19c19ccc..4d19c19ccc 100644 --- a/plugins/CmdLine/CmdLine.cpp +++ b/plugins/CmdLine/src/CmdLine.cpp diff --git a/plugins/CmdLine/commonheaders.h b/plugins/CmdLine/src/commonheaders.h index b7a332c9d6..b7a332c9d6 100644 --- a/plugins/CmdLine/commonheaders.h +++ b/plugins/CmdLine/src/commonheaders.h diff --git a/plugins/CmdLine/hooked_events.cpp b/plugins/CmdLine/src/hooked_events.cpp index 6ccac9080a..6ccac9080a 100644 --- a/plugins/CmdLine/hooked_events.cpp +++ b/plugins/CmdLine/src/hooked_events.cpp diff --git a/plugins/CmdLine/hooked_events.h b/plugins/CmdLine/src/hooked_events.h index 11b9fea363..11b9fea363 100644 --- a/plugins/CmdLine/hooked_events.h +++ b/plugins/CmdLine/src/hooked_events.h diff --git a/plugins/CmdLine/mimcmd_data.cpp b/plugins/CmdLine/src/mimcmd_data.cpp index 95550ed778..95550ed778 100644 --- a/plugins/CmdLine/mimcmd_data.cpp +++ b/plugins/CmdLine/src/mimcmd_data.cpp diff --git a/plugins/CmdLine/mimcmd_data.h b/plugins/CmdLine/src/mimcmd_data.h index 2ef39bc4dd..2ef39bc4dd 100644 --- a/plugins/CmdLine/mimcmd_data.h +++ b/plugins/CmdLine/src/mimcmd_data.h diff --git a/plugins/CmdLine/mimcmd_handlers.cpp b/plugins/CmdLine/src/mimcmd_handlers.cpp index 9b2d89b696..9b2d89b696 100644 --- a/plugins/CmdLine/mimcmd_handlers.cpp +++ b/plugins/CmdLine/src/mimcmd_handlers.cpp diff --git a/plugins/CmdLine/mimcmd_handlers.h b/plugins/CmdLine/src/mimcmd_handlers.h index 565c7e3ec5..565c7e3ec5 100644 --- a/plugins/CmdLine/mimcmd_handlers.h +++ b/plugins/CmdLine/src/mimcmd_handlers.h diff --git a/plugins/CmdLine/mimcmd_ipc.cpp b/plugins/CmdLine/src/mimcmd_ipc.cpp index d16de2e7a8..d16de2e7a8 100644 --- a/plugins/CmdLine/mimcmd_ipc.cpp +++ b/plugins/CmdLine/src/mimcmd_ipc.cpp diff --git a/plugins/CmdLine/mimcmd_ipc.h b/plugins/CmdLine/src/mimcmd_ipc.h index d12a4a993f..d12a4a993f 100644 --- a/plugins/CmdLine/mimcmd_ipc.h +++ b/plugins/CmdLine/src/mimcmd_ipc.h diff --git a/plugins/CmdLine/resource.h b/plugins/CmdLine/src/resource.h index 0268ce4765..0268ce4765 100644 --- a/plugins/CmdLine/resource.h +++ b/plugins/CmdLine/src/resource.h diff --git a/plugins/CmdLine/services.cpp b/plugins/CmdLine/src/services.cpp index 9e006a0046..9e006a0046 100644 --- a/plugins/CmdLine/services.cpp +++ b/plugins/CmdLine/src/services.cpp diff --git a/plugins/CmdLine/services.h b/plugins/CmdLine/src/services.h index b4beb1d44b..b4beb1d44b 100644 --- a/plugins/CmdLine/services.h +++ b/plugins/CmdLine/src/services.h diff --git a/plugins/CmdLine/utils.cpp b/plugins/CmdLine/src/utils.cpp index 7d1136602f..7d1136602f 100644 --- a/plugins/CmdLine/utils.cpp +++ b/plugins/CmdLine/src/utils.cpp diff --git a/plugins/CmdLine/utils.h b/plugins/CmdLine/src/utils.h index 22b4721cfa..22b4721cfa 100644 --- a/plugins/CmdLine/utils.h +++ b/plugins/CmdLine/src/utils.h diff --git a/plugins/CmdLine/version.h b/plugins/CmdLine/src/version.h index 03656ae51d..03656ae51d 100644 --- a/plugins/CmdLine/version.h +++ b/plugins/CmdLine/src/version.h 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 |