diff options
| author | Kirill Volinsky <mataes2007@gmail.com> | 2014-12-25 19:42:00 +0000 |
|---|---|---|
| committer | Kirill Volinsky <mataes2007@gmail.com> | 2014-12-25 19:42:00 +0000 |
| commit | 12e3e7f057bdb3d965a944d6c97fe7f222158eee (patch) | |
| tree | 03cc4e03671c7faa80c5df9c4bd99e6e0825f21f /src | |
| parent | 14bf9d366e6c23ad44c8266f87405a401dfa3f90 (diff) | |
files structure changed
git-svn-id: http://svn.miranda-ng.org/main/trunk@11638 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'src')
| -rw-r--r-- | src/mir_core/mir_core_10.vcxproj | 144 | ||||
| -rw-r--r-- | src/mir_core/mir_core_10.vcxproj.filters | 86 | ||||
| -rw-r--r-- | src/mir_core/mir_core_12.vcxproj | 135 | ||||
| -rw-r--r-- | src/mir_core/mir_core_12.vcxproj.filters | 84 | ||||
| -rw-r--r-- | src/mir_core/src/cmdline.cpp (renamed from src/mir_core/cmdline.cpp) | 0 | ||||
| -rw-r--r-- | src/mir_core/src/commonheaders.h (renamed from src/mir_core/commonheaders.h) | 0 | ||||
| -rw-r--r-- | src/mir_core/src/db.cpp (renamed from src/mir_core/db.cpp) | 0 | ||||
| -rw-r--r-- | src/mir_core/src/http.cpp (renamed from src/mir_core/http.cpp) | 0 | ||||
| -rw-r--r-- | src/mir_core/src/icons.cpp (renamed from src/mir_core/icons.cpp) | 0 | ||||
| -rw-r--r-- | src/mir_core/src/json/JSONChildren.cpp (renamed from src/mir_core/json/JSONChildren.cpp) | 0 | ||||
| -rw-r--r-- | src/mir_core/src/json/JSONChildren.h (renamed from src/mir_core/json/JSONChildren.h) | 0 | ||||
| -rw-r--r-- | src/mir_core/src/json/JSONDebug.cpp (renamed from src/mir_core/json/JSONDebug.cpp) | 0 | ||||
| -rw-r--r-- | src/mir_core/src/json/JSONDebug.h (renamed from src/mir_core/json/JSONDebug.h) | 0 | ||||
| -rw-r--r-- | src/mir_core/src/json/JSONDefs.h (renamed from src/mir_core/json/JSONDefs.h) | 0 | ||||
| -rw-r--r-- | src/mir_core/src/json/JSONIterators.cpp (renamed from src/mir_core/json/JSONIterators.cpp) | 0 | ||||
| -rw-r--r-- | src/mir_core/src/json/JSONMemory.cpp (renamed from src/mir_core/json/JSONMemory.cpp) | 0 | ||||
| -rw-r--r-- | src/mir_core/src/json/JSONMemory.h (renamed from src/mir_core/json/JSONMemory.h) | 0 | ||||
| -rw-r--r-- | src/mir_core/src/json/JSONNode.cpp (renamed from src/mir_core/json/JSONNode.cpp) | 0 | ||||
| -rw-r--r-- | src/mir_core/src/json/JSONNode.h (renamed from src/mir_core/json/JSONNode.h) | 0 | ||||
| -rw-r--r-- | src/mir_core/src/json/JSONNode_Mutex.cpp (renamed from src/mir_core/json/JSONNode_Mutex.cpp) | 0 | ||||
| -rw-r--r-- | src/mir_core/src/json/JSONOptions.h (renamed from src/mir_core/json/JSONOptions.h) | 0 | ||||
| -rw-r--r-- | src/mir_core/src/json/JSONWorker.cpp (renamed from src/mir_core/json/JSONWorker.cpp) | 0 | ||||
| -rw-r--r-- | src/mir_core/src/json/JSONWorker.h (renamed from src/mir_core/json/JSONWorker.h) | 0 | ||||
| -rw-r--r-- | src/mir_core/src/json/JSONWriter.cpp (renamed from src/mir_core/json/JSONWriter.cpp) | 0 | ||||
| -rw-r--r-- | src/mir_core/src/json/NumberToString.h (renamed from src/mir_core/json/NumberToString.h) | 0 | ||||
| -rw-r--r-- | src/mir_core/src/json/internalJSONNode.cpp (renamed from src/mir_core/json/internalJSONNode.cpp) | 0 | ||||
| -rw-r--r-- | src/mir_core/src/json/internalJSONNode.h (renamed from src/mir_core/json/internalJSONNode.h) | 0 | ||||
| -rw-r--r-- | src/mir_core/src/json/libJSON.cpp (renamed from src/mir_core/json/libJSON.cpp) | 0 | ||||
| -rw-r--r-- | src/mir_core/src/langpack.cpp (renamed from src/mir_core/langpack.cpp) | 2 | ||||
| -rw-r--r-- | src/mir_core/src/lists.cpp (renamed from src/mir_core/lists.cpp) | 0 | ||||
| -rw-r--r-- | src/mir_core/src/logger.cpp (renamed from src/mir_core/logger.cpp) | 0 | ||||
| -rw-r--r-- | src/mir_core/src/mc.cpp (renamed from src/mir_core/mc.cpp) | 0 | ||||
| -rw-r--r-- | src/mir_core/src/md5.cpp (renamed from src/mir_core/md5.cpp) | 0 | ||||
| -rw-r--r-- | src/mir_core/src/memory.cpp (renamed from src/mir_core/memory.cpp) | 0 | ||||
| -rw-r--r-- | src/mir_core/src/mir_core.def (renamed from src/mir_core/mir_core.def) | 0 | ||||
| -rw-r--r-- | src/mir_core/src/miranda.cpp (renamed from src/mir_core/miranda.cpp) | 0 | ||||
| -rw-r--r-- | src/mir_core/src/miranda.h (renamed from src/mir_core/miranda.h) | 0 | ||||
| -rw-r--r-- | src/mir_core/src/modules.cpp (renamed from src/mir_core/modules.cpp) | 0 | ||||
| -rw-r--r-- | src/mir_core/src/mstring.cpp (renamed from src/mir_core/mstring.cpp) | 0 | ||||
| -rw-r--r-- | src/mir_core/src/path.cpp (renamed from src/mir_core/path.cpp) | 0 | ||||
| -rw-r--r-- | src/mir_core/src/protos.cpp (renamed from src/mir_core/protos.cpp) | 0 | ||||
| -rw-r--r-- | src/mir_core/src/sha1.cpp (renamed from src/mir_core/sha1.cpp) | 0 | ||||
| -rw-r--r-- | src/mir_core/src/stdafx.cpp (renamed from src/mir_core/stdafx.cpp) | 0 | ||||
| -rw-r--r-- | src/mir_core/src/subclass.cpp (renamed from src/mir_core/subclass.cpp) | 0 | ||||
| -rw-r--r-- | src/mir_core/src/threads.cpp (renamed from src/mir_core/threads.cpp) | 0 | ||||
| -rw-r--r-- | src/mir_core/src/utf.cpp (renamed from src/mir_core/utf.cpp) | 0 | ||||
| -rw-r--r-- | src/mir_core/src/utils.cpp (renamed from src/mir_core/utils.cpp) | 0 | ||||
| -rw-r--r-- | src/mir_core/src/winver.cpp (renamed from src/mir_core/winver.cpp) | 0 |
48 files changed, 197 insertions, 254 deletions
diff --git a/src/mir_core/mir_core_10.vcxproj b/src/mir_core/mir_core_10.vcxproj index d1f2fbed58..2039a518f2 100644 --- a/src/mir_core/mir_core_10.vcxproj +++ b/src/mir_core/mir_core_10.vcxproj @@ -23,103 +23,73 @@ <ClInclude Include="..\..\include\m_database.h" />
<ClInclude Include="..\..\include\m_system.h" />
<ClInclude Include="..\..\include\m_system_cpp.h" />
- <ClInclude Include="commonheaders.h" />
- <ClInclude Include="json\internalJSONNode.h" />
- <ClInclude Include="json\JSONChildren.h" />
- <ClInclude Include="json\JSONDebug.h" />
- <ClInclude Include="json\JSONDefs.h" />
- <ClInclude Include="json\JSONMemory.h" />
- <ClInclude Include="json\JSONNode.h" />
- <ClInclude Include="json\JSONOptions.h" />
- <ClInclude Include="json\JSONWorker.h" />
- <ClInclude Include="json\NumberToString.h" />
- <ClInclude Include="miranda.h" />
+ <ClInclude Include="src\commonheaders.h" />
+ <ClInclude Include="src\json\internalJSONNode.h" />
+ <ClInclude Include="src\json\JSONChildren.h" />
+ <ClInclude Include="src\json\JSONDebug.h" />
+ <ClInclude Include="src\json\JSONDefs.h" />
+ <ClInclude Include="src\json\JSONMemory.h" />
+ <ClInclude Include="src\json\JSONNode.h" />
+ <ClInclude Include="src\json\JSONOptions.h" />
+ <ClInclude Include="src\json\JSONWorker.h" />
+ <ClInclude Include="src\json\NumberToString.h" />
+ <ClInclude Include="src\miranda.h" />
</ItemGroup>
<ItemGroup>
- <ClCompile Include="cmdline.cpp" />
- <ClCompile Include="http.cpp" />
- <ClCompile Include="icons.cpp" />
- <ClCompile Include="json\internalJSONNode.cpp">
- <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\commonheaders.h</PrecompiledHeaderFile>
- <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\commonheaders.h</PrecompiledHeaderFile>
- <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\commonheaders.h</PrecompiledHeaderFile>
- <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\commonheaders.h</PrecompiledHeaderFile>
+ <ClCompile Include="src\cmdline.cpp" />
+ <ClCompile Include="src\http.cpp" />
+ <ClCompile Include="src\icons.cpp" />
+ <ClCompile Include="src\json\internalJSONNode.cpp">
+ <PrecompiledHeaderFile>..\commonheaders.h</PrecompiledHeaderFile>
</ClCompile>
- <ClCompile Include="json\JSONChildren.cpp">
- <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\commonheaders.h</PrecompiledHeaderFile>
- <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\commonheaders.h</PrecompiledHeaderFile>
- <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\commonheaders.h</PrecompiledHeaderFile>
- <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\commonheaders.h</PrecompiledHeaderFile>
+ <ClCompile Include="src\json\JSONChildren.cpp">
+ <PrecompiledHeaderFile>..\commonheaders.h</PrecompiledHeaderFile>
</ClCompile>
- <ClCompile Include="json\JSONDebug.cpp">
- <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\commonheaders.h</PrecompiledHeaderFile>
- <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\commonheaders.h</PrecompiledHeaderFile>
- <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\commonheaders.h</PrecompiledHeaderFile>
- <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\commonheaders.h</PrecompiledHeaderFile>
+ <ClCompile Include="src\json\JSONDebug.cpp">
+ <PrecompiledHeaderFile>..\commonheaders.h</PrecompiledHeaderFile>
</ClCompile>
- <ClCompile Include="json\JSONIterators.cpp">
- <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\commonheaders.h</PrecompiledHeaderFile>
- <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\commonheaders.h</PrecompiledHeaderFile>
- <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\commonheaders.h</PrecompiledHeaderFile>
- <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\commonheaders.h</PrecompiledHeaderFile>
+ <ClCompile Include="src\json\JSONIterators.cpp">
+ <PrecompiledHeaderFile>..\commonheaders.h</PrecompiledHeaderFile>
</ClCompile>
- <ClCompile Include="json\JSONMemory.cpp">
- <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\commonheaders.h</PrecompiledHeaderFile>
- <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\commonheaders.h</PrecompiledHeaderFile>
- <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\commonheaders.h</PrecompiledHeaderFile>
- <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\commonheaders.h</PrecompiledHeaderFile>
+ <ClCompile Include="src\json\JSONMemory.cpp">
+ <PrecompiledHeaderFile>..\commonheaders.h</PrecompiledHeaderFile>
</ClCompile>
- <ClCompile Include="json\JSONNode.cpp">
- <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\commonheaders.h</PrecompiledHeaderFile>
- <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\commonheaders.h</PrecompiledHeaderFile>
- <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\commonheaders.h</PrecompiledHeaderFile>
- <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\commonheaders.h</PrecompiledHeaderFile>
+ <ClCompile Include="src\json\JSONNode.cpp">
+ <PrecompiledHeaderFile>..\commonheaders.h</PrecompiledHeaderFile>
</ClCompile>
- <ClCompile Include="json\JSONNode_Mutex.cpp">
- <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\commonheaders.h</PrecompiledHeaderFile>
- <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\commonheaders.h</PrecompiledHeaderFile>
- <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\commonheaders.h</PrecompiledHeaderFile>
- <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\commonheaders.h</PrecompiledHeaderFile>
+ <ClCompile Include="src\json\JSONNode_Mutex.cpp">
+ <PrecompiledHeaderFile>..\commonheaders.h</PrecompiledHeaderFile>
</ClCompile>
- <ClCompile Include="json\JSONWorker.cpp">
- <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\commonheaders.h</PrecompiledHeaderFile>
- <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\commonheaders.h</PrecompiledHeaderFile>
- <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\commonheaders.h</PrecompiledHeaderFile>
- <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\commonheaders.h</PrecompiledHeaderFile>
+ <ClCompile Include="src\json\JSONWorker.cpp">
+ <PrecompiledHeaderFile>..\commonheaders.h</PrecompiledHeaderFile>
</ClCompile>
- <ClCompile Include="json\JSONWriter.cpp">
- <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\commonheaders.h</PrecompiledHeaderFile>
- <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\commonheaders.h</PrecompiledHeaderFile>
- <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\commonheaders.h</PrecompiledHeaderFile>
- <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\commonheaders.h</PrecompiledHeaderFile>
+ <ClCompile Include="src\json\JSONWriter.cpp">
+ <PrecompiledHeaderFile>..\commonheaders.h</PrecompiledHeaderFile>
</ClCompile>
- <ClCompile Include="json\libJSON.cpp">
- <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\commonheaders.h</PrecompiledHeaderFile>
- <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\commonheaders.h</PrecompiledHeaderFile>
- <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\commonheaders.h</PrecompiledHeaderFile>
- <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\commonheaders.h</PrecompiledHeaderFile>
+ <ClCompile Include="src\json\libJSON.cpp">
+ <PrecompiledHeaderFile>..\commonheaders.h</PrecompiledHeaderFile>
</ClCompile>
- <ClCompile Include="logger.cpp" />
- <ClCompile Include="mc.cpp" />
- <ClCompile Include="mstring.cpp" />
- <ClCompile Include="protos.cpp" />
- <ClCompile Include="stdafx.cpp">
+ <ClCompile Include="src\logger.cpp" />
+ <ClCompile Include="src\mc.cpp" />
+ <ClCompile Include="src\mstring.cpp" />
+ <ClCompile Include="src\protos.cpp" />
+ <ClCompile Include="src\stdafx.cpp">
<PrecompiledHeader>Create</PrecompiledHeader>
</ClCompile>
- <ClCompile Include="db.cpp" />
- <ClCompile Include="langpack.cpp" />
- <ClCompile Include="lists.cpp" />
- <ClCompile Include="md5.cpp" />
- <ClCompile Include="memory.cpp" />
- <ClCompile Include="miranda.cpp" />
- <ClCompile Include="modules.cpp" />
- <ClCompile Include="path.cpp" />
- <ClCompile Include="sha1.cpp" />
- <ClCompile Include="subclass.cpp" />
- <ClCompile Include="threads.cpp" />
- <ClCompile Include="utf.cpp" />
- <ClCompile Include="utils.cpp" />
- <ClCompile Include="winver.cpp" />
+ <ClCompile Include="src\db.cpp" />
+ <ClCompile Include="src\langpack.cpp" />
+ <ClCompile Include="src\lists.cpp" />
+ <ClCompile Include="src\md5.cpp" />
+ <ClCompile Include="src\memory.cpp" />
+ <ClCompile Include="src\miranda.cpp" />
+ <ClCompile Include="src\modules.cpp" />
+ <ClCompile Include="src\path.cpp" />
+ <ClCompile Include="src\sha1.cpp" />
+ <ClCompile Include="src\subclass.cpp" />
+ <ClCompile Include="src\threads.cpp" />
+ <ClCompile Include="src\utf.cpp" />
+ <ClCompile Include="src\utils.cpp" />
+ <ClCompile Include="src\winver.cpp" />
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectName>mir_core</ProjectName>
@@ -190,7 +160,7 @@ <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
- <ModuleDefinitionFile>mir_core.def</ModuleDefinitionFile>
+ <ModuleDefinitionFile>src\mir_core.def</ModuleDefinitionFile>
<GenerateDebugInformation>true</GenerateDebugInformation>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<SubSystem>Windows</SubSystem>
@@ -229,7 +199,7 @@ <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
- <ModuleDefinitionFile>mir_core.def</ModuleDefinitionFile>
+ <ModuleDefinitionFile>src\mir_core.def</ModuleDefinitionFile>
<GenerateDebugInformation>true</GenerateDebugInformation>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<ImportLibrary>$(IntDir)$(TargetName)64.lib</ImportLibrary>
@@ -262,7 +232,7 @@ <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
- <ModuleDefinitionFile>mir_core.def</ModuleDefinitionFile>
+ <ModuleDefinitionFile>src\mir_core.def</ModuleDefinitionFile>
<GenerateDebugInformation>true</GenerateDebugInformation>
<OptimizeReferences>true</OptimizeReferences>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -305,7 +275,7 @@ <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
- <ModuleDefinitionFile>mir_core.def</ModuleDefinitionFile>
+ <ModuleDefinitionFile>src\mir_core.def</ModuleDefinitionFile>
<GenerateDebugInformation>true</GenerateDebugInformation>
<OptimizeReferences>true</OptimizeReferences>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
diff --git a/src/mir_core/mir_core_10.vcxproj.filters b/src/mir_core/mir_core_10.vcxproj.filters index 1de8cfd829..1aa55b2dfd 100644 --- a/src/mir_core/mir_core_10.vcxproj.filters +++ b/src/mir_core/mir_core_10.vcxproj.filters @@ -13,111 +13,111 @@ </Filter>
</ItemGroup>
<ItemGroup>
- <ClCompile Include="memory.cpp">
+ <ClCompile Include="src\memory.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="miranda.cpp">
+ <ClCompile Include="src\miranda.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="modules.cpp">
+ <ClCompile Include="src\modules.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="lists.cpp">
+ <ClCompile Include="src\lists.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="langpack.cpp">
+ <ClCompile Include="src\langpack.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="utf.cpp">
+ <ClCompile Include="src\utf.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="utils.cpp">
+ <ClCompile Include="src\utils.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="path.cpp">
+ <ClCompile Include="src\path.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="md5.cpp">
+ <ClCompile Include="src\md5.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="sha1.cpp">
+ <ClCompile Include="src\sha1.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="db.cpp">
+ <ClCompile Include="src\db.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="threads.cpp">
+ <ClCompile Include="src\threads.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="cmdline.cpp">
+ <ClCompile Include="src\cmdline.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="stdafx.cpp">
+ <ClCompile Include="src\stdafx.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="icons.cpp">
+ <ClCompile Include="src\icons.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="subclass.cpp">
+ <ClCompile Include="src\subclass.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="http.cpp">
+ <ClCompile Include="src\http.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="protos.cpp">
+ <ClCompile Include="src\protos.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="json\internalJSONNode.cpp">
+ <ClCompile Include="src\json\internalJSONNode.cpp">
<Filter>Source Files\json</Filter>
</ClCompile>
- <ClCompile Include="json\JSONChildren.cpp">
+ <ClCompile Include="src\json\JSONChildren.cpp">
<Filter>Source Files\json</Filter>
</ClCompile>
- <ClCompile Include="json\JSONDebug.cpp">
+ <ClCompile Include="src\json\JSONDebug.cpp">
<Filter>Source Files\json</Filter>
</ClCompile>
- <ClCompile Include="json\JSONIterators.cpp">
+ <ClCompile Include="src\json\JSONIterators.cpp">
<Filter>Source Files\json</Filter>
</ClCompile>
- <ClCompile Include="json\JSONMemory.cpp">
+ <ClCompile Include="src\json\JSONMemory.cpp">
<Filter>Source Files\json</Filter>
</ClCompile>
- <ClCompile Include="json\JSONNode.cpp">
+ <ClCompile Include="src\json\JSONNode.cpp">
<Filter>Source Files\json</Filter>
</ClCompile>
- <ClCompile Include="json\JSONNode_Mutex.cpp">
+ <ClCompile Include="src\json\JSONNode_Mutex.cpp">
<Filter>Source Files\json</Filter>
</ClCompile>
- <ClCompile Include="json\JSONWorker.cpp">
+ <ClCompile Include="src\json\JSONWorker.cpp">
<Filter>Source Files\json</Filter>
</ClCompile>
- <ClCompile Include="json\JSONWriter.cpp">
+ <ClCompile Include="src\json\JSONWriter.cpp">
<Filter>Source Files\json</Filter>
</ClCompile>
- <ClCompile Include="json\libJSON.cpp">
+ <ClCompile Include="src\json\libJSON.cpp">
<Filter>Source Files\json</Filter>
</ClCompile>
- <ClCompile Include="logger.cpp">
+ <ClCompile Include="src\logger.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="mstring.cpp">
+ <ClCompile Include="src\mstring.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="winver.cpp">
+ <ClCompile Include="src\winver.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="mc.cpp">
+ <ClCompile Include="src\mc.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
- <ClInclude Include="commonheaders.h">
+ <ClInclude Include="src\commonheaders.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\include\m_core.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="miranda.h">
+ <ClInclude Include="src\miranda.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\include\m_system.h">
@@ -126,31 +126,31 @@ <ClInclude Include="..\..\include\m_database.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="json\internalJSONNode.h">
+ <ClInclude Include="src\json\internalJSONNode.h">
<Filter>Source Files\json</Filter>
</ClInclude>
- <ClInclude Include="json\JSONChildren.h">
+ <ClInclude Include="src\json\JSONChildren.h">
<Filter>Source Files\json</Filter>
</ClInclude>
- <ClInclude Include="json\JSONDebug.h">
+ <ClInclude Include="src\json\JSONDebug.h">
<Filter>Source Files\json</Filter>
</ClInclude>
- <ClInclude Include="json\JSONDefs.h">
+ <ClInclude Include="src\json\JSONDefs.h">
<Filter>Source Files\json</Filter>
</ClInclude>
- <ClInclude Include="json\JSONMemory.h">
+ <ClInclude Include="src\json\JSONMemory.h">
<Filter>Source Files\json</Filter>
</ClInclude>
- <ClInclude Include="json\JSONNode.h">
+ <ClInclude Include="src\json\JSONNode.h">
<Filter>Source Files\json</Filter>
</ClInclude>
- <ClInclude Include="json\JSONOptions.h">
+ <ClInclude Include="src\json\JSONOptions.h">
<Filter>Source Files\json</Filter>
</ClInclude>
- <ClInclude Include="json\JSONWorker.h">
+ <ClInclude Include="src\json\JSONWorker.h">
<Filter>Source Files\json</Filter>
</ClInclude>
- <ClInclude Include="json\NumberToString.h">
+ <ClInclude Include="src\json\NumberToString.h">
<Filter>Source Files\json</Filter>
</ClInclude>
<ClInclude Include="..\..\include\m_system_cpp.h">
diff --git a/src/mir_core/mir_core_12.vcxproj b/src/mir_core/mir_core_12.vcxproj index 6e2a4f4ee2..c74c8ae5bf 100644 --- a/src/mir_core/mir_core_12.vcxproj +++ b/src/mir_core/mir_core_12.vcxproj @@ -25,97 +25,70 @@ <ClInclude Include="..\..\include\m_metacontacts.h" />
<ClInclude Include="..\..\include\m_system.h" />
<ClInclude Include="..\..\include\m_system_cpp.h" />
- <ClInclude Include="commonheaders.h" />
- <ClInclude Include="json\internalJSONNode.h" />
- <ClInclude Include="json\JSONChildren.h" />
- <ClInclude Include="json\JSONDebug.h" />
- <ClInclude Include="json\JSONDefs.h" />
- <ClInclude Include="json\JSONMemory.h" />
- <ClInclude Include="json\JSONNode.h" />
- <ClInclude Include="json\JSONOptions.h" />
- <ClInclude Include="json\JSONWorker.h" />
+ <ClInclude Include="src\commonheaders.h" />
+ <ClInclude Include="src\json\internalJSONNode.h" />
+ <ClInclude Include="src\json\JSONChildren.h" />
+ <ClInclude Include="src\json\JSONDebug.h" />
+ <ClInclude Include="src\json\JSONDefs.h" />
+ <ClInclude Include="src\json\JSONMemory.h" />
+ <ClInclude Include="src\json\JSONNode.h" />
+ <ClInclude Include="src\json\JSONOptions.h" />
+ <ClInclude Include="src\src\json\JSONWorker.h" />
<ClInclude Include="json\NumberToString.h" />
- <ClInclude Include="miranda.h" />
+ <ClInclude Include="src\miranda.h" />
</ItemGroup>
<ItemGroup>
- <ClCompile Include="cmdline.cpp" />
- <ClCompile Include="http.cpp" />
- <ClCompile Include="icons.cpp" />
- <ClCompile Include="json\internalJSONNode.cpp">
- <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../commonheaders.h</PrecompiledHeaderFile>
- <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../commonheaders.h</PrecompiledHeaderFile>
- <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../commonheaders.h</PrecompiledHeaderFile>
- <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../commonheaders.h</PrecompiledHeaderFile>
+ <ClCompile Include="src\cmdline.cpp" />
+ <ClCompile Include="src\http.cpp" />
+ <ClCompile Include="src\icons.cpp" />
+ <ClCompile Include="src\json\internalJSONNode.cpp">
+ <PrecompiledHeaderFile>../commonheaders.h</PrecompiledHeaderFile>
</ClCompile>
- <ClCompile Include="json\JSONChildren.cpp">
- <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../commonheaders.h</PrecompiledHeaderFile>
- <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../commonheaders.h</PrecompiledHeaderFile>
- <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../commonheaders.h</PrecompiledHeaderFile>
- <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../commonheaders.h</PrecompiledHeaderFile>
+ <ClCompile Include="src\json\JSONChildren.cpp">
+ <PrecompiledHeaderFile>../commonheaders.h</PrecompiledHeaderFile>
</ClCompile>
- <ClCompile Include="json\JSONDebug.cpp">
- <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../commonheaders.h</PrecompiledHeaderFile>
- <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../commonheaders.h</PrecompiledHeaderFile>
- <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../commonheaders.h</PrecompiledHeaderFile>
- <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../commonheaders.h</PrecompiledHeaderFile>
+ <ClCompile Include="src\json\JSONDebug.cpp">
+ <PrecompiledHeaderFile>../commonheaders.h</PrecompiledHeaderFile>
</ClCompile>
- <ClCompile Include="json\JSONMemory.cpp">
- <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../commonheaders.h</PrecompiledHeaderFile>
- <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../commonheaders.h</PrecompiledHeaderFile>
- <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../commonheaders.h</PrecompiledHeaderFile>
- <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../commonheaders.h</PrecompiledHeaderFile>
+ <ClCompile Include="src\json\JSONMemory.cpp">
+ <PrecompiledHeaderFile>../commonheaders.h</PrecompiledHeaderFile>
</ClCompile>
- <ClCompile Include="json\JSONNode.cpp">
- <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../commonheaders.h</PrecompiledHeaderFile>
- <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../commonheaders.h</PrecompiledHeaderFile>
- <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../commonheaders.h</PrecompiledHeaderFile>
- <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../commonheaders.h</PrecompiledHeaderFile>
+ <ClCompile Include="src\json\JSONNode.cpp">
+ <PrecompiledHeaderFile>../commonheaders.h</PrecompiledHeaderFile>
</ClCompile>
- <ClCompile Include="json\JSONNode_Mutex.cpp">
- <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../commonheaders.h</PrecompiledHeaderFile>
- <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../commonheaders.h</PrecompiledHeaderFile>
- <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../commonheaders.h</PrecompiledHeaderFile>
- <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../commonheaders.h</PrecompiledHeaderFile>
+ <ClCompile Include="src\json\JSONNode_Mutex.cpp">
+ <PrecompiledHeaderFile>../commonheaders.h</PrecompiledHeaderFile>
</ClCompile>
- <ClCompile Include="json\JSONWorker.cpp">
- <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../commonheaders.h</PrecompiledHeaderFile>
- <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../commonheaders.h</PrecompiledHeaderFile>
- <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../commonheaders.h</PrecompiledHeaderFile>
- <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../commonheaders.h</PrecompiledHeaderFile>
+ <ClCompile Include="src\json\JSONWorker.cpp">
+ <PrecompiledHeaderFile>../commonheaders.h</PrecompiledHeaderFile>
</ClCompile>
- <ClCompile Include="json\JSONWriter.cpp">
- <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../commonheaders.h</PrecompiledHeaderFile>
- <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../commonheaders.h</PrecompiledHeaderFile>
- <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../commonheaders.h</PrecompiledHeaderFile>
- <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../commonheaders.h</PrecompiledHeaderFile>
+ <ClCompile Include="src\json\JSONWriter.cpp">
+ <PrecompiledHeaderFile>../commonheaders.h</PrecompiledHeaderFile>
</ClCompile>
- <ClCompile Include="json\libJSON.cpp">
- <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../commonheaders.h</PrecompiledHeaderFile>
- <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../commonheaders.h</PrecompiledHeaderFile>
- <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../commonheaders.h</PrecompiledHeaderFile>
- <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../commonheaders.h</PrecompiledHeaderFile>
+ <ClCompile Include="src\json\libJSON.cpp">
+ <PrecompiledHeaderFile>../commonheaders.h</PrecompiledHeaderFile>
</ClCompile>
- <ClCompile Include="logger.cpp" />
- <ClCompile Include="mc.cpp" />
- <ClCompile Include="mstring.cpp" />
- <ClCompile Include="protos.cpp" />
- <ClCompile Include="stdafx.cpp">
+ <ClCompile Include="src\logger.cpp" />
+ <ClCompile Include="src\mc.cpp" />
+ <ClCompile Include="src\mstring.cpp" />
+ <ClCompile Include="src\protos.cpp" />
+ <ClCompile Include="src\stdafx.cpp">
<PrecompiledHeader>Create</PrecompiledHeader>
</ClCompile>
- <ClCompile Include="db.cpp" />
- <ClCompile Include="langpack.cpp" />
- <ClCompile Include="lists.cpp" />
- <ClCompile Include="md5.cpp" />
- <ClCompile Include="memory.cpp" />
- <ClCompile Include="miranda.cpp" />
- <ClCompile Include="modules.cpp" />
- <ClCompile Include="path.cpp" />
- <ClCompile Include="sha1.cpp" />
- <ClCompile Include="subclass.cpp" />
- <ClCompile Include="threads.cpp" />
- <ClCompile Include="utf.cpp" />
- <ClCompile Include="utils.cpp" />
- <ClCompile Include="winver.cpp" />
+ <ClCompile Include="src\db.cpp" />
+ <ClCompile Include="src\langpack.cpp" />
+ <ClCompile Include="src\lists.cpp" />
+ <ClCompile Include="src\md5.cpp" />
+ <ClCompile Include="src\memory.cpp" />
+ <ClCompile Include="src\miranda.cpp" />
+ <ClCompile Include="src\modules.cpp" />
+ <ClCompile Include="src\path.cpp" />
+ <ClCompile Include="src\sha1.cpp" />
+ <ClCompile Include="src\subclass.cpp" />
+ <ClCompile Include="src\threads.cpp" />
+ <ClCompile Include="src\utf.cpp" />
+ <ClCompile Include="src\utils.cpp" />
+ <ClCompile Include="src\winver.cpp" />
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectName>mir_core</ProjectName>
@@ -190,7 +163,7 @@ <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
- <ModuleDefinitionFile>mir_core.def</ModuleDefinitionFile>
+ <ModuleDefinitionFile>src\mir_core.def</ModuleDefinitionFile>
<GenerateDebugInformation>true</GenerateDebugInformation>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<SubSystem>Windows</SubSystem>
@@ -230,7 +203,7 @@ <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
- <ModuleDefinitionFile>mir_core.def</ModuleDefinitionFile>
+ <ModuleDefinitionFile>src\mir_core.def</ModuleDefinitionFile>
<GenerateDebugInformation>true</GenerateDebugInformation>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<ImportLibrary>$(IntDir)$(TargetName)64.lib</ImportLibrary>
@@ -263,7 +236,7 @@ <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
- <ModuleDefinitionFile>mir_core.def</ModuleDefinitionFile>
+ <ModuleDefinitionFile>src\mir_core.def</ModuleDefinitionFile>
<GenerateDebugInformation>true</GenerateDebugInformation>
<OptimizeReferences>true</OptimizeReferences>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -305,7 +278,7 @@ <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
- <ModuleDefinitionFile>mir_core.def</ModuleDefinitionFile>
+ <ModuleDefinitionFile>src\mir_core.def</ModuleDefinitionFile>
<GenerateDebugInformation>true</GenerateDebugInformation>
<OptimizeReferences>true</OptimizeReferences>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
diff --git a/src/mir_core/mir_core_12.vcxproj.filters b/src/mir_core/mir_core_12.vcxproj.filters index cf84f183a5..4f6c514596 100644 --- a/src/mir_core/mir_core_12.vcxproj.filters +++ b/src/mir_core/mir_core_12.vcxproj.filters @@ -13,108 +13,108 @@ </Filter>
</ItemGroup>
<ItemGroup>
- <ClCompile Include="memory.cpp">
+ <ClCompile Include="src\memory.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="miranda.cpp">
+ <ClCompile Include="src\miranda.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="modules.cpp">
+ <ClCompile Include="src\modules.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="lists.cpp">
+ <ClCompile Include="src\lists.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="langpack.cpp">
+ <ClCompile Include="src\langpack.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="utf.cpp">
+ <ClCompile Include="src\utf.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="utils.cpp">
+ <ClCompile Include="src\utils.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="path.cpp">
+ <ClCompile Include="src\path.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="md5.cpp">
+ <ClCompile Include="src\md5.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="sha1.cpp">
+ <ClCompile Include="src\sha1.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="db.cpp">
+ <ClCompile Include="src\db.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="threads.cpp">
+ <ClCompile Include="src\threads.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="cmdline.cpp">
+ <ClCompile Include="src\cmdline.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="stdafx.cpp">
+ <ClCompile Include="src\stdafx.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="icons.cpp">
+ <ClCompile Include="src\icons.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="subclass.cpp">
+ <ClCompile Include="src\subclass.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="http.cpp">
+ <ClCompile Include="src\http.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="protos.cpp">
+ <ClCompile Include="src\protos.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="json\internalJSONNode.cpp">
+ <ClCompile Include="src\json\internalJSONNode.cpp">
<Filter>Source Files\json</Filter>
</ClCompile>
- <ClCompile Include="json\JSONChildren.cpp">
+ <ClCompile Include="src\json\JSONChildren.cpp">
<Filter>Source Files\json</Filter>
</ClCompile>
- <ClCompile Include="json\JSONDebug.cpp">
+ <ClCompile Include="src\json\JSONDebug.cpp">
<Filter>Source Files\json</Filter>
</ClCompile>
- <ClCompile Include="json\JSONMemory.cpp">
+ <ClCompile Include="src\json\JSONMemory.cpp">
<Filter>Source Files\json</Filter>
</ClCompile>
- <ClCompile Include="json\JSONNode.cpp">
+ <ClCompile Include="src\json\JSONNode.cpp">
<Filter>Source Files\json</Filter>
</ClCompile>
- <ClCompile Include="json\JSONNode_Mutex.cpp">
+ <ClCompile Include="src\json\JSONNode_Mutex.cpp">
<Filter>Source Files\json</Filter>
</ClCompile>
- <ClCompile Include="json\JSONWorker.cpp">
+ <ClCompile Include="src\json\JSONWorker.cpp">
<Filter>Source Files\json</Filter>
</ClCompile>
- <ClCompile Include="json\JSONWriter.cpp">
+ <ClCompile Include="src\json\JSONWriter.cpp">
<Filter>Source Files\json</Filter>
</ClCompile>
- <ClCompile Include="json\libJSON.cpp">
+ <ClCompile Include="src\json\libJSON.cpp">
<Filter>Source Files\json</Filter>
</ClCompile>
- <ClCompile Include="logger.cpp">
+ <ClCompile Include="src\logger.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="mstring.cpp">
+ <ClCompile Include="src\mstring.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="winver.cpp">
+ <ClCompile Include="src\winver.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="mc.cpp">
+ <ClCompile Include="src\mc.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
- <ClInclude Include="commonheaders.h">
+ <ClInclude Include="src\commonheaders.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\include\m_core.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="miranda.h">
+ <ClInclude Include="src\miranda.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\include\m_system.h">
@@ -123,31 +123,31 @@ <ClInclude Include="..\..\include\m_database.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="json\internalJSONNode.h">
+ <ClInclude Include="src\json\internalJSONNode.h">
<Filter>Source Files\json</Filter>
</ClInclude>
- <ClInclude Include="json\JSONChildren.h">
+ <ClInclude Include="src\json\JSONChildren.h">
<Filter>Source Files\json</Filter>
</ClInclude>
- <ClInclude Include="json\JSONDebug.h">
+ <ClInclude Include="src\json\JSONDebug.h">
<Filter>Source Files\json</Filter>
</ClInclude>
- <ClInclude Include="json\JSONDefs.h">
+ <ClInclude Include="src\json\JSONDefs.h">
<Filter>Source Files\json</Filter>
</ClInclude>
- <ClInclude Include="json\JSONMemory.h">
+ <ClInclude Include="src\json\JSONMemory.h">
<Filter>Source Files\json</Filter>
</ClInclude>
- <ClInclude Include="json\JSONNode.h">
+ <ClInclude Include="src\json\JSONNode.h">
<Filter>Source Files\json</Filter>
</ClInclude>
- <ClInclude Include="json\JSONOptions.h">
+ <ClInclude Include="src\json\JSONOptions.h">
<Filter>Source Files\json</Filter>
</ClInclude>
- <ClInclude Include="json\JSONWorker.h">
+ <ClInclude Include="src\json\JSONWorker.h">
<Filter>Source Files\json</Filter>
</ClInclude>
- <ClInclude Include="json\NumberToString.h">
+ <ClInclude Include="src\json\NumberToString.h">
<Filter>Source Files\json</Filter>
</ClInclude>
<ClInclude Include="..\..\include\m_json.h">
diff --git a/src/mir_core/cmdline.cpp b/src/mir_core/src/cmdline.cpp index 1b9bc11c20..1b9bc11c20 100644 --- a/src/mir_core/cmdline.cpp +++ b/src/mir_core/src/cmdline.cpp diff --git a/src/mir_core/commonheaders.h b/src/mir_core/src/commonheaders.h index 083ccd8e87..083ccd8e87 100644 --- a/src/mir_core/commonheaders.h +++ b/src/mir_core/src/commonheaders.h diff --git a/src/mir_core/db.cpp b/src/mir_core/src/db.cpp index 079225682a..079225682a 100644 --- a/src/mir_core/db.cpp +++ b/src/mir_core/src/db.cpp diff --git a/src/mir_core/http.cpp b/src/mir_core/src/http.cpp index b47cdd4e9c..b47cdd4e9c 100644 --- a/src/mir_core/http.cpp +++ b/src/mir_core/src/http.cpp diff --git a/src/mir_core/icons.cpp b/src/mir_core/src/icons.cpp index 77c924be25..77c924be25 100644 --- a/src/mir_core/icons.cpp +++ b/src/mir_core/src/icons.cpp diff --git a/src/mir_core/json/JSONChildren.cpp b/src/mir_core/src/json/JSONChildren.cpp index 1eb9e29d46..1eb9e29d46 100644 --- a/src/mir_core/json/JSONChildren.cpp +++ b/src/mir_core/src/json/JSONChildren.cpp diff --git a/src/mir_core/json/JSONChildren.h b/src/mir_core/src/json/JSONChildren.h index ce697ffd77..ce697ffd77 100644 --- a/src/mir_core/json/JSONChildren.h +++ b/src/mir_core/src/json/JSONChildren.h diff --git a/src/mir_core/json/JSONDebug.cpp b/src/mir_core/src/json/JSONDebug.cpp index e5ba81a188..e5ba81a188 100644 --- a/src/mir_core/json/JSONDebug.cpp +++ b/src/mir_core/src/json/JSONDebug.cpp diff --git a/src/mir_core/json/JSONDebug.h b/src/mir_core/src/json/JSONDebug.h index ff1cedf8fc..ff1cedf8fc 100644 --- a/src/mir_core/json/JSONDebug.h +++ b/src/mir_core/src/json/JSONDebug.h diff --git a/src/mir_core/json/JSONDefs.h b/src/mir_core/src/json/JSONDefs.h index 9bcaa55b64..9bcaa55b64 100644 --- a/src/mir_core/json/JSONDefs.h +++ b/src/mir_core/src/json/JSONDefs.h diff --git a/src/mir_core/json/JSONIterators.cpp b/src/mir_core/src/json/JSONIterators.cpp index 1ff164e1be..1ff164e1be 100644 --- a/src/mir_core/json/JSONIterators.cpp +++ b/src/mir_core/src/json/JSONIterators.cpp diff --git a/src/mir_core/json/JSONMemory.cpp b/src/mir_core/src/json/JSONMemory.cpp index dfe757b5c1..dfe757b5c1 100644 --- a/src/mir_core/json/JSONMemory.cpp +++ b/src/mir_core/src/json/JSONMemory.cpp diff --git a/src/mir_core/json/JSONMemory.h b/src/mir_core/src/json/JSONMemory.h index 32e8c3f4ef..32e8c3f4ef 100644 --- a/src/mir_core/json/JSONMemory.h +++ b/src/mir_core/src/json/JSONMemory.h diff --git a/src/mir_core/json/JSONNode.cpp b/src/mir_core/src/json/JSONNode.cpp index b1a492b5a6..b1a492b5a6 100644 --- a/src/mir_core/json/JSONNode.cpp +++ b/src/mir_core/src/json/JSONNode.cpp diff --git a/src/mir_core/json/JSONNode.h b/src/mir_core/src/json/JSONNode.h index dfb6ff01f3..dfb6ff01f3 100644 --- a/src/mir_core/json/JSONNode.h +++ b/src/mir_core/src/json/JSONNode.h diff --git a/src/mir_core/json/JSONNode_Mutex.cpp b/src/mir_core/src/json/JSONNode_Mutex.cpp index 497e867f62..497e867f62 100644 --- a/src/mir_core/json/JSONNode_Mutex.cpp +++ b/src/mir_core/src/json/JSONNode_Mutex.cpp diff --git a/src/mir_core/json/JSONOptions.h b/src/mir_core/src/json/JSONOptions.h index d4bd343677..d4bd343677 100644 --- a/src/mir_core/json/JSONOptions.h +++ b/src/mir_core/src/json/JSONOptions.h diff --git a/src/mir_core/json/JSONWorker.cpp b/src/mir_core/src/json/JSONWorker.cpp index cf8254a357..cf8254a357 100644 --- a/src/mir_core/json/JSONWorker.cpp +++ b/src/mir_core/src/json/JSONWorker.cpp diff --git a/src/mir_core/json/JSONWorker.h b/src/mir_core/src/json/JSONWorker.h index f425e12e86..f425e12e86 100644 --- a/src/mir_core/json/JSONWorker.h +++ b/src/mir_core/src/json/JSONWorker.h diff --git a/src/mir_core/json/JSONWriter.cpp b/src/mir_core/src/json/JSONWriter.cpp index edf407d25d..edf407d25d 100644 --- a/src/mir_core/json/JSONWriter.cpp +++ b/src/mir_core/src/json/JSONWriter.cpp diff --git a/src/mir_core/json/NumberToString.h b/src/mir_core/src/json/NumberToString.h index a706372f92..a706372f92 100644 --- a/src/mir_core/json/NumberToString.h +++ b/src/mir_core/src/json/NumberToString.h diff --git a/src/mir_core/json/internalJSONNode.cpp b/src/mir_core/src/json/internalJSONNode.cpp index 4b33ad9545..4b33ad9545 100644 --- a/src/mir_core/json/internalJSONNode.cpp +++ b/src/mir_core/src/json/internalJSONNode.cpp diff --git a/src/mir_core/json/internalJSONNode.h b/src/mir_core/src/json/internalJSONNode.h index cf626ceae0..cf626ceae0 100644 --- a/src/mir_core/json/internalJSONNode.h +++ b/src/mir_core/src/json/internalJSONNode.h diff --git a/src/mir_core/json/libJSON.cpp b/src/mir_core/src/json/libJSON.cpp index d55505c4eb..d55505c4eb 100644 --- a/src/mir_core/json/libJSON.cpp +++ b/src/mir_core/src/json/libJSON.cpp diff --git a/src/mir_core/langpack.cpp b/src/mir_core/src/langpack.cpp index 29f633bc45..0c2cf130ea 100644 --- a/src/mir_core/langpack.cpp +++ b/src/mir_core/src/langpack.cpp @@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
#include "commonheaders.h"
-#include "../modules/langpack/langpack.h"
+#include "../../modules/langpack/langpack.h"
#define LANGPACK_BUF_SIZE 4000
diff --git a/src/mir_core/lists.cpp b/src/mir_core/src/lists.cpp index f981927cd8..f981927cd8 100644 --- a/src/mir_core/lists.cpp +++ b/src/mir_core/src/lists.cpp diff --git a/src/mir_core/logger.cpp b/src/mir_core/src/logger.cpp index e129f48765..e129f48765 100644 --- a/src/mir_core/logger.cpp +++ b/src/mir_core/src/logger.cpp diff --git a/src/mir_core/mc.cpp b/src/mir_core/src/mc.cpp index 189e4a3ed0..189e4a3ed0 100644 --- a/src/mir_core/mc.cpp +++ b/src/mir_core/src/mc.cpp diff --git a/src/mir_core/md5.cpp b/src/mir_core/src/md5.cpp index 216abfedba..216abfedba 100644 --- a/src/mir_core/md5.cpp +++ b/src/mir_core/src/md5.cpp diff --git a/src/mir_core/memory.cpp b/src/mir_core/src/memory.cpp index 9c1c2afbf6..9c1c2afbf6 100644 --- a/src/mir_core/memory.cpp +++ b/src/mir_core/src/memory.cpp diff --git a/src/mir_core/mir_core.def b/src/mir_core/src/mir_core.def index 312540f081..312540f081 100644 --- a/src/mir_core/mir_core.def +++ b/src/mir_core/src/mir_core.def diff --git a/src/mir_core/miranda.cpp b/src/mir_core/src/miranda.cpp index ebf4b59956..ebf4b59956 100644 --- a/src/mir_core/miranda.cpp +++ b/src/mir_core/src/miranda.cpp diff --git a/src/mir_core/miranda.h b/src/mir_core/src/miranda.h index 6b85fc2b67..6b85fc2b67 100644 --- a/src/mir_core/miranda.h +++ b/src/mir_core/src/miranda.h diff --git a/src/mir_core/modules.cpp b/src/mir_core/src/modules.cpp index 8b819b17a4..8b819b17a4 100644 --- a/src/mir_core/modules.cpp +++ b/src/mir_core/src/modules.cpp diff --git a/src/mir_core/mstring.cpp b/src/mir_core/src/mstring.cpp index 8d071b61c1..8d071b61c1 100644 --- a/src/mir_core/mstring.cpp +++ b/src/mir_core/src/mstring.cpp diff --git a/src/mir_core/path.cpp b/src/mir_core/src/path.cpp index ab0ee26b14..ab0ee26b14 100644 --- a/src/mir_core/path.cpp +++ b/src/mir_core/src/path.cpp diff --git a/src/mir_core/protos.cpp b/src/mir_core/src/protos.cpp index 7015647bc3..7015647bc3 100644 --- a/src/mir_core/protos.cpp +++ b/src/mir_core/src/protos.cpp diff --git a/src/mir_core/sha1.cpp b/src/mir_core/src/sha1.cpp index 5e82a3ce5b..5e82a3ce5b 100644 --- a/src/mir_core/sha1.cpp +++ b/src/mir_core/src/sha1.cpp diff --git a/src/mir_core/stdafx.cpp b/src/mir_core/src/stdafx.cpp index 9c953189b2..9c953189b2 100644 --- a/src/mir_core/stdafx.cpp +++ b/src/mir_core/src/stdafx.cpp diff --git a/src/mir_core/subclass.cpp b/src/mir_core/src/subclass.cpp index ca5dc88d2b..ca5dc88d2b 100644 --- a/src/mir_core/subclass.cpp +++ b/src/mir_core/src/subclass.cpp diff --git a/src/mir_core/threads.cpp b/src/mir_core/src/threads.cpp index b1d6a23ebd..b1d6a23ebd 100644 --- a/src/mir_core/threads.cpp +++ b/src/mir_core/src/threads.cpp diff --git a/src/mir_core/utf.cpp b/src/mir_core/src/utf.cpp index 1e30cdecf5..1e30cdecf5 100644 --- a/src/mir_core/utf.cpp +++ b/src/mir_core/src/utf.cpp diff --git a/src/mir_core/utils.cpp b/src/mir_core/src/utils.cpp index bf05b84b6e..bf05b84b6e 100644 --- a/src/mir_core/utils.cpp +++ b/src/mir_core/src/utils.cpp diff --git a/src/mir_core/winver.cpp b/src/mir_core/src/winver.cpp index ad011a8e40..ad011a8e40 100644 --- a/src/mir_core/winver.cpp +++ b/src/mir_core/src/winver.cpp |