diff options
| author | Vadim Dashevskiy <watcherhd@gmail.com> | 2012-07-23 07:10:03 +0000 |
|---|---|---|
| committer | Vadim Dashevskiy <watcherhd@gmail.com> | 2012-07-23 07:10:03 +0000 |
| commit | d828acae837c71992f6a5f9dd688ba7afd944e56 (patch) | |
| tree | 3be6506a6bbf40798199e07d4e2a0f0eef721efc /plugins | |
| parent | 9126d2b133d00b836fca640f847a0948f7579e02 (diff) | |
Dbx_mmap_SA, Import_SA, Dbtool_SA: changed folder structure
git-svn-id: http://svn.miranda-ng.org/main/trunk@1108 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/Dbx_mmap_SA/Cryptors/RC4/rc4_10.vcxproj | 10 | ||||
| -rw-r--r-- | plugins/Dbx_mmap_SA/Cryptors/RC4/rc4_10.vcxproj.filters | 10 | ||||
| -rw-r--r-- | plugins/Dbx_mmap_SA/Cryptors/RC4/src/cryptor.c (renamed from plugins/Dbx_mmap_SA/Cryptors/RC4/cryptor.c) | 0 | ||||
| -rw-r--r-- | plugins/Dbx_mmap_SA/Dbtool/dbtool_sa_10.vcxproj | 70 | ||||
| -rw-r--r-- | plugins/Dbx_mmap_SA/Dbtool/dbtool_sa_10.vcxproj.filters | 66 | ||||
| -rw-r--r-- | plugins/Dbx_mmap_SA/Dbtool/res/Version.rc (renamed from plugins/Dbx_mmap_SA/Dbtool/Version.rc) | 2 | ||||
| -rw-r--r-- | plugins/Dbx_mmap_SA/Dbtool/res/dbtool.exe.manifest (renamed from plugins/Dbx_mmap_SA/Dbtool/dbtool.exe.manifest) | 0 | ||||
| -rw-r--r-- | plugins/Dbx_mmap_SA/Dbtool/res/resource.rc (renamed from plugins/Dbx_mmap_SA/Dbtool/resource.rc) | 16 | ||||
| -rw-r--r-- | plugins/Dbx_mmap_SA/Dbtool/src/Version.h (renamed from plugins/Dbx_mmap_SA/Dbtool/Version.h) | 0 | ||||
| -rw-r--r-- | plugins/Dbx_mmap_SA/Dbtool/src/aggressive.cpp (renamed from plugins/Dbx_mmap_SA/Dbtool/aggressive.cpp) | 0 | ||||
| -rw-r--r-- | plugins/Dbx_mmap_SA/Dbtool/src/cleaning.cpp (renamed from plugins/Dbx_mmap_SA/Dbtool/cleaning.cpp) | 0 | ||||
| -rw-r--r-- | plugins/Dbx_mmap_SA/Dbtool/src/contactchain.cpp (renamed from plugins/Dbx_mmap_SA/Dbtool/contactchain.cpp) | 0 | ||||
| -rw-r--r-- | plugins/Dbx_mmap_SA/Dbtool/src/database.h (renamed from plugins/Dbx_mmap_SA/Dbtool/database.h) | 0 | ||||
| -rw-r--r-- | plugins/Dbx_mmap_SA/Dbtool/src/dbtool.h (renamed from plugins/Dbx_mmap_SA/Dbtool/dbtool.h) | 2 | ||||
| -rw-r--r-- | plugins/Dbx_mmap_SA/Dbtool/src/disk.cpp (renamed from plugins/Dbx_mmap_SA/Dbtool/disk.cpp) | 0 | ||||
| -rw-r--r-- | plugins/Dbx_mmap_SA/Dbtool/src/encryption.cpp (renamed from plugins/Dbx_mmap_SA/Dbtool/encryption.cpp) | 0 | ||||
| -rw-r--r-- | plugins/Dbx_mmap_SA/Dbtool/src/eventchain.cpp (renamed from plugins/Dbx_mmap_SA/Dbtool/eventchain.cpp) | 0 | ||||
| -rw-r--r-- | plugins/Dbx_mmap_SA/Dbtool/src/fileaccess.cpp (renamed from plugins/Dbx_mmap_SA/Dbtool/fileaccess.cpp) | 0 | ||||
| -rw-r--r-- | plugins/Dbx_mmap_SA/Dbtool/src/finaltasks.cpp (renamed from plugins/Dbx_mmap_SA/Dbtool/finaltasks.cpp) | 0 | ||||
| -rw-r--r-- | plugins/Dbx_mmap_SA/Dbtool/src/finished.cpp (renamed from plugins/Dbx_mmap_SA/Dbtool/finished.cpp) | 0 | ||||
| -rw-r--r-- | plugins/Dbx_mmap_SA/Dbtool/src/initialchecks.cpp (renamed from plugins/Dbx_mmap_SA/Dbtool/initialchecks.cpp) | 0 | ||||
| -rw-r--r-- | plugins/Dbx_mmap_SA/Dbtool/src/main.cpp (renamed from plugins/Dbx_mmap_SA/Dbtool/main.cpp) | 0 | ||||
| -rw-r--r-- | plugins/Dbx_mmap_SA/Dbtool/src/modulechain.cpp (renamed from plugins/Dbx_mmap_SA/Dbtool/modulechain.cpp) | 0 | ||||
| -rw-r--r-- | plugins/Dbx_mmap_SA/Dbtool/src/openerror.cpp (renamed from plugins/Dbx_mmap_SA/Dbtool/openerror.cpp) | 0 | ||||
| -rw-r--r-- | plugins/Dbx_mmap_SA/Dbtool/src/progress.cpp (renamed from plugins/Dbx_mmap_SA/Dbtool/progress.cpp) | 0 | ||||
| -rw-r--r-- | plugins/Dbx_mmap_SA/Dbtool/src/resource.h (renamed from plugins/Dbx_mmap_SA/Dbtool/resource.h) | 0 | ||||
| -rw-r--r-- | plugins/Dbx_mmap_SA/Dbtool/src/selectdb.cpp (renamed from plugins/Dbx_mmap_SA/Dbtool/selectdb.cpp) | 0 | ||||
| -rw-r--r-- | plugins/Dbx_mmap_SA/Dbtool/src/settingschain.cpp (renamed from plugins/Dbx_mmap_SA/Dbtool/settingschain.cpp) | 0 | ||||
| -rw-r--r-- | plugins/Dbx_mmap_SA/Dbtool/src/user.cpp (renamed from plugins/Dbx_mmap_SA/Dbtool/user.cpp) | 0 | ||||
| -rw-r--r-- | plugins/Dbx_mmap_SA/Dbtool/src/utf.cpp (renamed from plugins/Dbx_mmap_SA/Dbtool/utf.cpp) | 0 | ||||
| -rw-r--r-- | plugins/Dbx_mmap_SA/Dbtool/src/welcome.cpp (renamed from plugins/Dbx_mmap_SA/Dbtool/welcome.cpp) | 0 | ||||
| -rw-r--r-- | plugins/Dbx_mmap_SA/Dbtool/src/wizard.cpp (renamed from plugins/Dbx_mmap_SA/Dbtool/wizard.cpp) | 0 | ||||
| -rw-r--r-- | plugins/Dbx_mmap_SA/Dbtool/src/worker.cpp (renamed from plugins/Dbx_mmap_SA/Dbtool/worker.cpp) | 0 | ||||
| -rw-r--r-- | plugins/Dbx_mmap_SA/Import_SA/import_sa_10.vcxproj | 52 | ||||
| -rw-r--r-- | plugins/Dbx_mmap_SA/Import_SA/import_sa_10.vcxproj.filters | 53 | ||||
| -rw-r--r-- | plugins/Dbx_mmap_SA/Import_SA/res/Version.rc (renamed from plugins/Dbx_mmap_SA/Import_SA/Version.rc) | 2 | ||||
| -rw-r--r-- | plugins/Dbx_mmap_SA/Import_SA/res/resource.rc (renamed from plugins/Dbx_mmap_SA/Import_SA/resource.rc) | 8 | ||||
| -rw-r--r-- | plugins/Dbx_mmap_SA/Import_SA/src/ICQserver.cpp (renamed from plugins/Dbx_mmap_SA/Import_SA/ICQserver.cpp) | 0 | ||||
| -rw-r--r-- | plugins/Dbx_mmap_SA/Import_SA/src/ICQserver.h (renamed from plugins/Dbx_mmap_SA/Import_SA/ICQserver.h) | 0 | ||||
| -rw-r--r-- | plugins/Dbx_mmap_SA/Import_SA/src/encryption.cpp (renamed from plugins/Dbx_mmap_SA/Import_SA/encryption.cpp) | 0 | ||||
| -rw-r--r-- | plugins/Dbx_mmap_SA/Import_SA/src/import.h (renamed from plugins/Dbx_mmap_SA/Import_SA/import.h) | 3 | ||||
| -rw-r--r-- | plugins/Dbx_mmap_SA/Import_SA/src/main.cpp (renamed from plugins/Dbx_mmap_SA/Import_SA/main.cpp) | 0 | ||||
| -rw-r--r-- | plugins/Dbx_mmap_SA/Import_SA/src/mirabilis.cpp (renamed from plugins/Dbx_mmap_SA/Import_SA/mirabilis.cpp) | 0 | ||||
| -rw-r--r-- | plugins/Dbx_mmap_SA/Import_SA/src/mirabilis.h (renamed from plugins/Dbx_mmap_SA/Import_SA/mirabilis.h) | 0 | ||||
| -rw-r--r-- | plugins/Dbx_mmap_SA/Import_SA/src/miranda.cpp (renamed from plugins/Dbx_mmap_SA/Import_SA/miranda.cpp) | 0 | ||||
| -rw-r--r-- | plugins/Dbx_mmap_SA/Import_SA/src/mirandadb0700.h (renamed from plugins/Dbx_mmap_SA/Import_SA/mirandadb0700.h) | 0 | ||||
| -rw-r--r-- | plugins/Dbx_mmap_SA/Import_SA/src/mirandahistory.cpp (renamed from plugins/Dbx_mmap_SA/Import_SA/mirandahistory.cpp) | 0 | ||||
| -rw-r--r-- | plugins/Dbx_mmap_SA/Import_SA/src/progress.cpp (renamed from plugins/Dbx_mmap_SA/Import_SA/progress.cpp) | 0 | ||||
| -rw-r--r-- | plugins/Dbx_mmap_SA/Import_SA/src/resource.h (renamed from plugins/Dbx_mmap_SA/Import_SA/resource.h) | 0 | ||||
| -rw-r--r-- | plugins/Dbx_mmap_SA/Import_SA/src/version.h (renamed from plugins/Dbx_mmap_SA/Import_SA/version.h) | 0 | ||||
| -rw-r--r-- | plugins/Dbx_mmap_SA/Import_SA/src/wizard.cpp (renamed from plugins/Dbx_mmap_SA/Import_SA/wizard.cpp) | 0 | ||||
| -rw-r--r-- | plugins/Dbx_mmap_SA/db3x_mmap_sa_10.vcxproj | 50 | ||||
| -rw-r--r-- | plugins/Dbx_mmap_SA/db3x_mmap_sa_10.vcxproj.filters | 50 | ||||
| -rw-r--r-- | plugins/Dbx_mmap_SA/docs/dbx_mmap_sa-translation.txt (renamed from plugins/Dbx_mmap_SA/dbx_mmap_sa-translation.txt) | 0 | ||||
| -rw-r--r-- | plugins/Dbx_mmap_SA/icos/backup.ico | bin | 2550 -> 0 bytes | |||
| -rw-r--r-- | plugins/Dbx_mmap_SA/icos/restart.ico | bin | 2550 -> 0 bytes | |||
| -rw-r--r-- | plugins/Dbx_mmap_SA/res/db3x_mmap.rc (renamed from plugins/Dbx_mmap_SA/db3x_mmap.rc) | 8 | ||||
| -rw-r--r-- | plugins/Dbx_mmap_SA/res/logo.ico (renamed from plugins/Dbx_mmap_SA/icos/logo.ico) | bin | 8550 -> 8550 bytes | |||
| -rw-r--r-- | plugins/Dbx_mmap_SA/res/pass.ico (renamed from plugins/Dbx_mmap_SA/icos/pass.ico) | bin | 2550 -> 2550 bytes | |||
| -rw-r--r-- | plugins/Dbx_mmap_SA/res/version.rc (renamed from plugins/Dbx_mmap_SA/version.rc) | 2 | ||||
| -rw-r--r-- | plugins/Dbx_mmap_SA/src/commonheaders.h (renamed from plugins/Dbx_mmap_SA/commonheaders.h) | 4 | ||||
| -rw-r--r-- | plugins/Dbx_mmap_SA/src/dbintf_sa.cpp (renamed from plugins/Dbx_mmap_SA/dbintf_sa.cpp) | 0 | ||||
| -rw-r--r-- | plugins/Dbx_mmap_SA/src/dbintf_sa.h (renamed from plugins/Dbx_mmap_SA/dbintf_sa.h) | 2 | ||||
| -rw-r--r-- | plugins/Dbx_mmap_SA/src/dbpreset.cpp (renamed from plugins/Dbx_mmap_SA/dbpreset.cpp) | 0 | ||||
| -rw-r--r-- | plugins/Dbx_mmap_SA/src/dialogs.cpp (renamed from plugins/Dbx_mmap_SA/dialogs.cpp) | 0 | ||||
| -rw-r--r-- | plugins/Dbx_mmap_SA/src/init.cpp (renamed from plugins/Dbx_mmap_SA/init.cpp) | 0 | ||||
| -rw-r--r-- | plugins/Dbx_mmap_SA/src/options.h (renamed from plugins/Dbx_mmap_SA/options.h) | 0 | ||||
| -rw-r--r-- | plugins/Dbx_mmap_SA/src/resource.h (renamed from plugins/Dbx_mmap_SA/resource.h) | 0 | ||||
| -rw-r--r-- | plugins/Dbx_mmap_SA/src/security.cpp (renamed from plugins/Dbx_mmap_SA/security.cpp) | 0 | ||||
| -rw-r--r-- | plugins/Dbx_mmap_SA/src/version.h (renamed from plugins/Dbx_mmap_SA/version.h) | 0 |
70 files changed, 166 insertions, 244 deletions
diff --git a/plugins/Dbx_mmap_SA/Cryptors/RC4/rc4_10.vcxproj b/plugins/Dbx_mmap_SA/Cryptors/RC4/rc4_10.vcxproj index 1112e6790e..8860121739 100644 --- a/plugins/Dbx_mmap_SA/Cryptors/RC4/rc4_10.vcxproj +++ b/plugins/Dbx_mmap_SA/Cryptors/RC4/rc4_10.vcxproj @@ -72,7 +72,7 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<Optimization>Full</Optimization>
- <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;RC4_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<FunctionLevelLinking>true</FunctionLevelLinking>
<WarningLevel>Level3</WarningLevel>
<FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
@@ -90,7 +90,7 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
- <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;RC4_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
<WarningLevel>Level3</WarningLevel>
@@ -107,7 +107,7 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<Optimization>Full</Optimization>
- <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;RC4_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<FunctionLevelLinking>true</FunctionLevelLinking>
<WarningLevel>Level3</WarningLevel>
<FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
@@ -125,7 +125,7 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<Optimization>Disabled</Optimization>
- <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;RC4_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
<WarningLevel>Level3</WarningLevel>
@@ -139,7 +139,7 @@ </Link>
</ItemDefinitionGroup>
<ItemGroup>
- <ClCompile Include="cryptor.c" />
+ <ClCompile Include="src\cryptor.c" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
diff --git a/plugins/Dbx_mmap_SA/Cryptors/RC4/rc4_10.vcxproj.filters b/plugins/Dbx_mmap_SA/Cryptors/RC4/rc4_10.vcxproj.filters index 43730c5940..bf6bc68de3 100644 --- a/plugins/Dbx_mmap_SA/Cryptors/RC4/rc4_10.vcxproj.filters +++ b/plugins/Dbx_mmap_SA/Cryptors/RC4/rc4_10.vcxproj.filters @@ -5,17 +5,9 @@ <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
<Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
</Filter>
- <Filter Include="Header Files">
- <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
- <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
- </Filter>
- <Filter Include="Resource Files">
- <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
- <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
- </Filter>
</ItemGroup>
<ItemGroup>
- <ClCompile Include="cryptor.c">
+ <ClCompile Include="src\cryptor.c">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
diff --git a/plugins/Dbx_mmap_SA/Cryptors/RC4/cryptor.c b/plugins/Dbx_mmap_SA/Cryptors/RC4/src/cryptor.c index 1f5f61705f..1f5f61705f 100644 --- a/plugins/Dbx_mmap_SA/Cryptors/RC4/cryptor.c +++ b/plugins/Dbx_mmap_SA/Cryptors/RC4/src/cryptor.c diff --git a/plugins/Dbx_mmap_SA/Dbtool/dbtool_sa_10.vcxproj b/plugins/Dbx_mmap_SA/Dbtool/dbtool_sa_10.vcxproj index 0aa02d798d..7b734e1736 100644 --- a/plugins/Dbx_mmap_SA/Dbtool/dbtool_sa_10.vcxproj +++ b/plugins/Dbx_mmap_SA/Dbtool/dbtool_sa_10.vcxproj @@ -69,14 +69,13 @@ <ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\..\include;..\..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;DATABASE_INDEPENDANT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>dbtool.h</PrecompiledHeaderFile>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -99,13 +98,12 @@ <ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\..\include;..\..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_DEBUG;WIN64;_WINDOWS;DATABASE_INDEPENDANT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>dbtool.h</PrecompiledHeaderFile>
<WarningLevel>Level3</WarningLevel>
- <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -130,14 +128,13 @@ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
<AdditionalIncludeDirectories>..\..\..\include;..\..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;DATABASE_INDEPENDANT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<ExceptionHandling>false</ExceptionHandling>
<FunctionLevelLinking>true</FunctionLevelLinking>
<PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>dbtool.h</PrecompiledHeaderFile>
<WarningLevel>Level3</WarningLevel>
- <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<BufferSecurityCheck>false</BufferSecurityCheck>
<FloatingPointModel>Fast</FloatingPointModel>
</ClCompile>
@@ -166,14 +163,13 @@ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
<AdditionalIncludeDirectories>..\..\..\include;..\..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>NDEBUG;WIN64;_WINDOWS;DATABASE_INDEPENDANT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<ExceptionHandling>false</ExceptionHandling>
<FunctionLevelLinking>true</FunctionLevelLinking>
<PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>dbtool.h</PrecompiledHeaderFile>
<WarningLevel>Level3</WarningLevel>
- <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<BufferSecurityCheck>false</BufferSecurityCheck>
<FloatingPointModel>Fast</FloatingPointModel>
</ClCompile>
@@ -197,44 +193,38 @@ </PreBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>
- <ClCompile Include="disk.cpp" />
- <ClCompile Include="encryption.cpp" />
- <ClCompile Include="main.cpp">
+ <ClCompile Include="src\disk.cpp" />
+ <ClCompile Include="src\encryption.cpp" />
+ <ClCompile Include="src\main.cpp">
<PrecompiledHeader>Create</PrecompiledHeader>
</ClCompile>
- <ClCompile Include="utf.cpp" />
- <ClCompile Include="wizard.cpp" />
- <ClCompile Include="worker.cpp" />
- <ClCompile Include="aggressive.cpp" />
- <ClCompile Include="contactchain.cpp" />
- <ClCompile Include="eventchain.cpp" />
- <ClCompile Include="finaltasks.cpp" />
- <ClCompile Include="initialchecks.cpp" />
- <ClCompile Include="modulechain.cpp" />
- <ClCompile Include="settingschain.cpp" />
- <ClCompile Include="user.cpp" />
- <ClCompile Include="cleaning.cpp" />
- <ClCompile Include="fileaccess.cpp" />
- <ClCompile Include="finished.cpp" />
- <ClCompile Include="openerror.cpp" />
- <ClCompile Include="progress.cpp" />
- <ClCompile Include="selectdb.cpp" />
- <ClCompile Include="welcome.cpp" />
+ <ClCompile Include="src\utf.cpp" />
+ <ClCompile Include="src\wizard.cpp" />
+ <ClCompile Include="src\worker.cpp" />
+ <ClCompile Include="src\aggressive.cpp" />
+ <ClCompile Include="src\contactchain.cpp" />
+ <ClCompile Include="src\eventchain.cpp" />
+ <ClCompile Include="src\finaltasks.cpp" />
+ <ClCompile Include="src\initialchecks.cpp" />
+ <ClCompile Include="src\modulechain.cpp" />
+ <ClCompile Include="src\settingschain.cpp" />
+ <ClCompile Include="src\user.cpp" />
+ <ClCompile Include="src\cleaning.cpp" />
+ <ClCompile Include="src\fileaccess.cpp" />
+ <ClCompile Include="src\finished.cpp" />
+ <ClCompile Include="src\openerror.cpp" />
+ <ClCompile Include="src\progress.cpp" />
+ <ClCompile Include="src\selectdb.cpp" />
+ <ClCompile Include="src\welcome.cpp" />
</ItemGroup>
<ItemGroup>
- <ClInclude Include="database.h" />
- <ClInclude Include="dbtool.h" />
- <ClInclude Include="Version.h" />
+ <ClInclude Include="src\database.h" />
+ <ClInclude Include="src\dbtool.h" />
+ <ClInclude Include="src\Version.h" />
</ItemGroup>
<ItemGroup>
- <None Include="res\dbtool.ico" />
- <None Include="res\profileg.ico" />
- <None Include="res\profiler.ico" />
- <None Include="res\profiley.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/Dbx_mmap_SA/Dbtool/dbtool_sa_10.vcxproj.filters b/plugins/Dbx_mmap_SA/Dbtool/dbtool_sa_10.vcxproj.filters index 1c054474cd..d7c4efe5f7 100644 --- a/plugins/Dbx_mmap_SA/Dbtool/dbtool_sa_10.vcxproj.filters +++ b/plugins/Dbx_mmap_SA/Dbtool/dbtool_sa_10.vcxproj.filters @@ -21,100 +21,86 @@ </Filter>
</ItemGroup>
<ItemGroup>
- <ClCompile Include="disk.cpp">
+ <ClCompile Include="src\disk.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="main.cpp">
+ <ClCompile Include="src\main.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="wizard.cpp">
+ <ClCompile Include="src\wizard.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="worker.cpp">
+ <ClCompile Include="src\worker.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="aggressive.cpp">
+ <ClCompile Include="src\aggressive.cpp">
<Filter>Source Files\Workers</Filter>
</ClCompile>
- <ClCompile Include="contactchain.cpp">
+ <ClCompile Include="src\contactchain.cpp">
<Filter>Source Files\Workers</Filter>
</ClCompile>
- <ClCompile Include="eventchain.cpp">
+ <ClCompile Include="src\eventchain.cpp">
<Filter>Source Files\Workers</Filter>
</ClCompile>
- <ClCompile Include="finaltasks.cpp">
+ <ClCompile Include="src\finaltasks.cpp">
<Filter>Source Files\Workers</Filter>
</ClCompile>
- <ClCompile Include="initialchecks.cpp">
+ <ClCompile Include="src\initialchecks.cpp">
<Filter>Source Files\Workers</Filter>
</ClCompile>
- <ClCompile Include="modulechain.cpp">
+ <ClCompile Include="src\modulechain.cpp">
<Filter>Source Files\Workers</Filter>
</ClCompile>
- <ClCompile Include="settingschain.cpp">
+ <ClCompile Include="src\settingschain.cpp">
<Filter>Source Files\Workers</Filter>
</ClCompile>
- <ClCompile Include="user.cpp">
+ <ClCompile Include="src\user.cpp">
<Filter>Source Files\Workers</Filter>
</ClCompile>
- <ClCompile Include="cleaning.cpp">
+ <ClCompile Include="src\cleaning.cpp">
<Filter>Source Files\Wizard Pages</Filter>
</ClCompile>
- <ClCompile Include="fileaccess.cpp">
+ <ClCompile Include="src\fileaccess.cpp">
<Filter>Source Files\Wizard Pages</Filter>
</ClCompile>
- <ClCompile Include="finished.cpp">
+ <ClCompile Include="src\finished.cpp">
<Filter>Source Files\Wizard Pages</Filter>
</ClCompile>
- <ClCompile Include="openerror.cpp">
+ <ClCompile Include="src\openerror.cpp">
<Filter>Source Files\Wizard Pages</Filter>
</ClCompile>
- <ClCompile Include="progress.cpp">
+ <ClCompile Include="src\progress.cpp">
<Filter>Source Files\Wizard Pages</Filter>
</ClCompile>
- <ClCompile Include="selectdb.cpp">
+ <ClCompile Include="src\selectdb.cpp">
<Filter>Source Files\Wizard Pages</Filter>
</ClCompile>
- <ClCompile Include="welcome.cpp">
+ <ClCompile Include="src\welcome.cpp">
<Filter>Source Files\Wizard Pages</Filter>
</ClCompile>
- <ClCompile Include="utf.cpp">
+ <ClCompile Include="src\utf.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="encryption.cpp">
+ <ClCompile Include="src\encryption.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
- <ClInclude Include="database.h">
+ <ClInclude Include="src\database.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="dbtool.h">
+ <ClInclude Include="src\dbtool.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\dbtool.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\profileg.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\profiler.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\profiley.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/Dbx_mmap_SA/Dbtool/Version.rc b/plugins/Dbx_mmap_SA/Dbtool/res/Version.rc index b6ce62273e..f9dd44c219 100644 --- a/plugins/Dbx_mmap_SA/Dbtool/Version.rc +++ b/plugins/Dbx_mmap_SA/Dbtool/res/Version.rc @@ -5,7 +5,7 @@ #endif //APSTUDIO_INVOKED
#include "afxres.h"
-#include "version.h"
+#include "..\src\version.h"
#ifdef _WIN32
LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
diff --git a/plugins/Dbx_mmap_SA/Dbtool/dbtool.exe.manifest b/plugins/Dbx_mmap_SA/Dbtool/res/dbtool.exe.manifest index 1b6aab686b..1b6aab686b 100644 --- a/plugins/Dbx_mmap_SA/Dbtool/dbtool.exe.manifest +++ b/plugins/Dbx_mmap_SA/Dbtool/res/dbtool.exe.manifest diff --git a/plugins/Dbx_mmap_SA/Dbtool/resource.rc b/plugins/Dbx_mmap_SA/Dbtool/res/resource.rc index 7aa4cba249..25710d5ca8 100644 --- a/plugins/Dbx_mmap_SA/Dbtool/resource.rc +++ b/plugins/Dbx_mmap_SA/Dbtool/res/resource.rc @@ -1,6 +1,6 @@ // Microsoft Visual C++ generated resource script.
//
-#include "resource.h"
+#include "..\src\resource.h"
#define APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
@@ -26,7 +26,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL // Bitmap
//
-IDB_BITMAP1 BITMAP "res\\dbtool.bmp"
+IDB_BITMAP1 BITMAP "dbtool.bmp"
/////////////////////////////////////////////////////////////////////////////
//
@@ -320,7 +320,7 @@ END 1 TEXTINCLUDE
BEGIN
- "resource.h\0"
+ "..\\src\\resource.h\0"
END
2 TEXTINCLUDE
@@ -345,11 +345,11 @@ END // Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems.
-IDI_DBTOOL ICON "res\\dbtool.ico"
-IDI_PROFILEGREEN ICON "res\\profileg.ico"
-IDI_PROFILEYELLOW ICON "res\\profiley.ico"
-IDI_PROFILERED ICON "res\\profiler.ico"
-IDI_BAD ICON "res\\delete.ico"
+IDI_DBTOOL ICON "dbtool.ico"
+IDI_PROFILEGREEN ICON "profileg.ico"
+IDI_PROFILEYELLOW ICON "profiley.ico"
+IDI_PROFILERED ICON "profiler.ico"
+IDI_BAD ICON "delete.ico"
#endif // Neutral resources
/////////////////////////////////////////////////////////////////////////////
diff --git a/plugins/Dbx_mmap_SA/Dbtool/Version.h b/plugins/Dbx_mmap_SA/Dbtool/src/Version.h index 1ee2b8a4cf..1ee2b8a4cf 100644 --- a/plugins/Dbx_mmap_SA/Dbtool/Version.h +++ b/plugins/Dbx_mmap_SA/Dbtool/src/Version.h diff --git a/plugins/Dbx_mmap_SA/Dbtool/aggressive.cpp b/plugins/Dbx_mmap_SA/Dbtool/src/aggressive.cpp index 5ec62707f1..5ec62707f1 100644 --- a/plugins/Dbx_mmap_SA/Dbtool/aggressive.cpp +++ b/plugins/Dbx_mmap_SA/Dbtool/src/aggressive.cpp diff --git a/plugins/Dbx_mmap_SA/Dbtool/cleaning.cpp b/plugins/Dbx_mmap_SA/Dbtool/src/cleaning.cpp index a16a11e7ac..a16a11e7ac 100644 --- a/plugins/Dbx_mmap_SA/Dbtool/cleaning.cpp +++ b/plugins/Dbx_mmap_SA/Dbtool/src/cleaning.cpp diff --git a/plugins/Dbx_mmap_SA/Dbtool/contactchain.cpp b/plugins/Dbx_mmap_SA/Dbtool/src/contactchain.cpp index 0452f90d0d..0452f90d0d 100644 --- a/plugins/Dbx_mmap_SA/Dbtool/contactchain.cpp +++ b/plugins/Dbx_mmap_SA/Dbtool/src/contactchain.cpp diff --git a/plugins/Dbx_mmap_SA/Dbtool/database.h b/plugins/Dbx_mmap_SA/Dbtool/src/database.h index aa73d16362..aa73d16362 100644 --- a/plugins/Dbx_mmap_SA/Dbtool/database.h +++ b/plugins/Dbx_mmap_SA/Dbtool/src/database.h diff --git a/plugins/Dbx_mmap_SA/Dbtool/dbtool.h b/plugins/Dbx_mmap_SA/Dbtool/src/dbtool.h index dd6af38cd5..7f89ecd7aa 100644 --- a/plugins/Dbx_mmap_SA/Dbtool/dbtool.h +++ b/plugins/Dbx_mmap_SA/Dbtool/src/dbtool.h @@ -19,6 +19,8 @@ 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 _CRT_NON_CONFORMING_SWPRINTFS
#include <tchar.h>
diff --git a/plugins/Dbx_mmap_SA/Dbtool/disk.cpp b/plugins/Dbx_mmap_SA/Dbtool/src/disk.cpp index 1ac84a3dc6..1ac84a3dc6 100644 --- a/plugins/Dbx_mmap_SA/Dbtool/disk.cpp +++ b/plugins/Dbx_mmap_SA/Dbtool/src/disk.cpp diff --git a/plugins/Dbx_mmap_SA/Dbtool/encryption.cpp b/plugins/Dbx_mmap_SA/Dbtool/src/encryption.cpp index 1e7b264efa..1e7b264efa 100644 --- a/plugins/Dbx_mmap_SA/Dbtool/encryption.cpp +++ b/plugins/Dbx_mmap_SA/Dbtool/src/encryption.cpp diff --git a/plugins/Dbx_mmap_SA/Dbtool/eventchain.cpp b/plugins/Dbx_mmap_SA/Dbtool/src/eventchain.cpp index 3c9e37668a..3c9e37668a 100644 --- a/plugins/Dbx_mmap_SA/Dbtool/eventchain.cpp +++ b/plugins/Dbx_mmap_SA/Dbtool/src/eventchain.cpp diff --git a/plugins/Dbx_mmap_SA/Dbtool/fileaccess.cpp b/plugins/Dbx_mmap_SA/Dbtool/src/fileaccess.cpp index d904daf5b9..d904daf5b9 100644 --- a/plugins/Dbx_mmap_SA/Dbtool/fileaccess.cpp +++ b/plugins/Dbx_mmap_SA/Dbtool/src/fileaccess.cpp diff --git a/plugins/Dbx_mmap_SA/Dbtool/finaltasks.cpp b/plugins/Dbx_mmap_SA/Dbtool/src/finaltasks.cpp index 2ed8b7183d..2ed8b7183d 100644 --- a/plugins/Dbx_mmap_SA/Dbtool/finaltasks.cpp +++ b/plugins/Dbx_mmap_SA/Dbtool/src/finaltasks.cpp diff --git a/plugins/Dbx_mmap_SA/Dbtool/finished.cpp b/plugins/Dbx_mmap_SA/Dbtool/src/finished.cpp index 08d0f5c893..08d0f5c893 100644 --- a/plugins/Dbx_mmap_SA/Dbtool/finished.cpp +++ b/plugins/Dbx_mmap_SA/Dbtool/src/finished.cpp diff --git a/plugins/Dbx_mmap_SA/Dbtool/initialchecks.cpp b/plugins/Dbx_mmap_SA/Dbtool/src/initialchecks.cpp index 385d31cb92..385d31cb92 100644 --- a/plugins/Dbx_mmap_SA/Dbtool/initialchecks.cpp +++ b/plugins/Dbx_mmap_SA/Dbtool/src/initialchecks.cpp diff --git a/plugins/Dbx_mmap_SA/Dbtool/main.cpp b/plugins/Dbx_mmap_SA/Dbtool/src/main.cpp index d505751bd5..d505751bd5 100644 --- a/plugins/Dbx_mmap_SA/Dbtool/main.cpp +++ b/plugins/Dbx_mmap_SA/Dbtool/src/main.cpp diff --git a/plugins/Dbx_mmap_SA/Dbtool/modulechain.cpp b/plugins/Dbx_mmap_SA/Dbtool/src/modulechain.cpp index 2b91059176..2b91059176 100644 --- a/plugins/Dbx_mmap_SA/Dbtool/modulechain.cpp +++ b/plugins/Dbx_mmap_SA/Dbtool/src/modulechain.cpp diff --git a/plugins/Dbx_mmap_SA/Dbtool/openerror.cpp b/plugins/Dbx_mmap_SA/Dbtool/src/openerror.cpp index 1fa2964c20..1fa2964c20 100644 --- a/plugins/Dbx_mmap_SA/Dbtool/openerror.cpp +++ b/plugins/Dbx_mmap_SA/Dbtool/src/openerror.cpp diff --git a/plugins/Dbx_mmap_SA/Dbtool/progress.cpp b/plugins/Dbx_mmap_SA/Dbtool/src/progress.cpp index 5ddb8bd985..5ddb8bd985 100644 --- a/plugins/Dbx_mmap_SA/Dbtool/progress.cpp +++ b/plugins/Dbx_mmap_SA/Dbtool/src/progress.cpp diff --git a/plugins/Dbx_mmap_SA/Dbtool/resource.h b/plugins/Dbx_mmap_SA/Dbtool/src/resource.h index f92176c33f..f92176c33f 100644 --- a/plugins/Dbx_mmap_SA/Dbtool/resource.h +++ b/plugins/Dbx_mmap_SA/Dbtool/src/resource.h diff --git a/plugins/Dbx_mmap_SA/Dbtool/selectdb.cpp b/plugins/Dbx_mmap_SA/Dbtool/src/selectdb.cpp index 9db3517816..9db3517816 100644 --- a/plugins/Dbx_mmap_SA/Dbtool/selectdb.cpp +++ b/plugins/Dbx_mmap_SA/Dbtool/src/selectdb.cpp diff --git a/plugins/Dbx_mmap_SA/Dbtool/settingschain.cpp b/plugins/Dbx_mmap_SA/Dbtool/src/settingschain.cpp index a6e7ecab3b..a6e7ecab3b 100644 --- a/plugins/Dbx_mmap_SA/Dbtool/settingschain.cpp +++ b/plugins/Dbx_mmap_SA/Dbtool/src/settingschain.cpp diff --git a/plugins/Dbx_mmap_SA/Dbtool/user.cpp b/plugins/Dbx_mmap_SA/Dbtool/src/user.cpp index 9922f1630f..9922f1630f 100644 --- a/plugins/Dbx_mmap_SA/Dbtool/user.cpp +++ b/plugins/Dbx_mmap_SA/Dbtool/src/user.cpp diff --git a/plugins/Dbx_mmap_SA/Dbtool/utf.cpp b/plugins/Dbx_mmap_SA/Dbtool/src/utf.cpp index c56db053d8..c56db053d8 100644 --- a/plugins/Dbx_mmap_SA/Dbtool/utf.cpp +++ b/plugins/Dbx_mmap_SA/Dbtool/src/utf.cpp diff --git a/plugins/Dbx_mmap_SA/Dbtool/welcome.cpp b/plugins/Dbx_mmap_SA/Dbtool/src/welcome.cpp index 291281e70a..291281e70a 100644 --- a/plugins/Dbx_mmap_SA/Dbtool/welcome.cpp +++ b/plugins/Dbx_mmap_SA/Dbtool/src/welcome.cpp diff --git a/plugins/Dbx_mmap_SA/Dbtool/wizard.cpp b/plugins/Dbx_mmap_SA/Dbtool/src/wizard.cpp index 8f3a9d5ca8..8f3a9d5ca8 100644 --- a/plugins/Dbx_mmap_SA/Dbtool/wizard.cpp +++ b/plugins/Dbx_mmap_SA/Dbtool/src/wizard.cpp diff --git a/plugins/Dbx_mmap_SA/Dbtool/worker.cpp b/plugins/Dbx_mmap_SA/Dbtool/src/worker.cpp index dd73c83947..dd73c83947 100644 --- a/plugins/Dbx_mmap_SA/Dbtool/worker.cpp +++ b/plugins/Dbx_mmap_SA/Dbtool/src/worker.cpp diff --git a/plugins/Dbx_mmap_SA/Import_SA/import_sa_10.vcxproj b/plugins/Dbx_mmap_SA/Import_SA/import_sa_10.vcxproj index f2143c95e4..a7eec29388 100644 --- a/plugins/Dbx_mmap_SA/Import_SA/import_sa_10.vcxproj +++ b/plugins/Dbx_mmap_SA/Import_SA/import_sa_10.vcxproj @@ -73,7 +73,7 @@ <ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\..\include;..\..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;IMPORT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
@@ -81,7 +81,6 @@ <PrecompiledHeaderFile>import.h</PrecompiledHeaderFile>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -105,14 +104,13 @@ <ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\..\include;..\..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;IMPORT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
<PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>import.h</PrecompiledHeaderFile>
<WarningLevel>Level3</WarningLevel>
- <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -138,7 +136,7 @@ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
<AdditionalIncludeDirectories>..\..\..\include;..\..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;IMPORT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<BufferSecurityCheck>false</BufferSecurityCheck>
<FunctionLevelLinking>true</FunctionLevelLinking>
@@ -146,14 +144,12 @@ <PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>import.h</PrecompiledHeaderFile>
<WarningLevel>Level3</WarningLevel>
- <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>..\..\..\include;..\..\..\include\msapi</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
- <AdditionalOptions>/ALIGN:4096 /ignore:4108 %(AdditionalOptions)</AdditionalOptions>
<AdditionalDependencies>comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalManifestDependencies>type=%27Win32%27 name=%27Microsoft.Windows.Common-Controls%27 version=%276.0.0.0%27 processorArchitecture=%27X86%27 publicKeyToken=%276595b64144ccf1df%27 language=%27*%27;%(AdditionalManifestDependencies)</AdditionalManifestDependencies>
<GenerateDebugInformation>true</GenerateDebugInformation>
@@ -175,7 +171,7 @@ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
<AdditionalIncludeDirectories>..\..\..\include;..\..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;IMPORT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<BufferSecurityCheck>false</BufferSecurityCheck>
<FunctionLevelLinking>true</FunctionLevelLinking>
@@ -183,14 +179,12 @@ <PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>import.h</PrecompiledHeaderFile>
<WarningLevel>Level3</WarningLevel>
- <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>..\..\..\include;..\..\..\include\msapi</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
- <AdditionalOptions>/ALIGN:4096 /ignore:4108 %(AdditionalOptions)</AdditionalOptions>
<AdditionalDependencies>comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalManifestDependencies>type=%27Win32%27 name=%27Microsoft.Windows.Common-Controls%27 version=%276.0.0.0%27 processorArchitecture=%27*%27 publicKeyToken=%276595b64144ccf1df%27 language=%27*%27;%(AdditionalManifestDependencies)</AdditionalManifestDependencies>
<GenerateDebugInformation>true</GenerateDebugInformation>
@@ -207,35 +201,27 @@ </PreBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>
- <ClCompile Include="encryption.cpp" />
- <ClCompile Include="ICQserver.cpp" />
- <ClCompile Include="main.cpp">
+ <ClCompile Include="src\encryption.cpp" />
+ <ClCompile Include="src\ICQserver.cpp" />
+ <ClCompile Include="src\main.cpp">
<PrecompiledHeader>Create</PrecompiledHeader>
</ClCompile>
- <ClCompile Include="mirabilis.cpp" />
- <ClCompile Include="miranda.cpp" />
- <ClCompile Include="progress.cpp" />
- <ClCompile Include="wizard.cpp" />
+ <ClCompile Include="src\mirabilis.cpp" />
+ <ClCompile Include="src\miranda.cpp" />
+ <ClCompile Include="src\progress.cpp" />
+ <ClCompile Include="src\wizard.cpp" />
</ItemGroup>
<ItemGroup>
- <ClInclude Include="ICQserver.h" />
- <ClInclude Include="import.h" />
- <ClInclude Include="mirabilis.h" />
- <ClInclude Include="mirandadb0700.h" />
- <ClInclude Include="resource.h" />
- <ClInclude Include="version.h" />
+ <ClInclude Include="src\ICQserver.h" />
+ <ClInclude Include="src\import.h" />
+ <ClInclude Include="src\mirabilis.h" />
+ <ClInclude Include="src\mirandadb0700.h" />
+ <ClInclude Include="src\resource.h" />
+ <ClInclude Include="src\version.h" />
</ItemGroup>
<ItemGroup>
- <None Include="docs\import-ICQ_Db_Specs.txt" />
- <None Include="docs\import-license.txt" />
- <None Include="docs\import-readme.txt" />
- <None Include="docs\import-translation.txt" />
- <None Include="res\import.ico" />
- <None Include="res\pass.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/Dbx_mmap_SA/Import_SA/import_sa_10.vcxproj.filters b/plugins/Dbx_mmap_SA/Import_SA/import_sa_10.vcxproj.filters index f1fec2b705..f5f6f3b161 100644 --- a/plugins/Dbx_mmap_SA/Import_SA/import_sa_10.vcxproj.filters +++ b/plugins/Dbx_mmap_SA/Import_SA/import_sa_10.vcxproj.filters @@ -13,78 +13,55 @@ <UniqueIdentifier>{e10cb216-83c1-4eb2-95ec-09f1e42a2c96}</UniqueIdentifier>
<Extensions>ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>
</Filter>
- <Filter Include="Documentation">
- <UniqueIdentifier>{8ad8cb39-e207-46f6-8fbf-1f5871148568}</UniqueIdentifier>
- </Filter>
</ItemGroup>
<ItemGroup>
- <ClCompile Include="ICQserver.cpp">
+ <ClCompile Include="src\ICQserver.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="main.cpp">
+ <ClCompile Include="src\main.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="mirabilis.cpp">
+ <ClCompile Include="src\mirabilis.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="miranda.cpp">
+ <ClCompile Include="src\miranda.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="progress.cpp">
+ <ClCompile Include="src\progress.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="wizard.cpp">
+ <ClCompile Include="src\wizard.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="encryption.cpp">
+ <ClCompile Include="src\encryption.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
- <ClInclude Include="ICQserver.h">
+ <ClInclude Include="src\ICQserver.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="import.h">
+ <ClInclude Include="src\import.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="mirabilis.h">
+ <ClInclude Include="src\mirabilis.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="mirandadb0700.h">
+ <ClInclude Include="src\mirandadb0700.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="docs\import-ICQ_Db_Specs.txt">
- <Filter>Documentation</Filter>
- </None>
- <None Include="docs\import-license.txt">
- <Filter>Documentation</Filter>
- </None>
- <None Include="docs\import-readme.txt">
- <Filter>Documentation</Filter>
- </None>
- <None Include="docs\import-translation.txt">
- <Filter>Documentation</Filter>
- </None>
- <None Include="res\import.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\pass.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/Dbx_mmap_SA/Import_SA/Version.rc b/plugins/Dbx_mmap_SA/Import_SA/res/Version.rc index 9ef5fda998..a2005a9fdd 100644 --- a/plugins/Dbx_mmap_SA/Import_SA/Version.rc +++ b/plugins/Dbx_mmap_SA/Import_SA/res/Version.rc @@ -5,7 +5,7 @@ #endif //APSTUDIO_INVOKED
#include "afxres.h"
-#include "version.h"
+#include "..\src\version.h"
#ifdef _WIN32
LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
diff --git a/plugins/Dbx_mmap_SA/Import_SA/resource.rc b/plugins/Dbx_mmap_SA/Import_SA/res/resource.rc index c37ea1cccf..b5e7e066e7 100644 --- a/plugins/Dbx_mmap_SA/Import_SA/resource.rc +++ b/plugins/Dbx_mmap_SA/Import_SA/res/resource.rc @@ -1,6 +1,6 @@ // Microsoft Visual C++ generated resource script.
//
-#include "resource.h"
+#include "..\src\resource.h"
#define APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
@@ -26,8 +26,8 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT // Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems.
-IDI_IMPORT ICON "res/import.ico"
-IDI_PASS ICON "res/pass.ico"
+IDI_IMPORT ICON "import.ico"
+IDI_PASS ICON "pass.ico"
/////////////////////////////////////////////////////////////////////////////
//
@@ -183,7 +183,7 @@ END 1 TEXTINCLUDE
BEGIN
- "resource.h\0"
+ "..\\src\\resource.h\0"
END
2 TEXTINCLUDE
diff --git a/plugins/Dbx_mmap_SA/Import_SA/ICQserver.cpp b/plugins/Dbx_mmap_SA/Import_SA/src/ICQserver.cpp index 62666c7531..62666c7531 100644 --- a/plugins/Dbx_mmap_SA/Import_SA/ICQserver.cpp +++ b/plugins/Dbx_mmap_SA/Import_SA/src/ICQserver.cpp diff --git a/plugins/Dbx_mmap_SA/Import_SA/ICQserver.h b/plugins/Dbx_mmap_SA/Import_SA/src/ICQserver.h index 864890a978..864890a978 100644 --- a/plugins/Dbx_mmap_SA/Import_SA/ICQserver.h +++ b/plugins/Dbx_mmap_SA/Import_SA/src/ICQserver.h diff --git a/plugins/Dbx_mmap_SA/Import_SA/encryption.cpp b/plugins/Dbx_mmap_SA/Import_SA/src/encryption.cpp index ede73c006a..ede73c006a 100644 --- a/plugins/Dbx_mmap_SA/Import_SA/encryption.cpp +++ b/plugins/Dbx_mmap_SA/Import_SA/src/encryption.cpp diff --git a/plugins/Dbx_mmap_SA/Import_SA/import.h b/plugins/Dbx_mmap_SA/Import_SA/src/import.h index 1c50146a15..0bba4a0d91 100644 --- a/plugins/Dbx_mmap_SA/Import_SA/import.h +++ b/plugins/Dbx_mmap_SA/Import_SA/src/import.h @@ -23,6 +23,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. //#define _LOGGING 1
+#define _CRT_SECURE_NO_WARNINGS
+#define _CRT_NONSTDC_NO_DEPRECATE
+
#define MIRANDA_VER 0x0A00
#define WINVER 0x0501
diff --git a/plugins/Dbx_mmap_SA/Import_SA/main.cpp b/plugins/Dbx_mmap_SA/Import_SA/src/main.cpp index d464f8bb55..d464f8bb55 100644 --- a/plugins/Dbx_mmap_SA/Import_SA/main.cpp +++ b/plugins/Dbx_mmap_SA/Import_SA/src/main.cpp diff --git a/plugins/Dbx_mmap_SA/Import_SA/mirabilis.cpp b/plugins/Dbx_mmap_SA/Import_SA/src/mirabilis.cpp index 15b58f4e0a..15b58f4e0a 100644 --- a/plugins/Dbx_mmap_SA/Import_SA/mirabilis.cpp +++ b/plugins/Dbx_mmap_SA/Import_SA/src/mirabilis.cpp diff --git a/plugins/Dbx_mmap_SA/Import_SA/mirabilis.h b/plugins/Dbx_mmap_SA/Import_SA/src/mirabilis.h index 47f10141e1..47f10141e1 100644 --- a/plugins/Dbx_mmap_SA/Import_SA/mirabilis.h +++ b/plugins/Dbx_mmap_SA/Import_SA/src/mirabilis.h diff --git a/plugins/Dbx_mmap_SA/Import_SA/miranda.cpp b/plugins/Dbx_mmap_SA/Import_SA/src/miranda.cpp index 8b6a9496f4..8b6a9496f4 100644 --- a/plugins/Dbx_mmap_SA/Import_SA/miranda.cpp +++ b/plugins/Dbx_mmap_SA/Import_SA/src/miranda.cpp diff --git a/plugins/Dbx_mmap_SA/Import_SA/mirandadb0700.h b/plugins/Dbx_mmap_SA/Import_SA/src/mirandadb0700.h index 07216ddbcf..07216ddbcf 100644 --- a/plugins/Dbx_mmap_SA/Import_SA/mirandadb0700.h +++ b/plugins/Dbx_mmap_SA/Import_SA/src/mirandadb0700.h diff --git a/plugins/Dbx_mmap_SA/Import_SA/mirandahistory.cpp b/plugins/Dbx_mmap_SA/Import_SA/src/mirandahistory.cpp index ba7a923df7..ba7a923df7 100644 --- a/plugins/Dbx_mmap_SA/Import_SA/mirandahistory.cpp +++ b/plugins/Dbx_mmap_SA/Import_SA/src/mirandahistory.cpp diff --git a/plugins/Dbx_mmap_SA/Import_SA/progress.cpp b/plugins/Dbx_mmap_SA/Import_SA/src/progress.cpp index f3f4e9f08a..f3f4e9f08a 100644 --- a/plugins/Dbx_mmap_SA/Import_SA/progress.cpp +++ b/plugins/Dbx_mmap_SA/Import_SA/src/progress.cpp diff --git a/plugins/Dbx_mmap_SA/Import_SA/resource.h b/plugins/Dbx_mmap_SA/Import_SA/src/resource.h index 915ee8097b..915ee8097b 100644 --- a/plugins/Dbx_mmap_SA/Import_SA/resource.h +++ b/plugins/Dbx_mmap_SA/Import_SA/src/resource.h diff --git a/plugins/Dbx_mmap_SA/Import_SA/version.h b/plugins/Dbx_mmap_SA/Import_SA/src/version.h index 8c2338d9f4..8c2338d9f4 100644 --- a/plugins/Dbx_mmap_SA/Import_SA/version.h +++ b/plugins/Dbx_mmap_SA/Import_SA/src/version.h diff --git a/plugins/Dbx_mmap_SA/Import_SA/wizard.cpp b/plugins/Dbx_mmap_SA/Import_SA/src/wizard.cpp index 0584cba073..0584cba073 100644 --- a/plugins/Dbx_mmap_SA/Import_SA/wizard.cpp +++ b/plugins/Dbx_mmap_SA/Import_SA/src/wizard.cpp diff --git a/plugins/Dbx_mmap_SA/db3x_mmap_sa_10.vcxproj b/plugins/Dbx_mmap_SA/db3x_mmap_sa_10.vcxproj index 725dd669e7..096c15d901 100644 --- a/plugins/Dbx_mmap_SA/db3x_mmap_sa_10.vcxproj +++ b/plugins/Dbx_mmap_SA/db3x_mmap_sa_10.vcxproj @@ -81,7 +81,6 @@ <PrecompiledHeaderFile>commonheaders.h</PrecompiledHeaderFile>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<StringPooling>false</StringPooling>
</ClCompile>
<ResourceCompile>
@@ -109,7 +108,6 @@ <PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>commonheaders.h</PrecompiledHeaderFile>
<WarningLevel>Level3</WarningLevel>
- <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<StringPooling>false</StringPooling>
</ClCompile>
<ResourceCompile>
@@ -139,7 +137,6 @@ <PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>commonheaders.h</PrecompiledHeaderFile>
<WarningLevel>Level3</WarningLevel>
- <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -170,7 +167,6 @@ <PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>commonheaders.h</PrecompiledHeaderFile>
<WarningLevel>Level3</WarningLevel>
- <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -189,37 +185,33 @@ </Link>
</ItemDefinitionGroup>
<ItemGroup>
- <ClCompile Include="..\Db3x_mmap\database.cpp" />
- <ClCompile Include="..\Db3x_mmap\dbcache.cpp" />
- <ClCompile Include="..\Db3x_mmap\dbcontacts.cpp" />
- <ClCompile Include="..\Db3x_mmap\dbevents.cpp" />
- <ClCompile Include="..\Db3x_mmap\dbheaders.cpp" />
- <ClCompile Include="..\Db3x_mmap\dbintf.cpp" />
- <ClCompile Include="..\Db3x_mmap\dbmodulechain.cpp" />
- <ClCompile Include="..\Db3x_mmap\dbsettings.cpp" />
- <ClCompile Include="dbintf_sa.cpp" />
- <ClCompile Include="dbpreset.cpp" />
- <ClCompile Include="dialogs.cpp" />
- <ClCompile Include="init.cpp">
+ <ClCompile Include="..\Db3x_mmap\src\database.cpp" />
+ <ClCompile Include="..\Db3x_mmap\src\dbcache.cpp" />
+ <ClCompile Include="..\Db3x_mmap\src\dbcontacts.cpp" />
+ <ClCompile Include="..\Db3x_mmap\src\dbevents.cpp" />
+ <ClCompile Include="..\Db3x_mmap\src\dbheaders.cpp" />
+ <ClCompile Include="..\Db3x_mmap\src\dbintf.cpp" />
+ <ClCompile Include="..\Db3x_mmap\src\dbmodulechain.cpp" />
+ <ClCompile Include="..\Db3x_mmap\src\dbsettings.cpp" />
+ <ClCompile Include="src\dbintf_sa.cpp" />
+ <ClCompile Include="src\dbpreset.cpp" />
+ <ClCompile Include="src\dialogs.cpp" />
+ <ClCompile Include="src\init.cpp">
<PrecompiledHeader>Create</PrecompiledHeader>
</ClCompile>
- <ClCompile Include="security.cpp" />
+ <ClCompile Include="src\security.cpp" />
</ItemGroup>
<ItemGroup>
- <ClInclude Include="..\Db3x_mmap\dbintf.h" />
- <ClInclude Include="commonheaders.h" />
- <ClInclude Include="dbintf_sa.h" />
- <ClInclude Include="options.h" />
- <ClInclude Include="resource.h" />
- <ClInclude Include="version.h" />
+ <ClInclude Include="..\Db3x_mmap\src\dbintf.h" />
+ <ClInclude Include="src\commonheaders.h" />
+ <ClInclude Include="src\dbintf_sa.h" />
+ <ClInclude Include="src\options.h" />
+ <ClInclude Include="src\resource.h" />
+ <ClInclude Include="src\version.h" />
</ItemGroup>
<ItemGroup>
- <ResourceCompile Include="db3x_mmap.rc" />
- <ResourceCompile Include="version.rc" />
- </ItemGroup>
- <ItemGroup>
- <None Include="icos\logo.ico" />
- <None Include="icos\pass.ico" />
+ <ResourceCompile Include="res\db3x_mmap.rc" />
+ <ResourceCompile Include="res\version.rc" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
diff --git a/plugins/Dbx_mmap_SA/db3x_mmap_sa_10.vcxproj.filters b/plugins/Dbx_mmap_SA/db3x_mmap_sa_10.vcxproj.filters index 84aae9636b..f7ebe6ae7e 100644 --- a/plugins/Dbx_mmap_SA/db3x_mmap_sa_10.vcxproj.filters +++ b/plugins/Dbx_mmap_SA/db3x_mmap_sa_10.vcxproj.filters @@ -18,80 +18,72 @@ </Filter>
</ItemGroup>
<ItemGroup>
- <ClCompile Include="dbpreset.cpp">
+ <ClCompile Include="src\dbpreset.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="dialogs.cpp">
+ <ClCompile Include="src\dialogs.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="init.cpp">
+ <ClCompile Include="src\init.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="security.cpp">
+ <ClCompile Include="src\security.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\Db3x_mmap\dbmodulechain.cpp">
+ <ClCompile Include="..\Db3x_mmap\src\dbmodulechain.cpp">
<Filter>Mmap files</Filter>
</ClCompile>
- <ClCompile Include="..\Db3x_mmap\dbcache.cpp">
+ <ClCompile Include="..\Db3x_mmap\src\dbcache.cpp">
<Filter>Mmap files</Filter>
</ClCompile>
- <ClCompile Include="..\Db3x_mmap\dbcontacts.cpp">
+ <ClCompile Include="..\Db3x_mmap\src\dbcontacts.cpp">
<Filter>Mmap files</Filter>
</ClCompile>
- <ClCompile Include="..\Db3x_mmap\database.cpp">
+ <ClCompile Include="..\Db3x_mmap\src\database.cpp">
<Filter>Mmap files</Filter>
</ClCompile>
- <ClCompile Include="..\Db3x_mmap\dbintf.cpp">
+ <ClCompile Include="..\Db3x_mmap\src\dbintf.cpp">
<Filter>Mmap files</Filter>
</ClCompile>
- <ClCompile Include="dbintf_sa.cpp">
+ <ClCompile Include="src\dbintf_sa.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\Db3x_mmap\dbheaders.cpp">
+ <ClCompile Include="..\Db3x_mmap\src\dbheaders.cpp">
<Filter>Mmap files</Filter>
</ClCompile>
- <ClCompile Include="..\Db3x_mmap\dbsettings.cpp">
+ <ClCompile Include="..\Db3x_mmap\src\dbsettings.cpp">
<Filter>Mmap files</Filter>
</ClCompile>
- <ClCompile Include="..\Db3x_mmap\dbevents.cpp">
+ <ClCompile Include="..\Db3x_mmap\src\dbevents.cpp">
<Filter>Mmap files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
- <ClInclude Include="commonheaders.h">
+ <ClInclude Include="src\commonheaders.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="options.h">
+ <ClInclude Include="src\options.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>
- <ClInclude Include="dbintf_sa.h">
+ <ClInclude Include="src\dbintf_sa.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="..\Db3x_mmap\dbintf.h">
+ <ClInclude Include="..\Db3x_mmap\src\dbintf.h">
<Filter>Mmap files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
- <ResourceCompile Include="db3x_mmap.rc">
+ <ResourceCompile Include="res\db3x_mmap.rc">
<Filter>Resource Files</Filter>
</ResourceCompile>
- <ResourceCompile Include="version.rc">
+ <ResourceCompile Include="res\version.rc">
<Filter>Resource Files</Filter>
</ResourceCompile>
</ItemGroup>
- <ItemGroup>
- <None Include="icos\logo.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="icos\pass.ico">
- <Filter>Resource Files</Filter>
- </None>
- </ItemGroup>
</Project>
\ No newline at end of file diff --git a/plugins/Dbx_mmap_SA/dbx_mmap_sa-translation.txt b/plugins/Dbx_mmap_SA/docs/dbx_mmap_sa-translation.txt index a89cd1b8ea..a89cd1b8ea 100644 --- a/plugins/Dbx_mmap_SA/dbx_mmap_sa-translation.txt +++ b/plugins/Dbx_mmap_SA/docs/dbx_mmap_sa-translation.txt diff --git a/plugins/Dbx_mmap_SA/icos/backup.ico b/plugins/Dbx_mmap_SA/icos/backup.ico Binary files differdeleted file mode 100644 index 2bd78218d8..0000000000 --- a/plugins/Dbx_mmap_SA/icos/backup.ico +++ /dev/null diff --git a/plugins/Dbx_mmap_SA/icos/restart.ico b/plugins/Dbx_mmap_SA/icos/restart.ico Binary files differdeleted file mode 100644 index 70335391a0..0000000000 --- a/plugins/Dbx_mmap_SA/icos/restart.ico +++ /dev/null diff --git a/plugins/Dbx_mmap_SA/db3x_mmap.rc b/plugins/Dbx_mmap_SA/res/db3x_mmap.rc index 60d38275d8..0323c374c9 100644 --- a/plugins/Dbx_mmap_SA/db3x_mmap.rc +++ b/plugins/Dbx_mmap_SA/res/db3x_mmap.rc @@ -1,6 +1,6 @@ // Microsoft Visual C++ generated resource script.
//
-#include "resource.h"
+#include "..\src\resource.h"
#define APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
@@ -95,8 +95,8 @@ END // Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems.
-IDI_ICON2 ICON "icos\\logo.ico"
-IDI_ICON3 ICON "icos\\pass.ico"
+IDI_ICON2 ICON "logo.ico"
+IDI_ICON3 ICON "pass.ico"
#endif // Русский (Россия) resources
/////////////////////////////////////////////////////////////////////////////
@@ -242,7 +242,7 @@ END 1 TEXTINCLUDE
BEGIN
- "resource.h\0"
+ "..\\src\\resource.h\0"
END
2 TEXTINCLUDE
diff --git a/plugins/Dbx_mmap_SA/icos/logo.ico b/plugins/Dbx_mmap_SA/res/logo.ico Binary files differindex 908883520a..908883520a 100644 --- a/plugins/Dbx_mmap_SA/icos/logo.ico +++ b/plugins/Dbx_mmap_SA/res/logo.ico diff --git a/plugins/Dbx_mmap_SA/icos/pass.ico b/plugins/Dbx_mmap_SA/res/pass.ico Binary files differindex d3075f98cf..d3075f98cf 100644 --- a/plugins/Dbx_mmap_SA/icos/pass.ico +++ b/plugins/Dbx_mmap_SA/res/pass.ico diff --git a/plugins/Dbx_mmap_SA/version.rc b/plugins/Dbx_mmap_SA/res/version.rc index d2567f55ae..a7dc60bbf0 100644 --- a/plugins/Dbx_mmap_SA/version.rc +++ b/plugins/Dbx_mmap_SA/res/version.rc @@ -3,7 +3,7 @@ #endif //APSTUDIO_INVOKED
#include <windows.h>
-#include "version.h"
+#include "..\src\version.h"
/////////////////////////////////////////////////////////////////////////////
//
diff --git a/plugins/Dbx_mmap_SA/commonheaders.h b/plugins/Dbx_mmap_SA/src/commonheaders.h index a098644dad..27c7036adf 100644 --- a/plugins/Dbx_mmap_SA/commonheaders.h +++ b/plugins/Dbx_mmap_SA/src/commonheaders.h @@ -21,6 +21,8 @@ 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 MIRANDA_VER 0x0A00
#define _WIN32_WINNT 0x0501
@@ -58,7 +60,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. //own headers
#include "dbintf_sa.h"
-#include "..\Db3x_mmap\database.h"
+#include "..\Db3x_mmap\src\database.h"
#include "resource.h"
#include "version.h"
diff --git a/plugins/Dbx_mmap_SA/dbintf_sa.cpp b/plugins/Dbx_mmap_SA/src/dbintf_sa.cpp index b85b3481cb..b85b3481cb 100644 --- a/plugins/Dbx_mmap_SA/dbintf_sa.cpp +++ b/plugins/Dbx_mmap_SA/src/dbintf_sa.cpp diff --git a/plugins/Dbx_mmap_SA/dbintf_sa.h b/plugins/Dbx_mmap_SA/src/dbintf_sa.h index 265d2a32e0..8c6c9c04dc 100644 --- a/plugins/Dbx_mmap_SA/dbintf_sa.h +++ b/plugins/Dbx_mmap_SA/src/dbintf_sa.h @@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include <m_db_int.h>
-#include "..\Db3x_mmap\dbintf.h"
+#include "..\Db3x_mmap\src\dbintf.h"
struct CDdxMmapSA : public CDdxMmap
{
diff --git a/plugins/Dbx_mmap_SA/dbpreset.cpp b/plugins/Dbx_mmap_SA/src/dbpreset.cpp index 564bbf3c40..564bbf3c40 100644 --- a/plugins/Dbx_mmap_SA/dbpreset.cpp +++ b/plugins/Dbx_mmap_SA/src/dbpreset.cpp diff --git a/plugins/Dbx_mmap_SA/dialogs.cpp b/plugins/Dbx_mmap_SA/src/dialogs.cpp index 8445b69ef7..8445b69ef7 100644 --- a/plugins/Dbx_mmap_SA/dialogs.cpp +++ b/plugins/Dbx_mmap_SA/src/dialogs.cpp diff --git a/plugins/Dbx_mmap_SA/init.cpp b/plugins/Dbx_mmap_SA/src/init.cpp index 2566e14471..2566e14471 100644 --- a/plugins/Dbx_mmap_SA/init.cpp +++ b/plugins/Dbx_mmap_SA/src/init.cpp diff --git a/plugins/Dbx_mmap_SA/options.h b/plugins/Dbx_mmap_SA/src/options.h index efabf3eba5..efabf3eba5 100644 --- a/plugins/Dbx_mmap_SA/options.h +++ b/plugins/Dbx_mmap_SA/src/options.h diff --git a/plugins/Dbx_mmap_SA/resource.h b/plugins/Dbx_mmap_SA/src/resource.h index 7b13f6957d..7b13f6957d 100644 --- a/plugins/Dbx_mmap_SA/resource.h +++ b/plugins/Dbx_mmap_SA/src/resource.h diff --git a/plugins/Dbx_mmap_SA/security.cpp b/plugins/Dbx_mmap_SA/src/security.cpp index 4ecf5f745b..4ecf5f745b 100644 --- a/plugins/Dbx_mmap_SA/security.cpp +++ b/plugins/Dbx_mmap_SA/src/security.cpp diff --git a/plugins/Dbx_mmap_SA/version.h b/plugins/Dbx_mmap_SA/src/version.h index 57928c3905..57928c3905 100644 --- a/plugins/Dbx_mmap_SA/version.h +++ b/plugins/Dbx_mmap_SA/src/version.h |