[M-git] Mahogany sources repository. branch master updated. v0.67-702-g05975b8
"Vadim Zeitlin" <[email protected]> Tue, 16 Dec 2014 22:57:23 +0000
| Newsgroups | gmane.mail.mahogany.cvs |
|---|---|
| Message-ID | <[email protected]> |
--===============7273130880847569008==
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Mahogany sources repository.".
The branch, master has been updated
via 05975b8d259c391a9939cb00f273aad3a60b3db0 (commit)
via 55f9fc8cfabe889b0ec6c7bbe1348641b1c73b0e (commit)
via e488d9687055fe6e6ee80bff25e16639ff4281d2 (commit)
via cef3b1cd806322a38db3e52fe0951e654f6d3b48 (commit)
from ffd9095e11393b5bc0c5ff66aab238f372dd1e2c (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 05975b8d259c391a9939cb00f273aad3a60b3db0
Author: Vadim Zeitlin <[email protected]>
Date: Tue Dec 16 23:52:53 2014 +0100
Change default disposition to "attachment" for the text parts.
This is more useful by default.
diff --git a/src/gui/wxComposeView.cpp b/src/gui/wxComposeView.cpp
index a81972a..1cfc643 100644
--- a/src/gui/wxComposeView.cpp
+++ b/src/gui/wxComposeView.cpp
@@ -4220,11 +4220,16 @@ wxComposeView::InsertFile(const wxChar *fileName, const wxChar *mimetype)
mc->SetFile(props.filename);
mc->SetName(props.name);
- // by default propose to send the images and text parts inline but all the
- // rest as attachment
- props.disposition = MimeType(strMimeType).ShouldShowInline()
- ? AttachmentProperties::Disposition_Inline
- : AttachmentProperties::Disposition_Attachment;
+ // we use almost, but not quite, the same logic here as for viewing MIME
+ // contents: the exception is that while "text" parts are normally shown
+ // inline, we attach them as attachments by default because typically this
+ // is the user intention, otherwise the text would have just been pasted
+ // inline directly
+ const MimeType attachmentMimeType(strMimeType);
+ props.disposition =
+ attachmentMimeType.ShouldShowInline() && !attachmentMimeType.IsText()
+ ? AttachmentProperties::Disposition_Inline
+ : AttachmentProperties::Disposition_Attachment;
mc->SetDisposition(props.GetDisposition());
// show the attachment properties dialog automatically?
commit 55f9fc8cfabe889b0ec6c7bbe1348641b1c73b0e
Author: Vadim Zeitlin <[email protected]>
Date: Wed Sep 10 03:15:18 2014 +0200
Update MSVS solution file to MSVS 2013 version.
No real changes, the solution and projects are compatible with 2012.
diff --git a/M.sln b/M.sln
index 6fdd523..a63e5da 100644
--- a/M.sln
+++ b/M.sln
@@ -1,5 +1,5 @@
Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2012
+# Visual Studio 2013
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "M", "M.vcxproj", "{1515C8EB-5C72-43DF-9D3A-0703F155F268}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "imap", "lib\imap\imap.vcxproj", "{457CFEC8-5C3F-4C7E-98A6-B65E1DE22682}"
commit e488d9687055fe6e6ee80bff25e16639ff4281d2
Author: Vadim Zeitlin <[email protected]>
Date: Mon May 5 17:31:05 2014 +0200
Change build directories in MSVS projects.
Create everything under $(Platform)\$(Configuration) to make it easier to
delete all build files and also to ensure that versit.dll ends up near M.exe
to allow running it without explicitly copying it anywhere.
diff --git a/.gitignore b/.gitignore
index 3283c64..cbb5076 100755
--- a/.gitignore
+++ b/.gitignore
@@ -1,18 +1,8 @@
aclocal.m4
-debug/
include/MInterface.cpp
include/MInterface.h
include/config.h
-lib/compface/Debug/
-lib/compface/Release/
-lib/compface/x64/
-lib/dspam/debug/
-lib/dspam/release/
-lib/dspam/x64/
lib/dspam/src/auto-config.h
-lib/imap/debug/
-lib/imap/release/
-lib/imap/x64/
lib/imap/src/osdep/nt/ip_nt.c
lib/imap/src/osdep/nt/osdep.h
release/
@@ -24,9 +14,7 @@ src/Python/MimePart_swig.cpp
src/Python/MimeType_swig.cpp
src/Python/SendMessage_swig.cpp
src/Python/swiglib_swig.cpp
-src/wx/vcard/Debug/
-src/wx/vcard/Release/
-src/wx/vcard/x64/
src/wx/vcard/vcc.c
tags
+Win32/
x64/
diff --git a/M.vcxproj b/M.vcxproj
index fa1e91c..fed4624 100644
--- a/M.vcxproj
+++ b/M.vcxproj
@@ -110,27 +110,27 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">release\</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release DLL|Win32'">release\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">release\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release DLL|Win32'">release\</IntDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\$(Platform)\$(Configuration)\output\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release DLL|Win32'">$(Platform)\$(Configuration)\output</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release DLL|Win32'">$(Platform)\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release DLL|Win32'">false</LinkIncremental>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release DLL|x64'">$(Platform)\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\$(Platform)\$(Configuration)\output\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release DLL|x64'">$(Platform)\$(Configuration)\output</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release DLL|x64'">$(Platform)\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release DLL|x64'">false</LinkIncremental>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">debug\</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug DLL|Win32'">debug\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">debug\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug DLL|Win32'">debug\</IntDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\$(Platform)\$(Configuration)\output\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug DLL|Win32'">$(Platform)\$(Configuration)\output</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug DLL|Win32'">$(Platform)\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug DLL|Win32'">true</LinkIncremental>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug DLL|x64'">$(Platform)\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\$(Platform)\$(Configuration)\output\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug DLL|x64'">$(Platform)\$(Configuration)\output</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug DLL|x64'">$(Platform)\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug DLL|x64'">true</LinkIncremental>
@@ -155,11 +155,10 @@
<AdditionalIncludeDirectories>include;$(wxwin)/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
- <AdditionalDependencies>lib/imap/$(IntDir)imap.lib;lib/compface/$(IntDir)compface.lib;lib/dspam/$(IntDir)dspam.lib;src\wx\vcard\$(IntDir)versit.lib;winmm.lib;comctl32.lib;rpcrt4.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>imap.lib;compface.lib;dspam.lib;versit.lib;winmm.lib;comctl32.lib;rpcrt4.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<ShowProgress>NotSet</ShowProgress>
<OutputFile>$(OutDir)M.exe</OutputFile>
- <AdditionalLibraryDirectories>$(wxwin)\lib\vc120_lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
+ <AdditionalLibraryDirectories>$(OutDir);$(wxwin)\lib\vc120_lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<GenerateMapFile>true</GenerateMapFile>
<SubSystem>Windows</SubSystem>
@@ -189,11 +188,10 @@
<AdditionalIncludeDirectories>include;$(wxwin)/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
- <AdditionalDependencies>lib/imap/$(IntDir)imap.lib;lib/compface/$(IntDir)compface.lib;lib/dspam/$(IntDir)dspam.lib;src\wx\vcard\$(IntDir)versit.lib;winmm.lib;comctl32.lib;rpcrt4.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>imap.lib;compface.lib;dspam.lib;versit.lib;winmm.lib;comctl32.lib;rpcrt4.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<ShowProgress>NotSet</ShowProgress>
<OutputFile>$(OutDir)M.exe</OutputFile>
- <AdditionalLibraryDirectories>$(wxwin)\lib\vc120_dll;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
+ <AdditionalLibraryDirectories>$(OutDir);$(wxwin)\lib\vc120_dll;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<GenerateMapFile>true</GenerateMapFile>
<SubSystem>Windows</SubSystem>
@@ -225,11 +223,10 @@
<AdditionalIncludeDirectories>include;$(wxwin)/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
- <AdditionalDependencies>lib/imap/$(IntDir)imap.lib;lib/compface/$(IntDir)compface.lib;lib/dspam/$(IntDir)dspam.lib;src\wx\vcard\$(IntDir)versit.lib;winmm.lib;comctl32.lib;rpcrt4.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>imap.lib;compface.lib;dspam.lib;versit.lib;winmm.lib;comctl32.lib;rpcrt4.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<ShowProgress>NotSet</ShowProgress>
<OutputFile>$(OutDir)M.exe</OutputFile>
- <AdditionalLibraryDirectories>$(wxwin)\lib\vc_amd64_lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
+ <AdditionalLibraryDirectories>$(OutDir);$(wxwin)\lib\vc_amd64_lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<GenerateMapFile>true</GenerateMapFile>
<SubSystem>Windows</SubSystem>
@@ -260,11 +257,10 @@
<AdditionalIncludeDirectories>include;$(wxwin)/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
- <AdditionalDependencies>lib/imap/$(IntDir)imap.lib;lib/compface/$(IntDir)compface.lib;lib/dspam/$(IntDir)dspam.lib;src\wx\vcard\$(IntDir)versit.lib;winmm.lib;comctl32.lib;rpcrt4.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>imap.lib;compface.lib;dspam.lib;versit.lib;winmm.lib;comctl32.lib;rpcrt4.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<ShowProgress>NotSet</ShowProgress>
<OutputFile>$(OutDir)M.exe</OutputFile>
- <AdditionalLibraryDirectories>$(wxwin)\lib\vc_amd64_lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
+ <AdditionalLibraryDirectories>$(OutDir);$(wxwin)\lib\vc_amd64_lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<GenerateMapFile>true</GenerateMapFile>
<SubSystem>Windows</SubSystem>
@@ -296,10 +292,9 @@
<AdditionalIncludeDirectories>include;$(wxwin)/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
- <AdditionalDependencies>lib/imap/$(IntDir)imap.lib;lib/compface/$(IntDir)compface.lib;lib/dspam/$(IntDir)dspam.lib;src\wx\vcard\$(IntDir)versit.lib;winmm.lib;comctl32.lib;rpcrt4.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>imap.lib;compface.lib;dspam.lib;versit.lib;winmm.lib;comctl32.lib;rpcrt4.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)M.exe</OutputFile>
- <AdditionalLibraryDirectories>$(wxwin)\lib\vc120_lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
+ <AdditionalLibraryDirectories>$(OutDir);$(wxwin)\lib\vc120_lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<StackReserveSize>10000000</StackReserveSize>
@@ -329,10 +324,9 @@
<AdditionalIncludeDirectories>include;$(wxwin)/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
- <AdditionalDependencies>lib/imap/$(IntDir)imap.lib;lib/compface/$(IntDir)compface.lib;lib/dspam/$(IntDir)dspam.lib;src\wx\vcard\$(IntDir)versit.lib;winmm.lib;comctl32.lib;rpcrt4.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>imap.lib;compface.lib;dspam.lib;versit.lib;winmm.lib;comctl32.lib;rpcrt4.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)M.exe</OutputFile>
- <AdditionalLibraryDirectories>$(wxwin)\lib\vc120_dll;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
+ <AdditionalLibraryDirectories>$(OutDir);$(wxwin)\lib\vc120_dll;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<StackReserveSize>10000000</StackReserveSize>
@@ -364,10 +358,9 @@
<AdditionalIncludeDirectories>include;$(wxwin)/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
- <AdditionalDependencies>lib/imap/$(IntDir)imap.lib;lib/compface/$(IntDir)compface.lib;lib/dspam/$(IntDir)dspam.lib;src\wx\vcard\$(IntDir)versit.lib;winmm.lib;comctl32.lib;rpcrt4.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>imap.lib;compface.lib;dspam.lib;versit.lib;winmm.lib;comctl32.lib;rpcrt4.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)M.exe</OutputFile>
- <AdditionalLibraryDirectories>$(wxwin)\lib\vc_amd64_lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
+ <AdditionalLibraryDirectories>$(OutDir);$(wxwin)\lib\vc_amd64_lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<StackReserveSize>10000000</StackReserveSize>
@@ -399,10 +392,9 @@
<AdditionalIncludeDirectories>include;$(wxwin)/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
- <AdditionalDependencies>lib/imap/$(IntDir)imap.lib;lib/compface/$(IntDir)compface.lib;lib/dspam/$(IntDir)dspam.lib;src\wx\vcard\$(IntDir)versit.lib;winmm.lib;comctl32.lib;rpcrt4.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>imap.lib;compface.lib;dspam.lib;versit.lib;winmm.lib;comctl32.lib;rpcrt4.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)M.exe</OutputFile>
- <AdditionalLibraryDirectories>$(wxwin)\lib\vc_amd64_lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
+ <AdditionalLibraryDirectories>$(OutDir);$(wxwin)\lib\vc_amd64_lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<StackReserveSize>10000000</StackReserveSize>
diff --git a/Mconfig.vcxproj b/Mconfig.vcxproj
index fcb3bac..9292950 100644
--- a/Mconfig.vcxproj
+++ b/Mconfig.vcxproj
@@ -68,6 +68,22 @@
<PropertyGroup>
<_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <IntDir>$(SolutionDir)\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <OutDir>$(SolutionDir)\$(Platform)\$(Configuration)\output\</OutDir>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <IntDir>$(SolutionDir)\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <OutDir>$(SolutionDir)\$(Platform)\$(Configuration)\output\</OutDir>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <OutDir>$(SolutionDir)\$(Platform)\$(Configuration)\output\</OutDir>
+ <IntDir>$(SolutionDir)\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <OutDir>$(SolutionDir)\$(Platform)\$(Configuration)\output\</OutDir>
+ <IntDir>$(SolutionDir)\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ </PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Midl>
<TypeLibraryName>.\Debug/Mconfig.tlb</TypeLibraryName>
diff --git a/lib/compface/compface.vcxproj b/lib/compface/compface.vcxproj
index 7d70c74..016a441 100644
--- a/lib/compface/compface.vcxproj
+++ b/lib/compface/compface.vcxproj
@@ -68,14 +68,14 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\$(Platform)\$(Configuration)\output\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\$(Platform)\$(Configuration)\output\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\$(Platform)\$(Configuration)\output\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\$(Platform)\$(Configuration)\output\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
diff --git a/lib/dspam/dspam.vcxproj b/lib/dspam/dspam.vcxproj
index 26be1bc..79a00ec 100644
--- a/lib/dspam/dspam.vcxproj
+++ b/lib/dspam/dspam.vcxproj
@@ -69,14 +69,14 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">debug\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">debug\</IntDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">release\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">release\</IntDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\$(Platform)\$(Configuration)\output\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\$(Platform)\$(Configuration)\output\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\$(Platform)\$(Configuration)\output\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\$(Platform)\$(Configuration)\output\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
diff --git a/lib/imap/imap.vcxproj b/lib/imap/imap.vcxproj
index 093e3e4..3ce6906 100644
--- a/lib/imap/imap.vcxproj
+++ b/lib/imap/imap.vcxproj
@@ -69,14 +69,14 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">debug\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">debug\</IntDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">release\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">release\</IntDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\$(Platform)\$(Configuration)\output\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\$(Platform)\$(Configuration)\output\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\$(Platform)\$(Configuration)\output\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\$(Platform)\$(Configuration)\output\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
diff --git a/src/wx/vcard/versit.vcxproj b/src/wx/vcard/versit.vcxproj
index 8567654..97f91bf 100644
--- a/src/wx/vcard/versit.vcxproj
+++ b/src/wx/vcard/versit.vcxproj
@@ -65,16 +65,16 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\$(Platform)\$(Configuration)\output\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\$(Platform)\$(Configuration)\output\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\$(Platform)\$(Configuration)\output\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\$(Platform)\$(Configuration)\output\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Midl>
commit cef3b1cd806322a38db3e52fe0951e654f6d3b48
Author: Vadim Zeitlin <[email protected]>
Date: Mon May 5 17:03:07 2014 +0200
Upgrade MSVS solution and projects to MSVS 2012 version.
Also don't use the version number in the solution file name, it is not used in
the projects anyhow.
diff --git a/M.sln b/M.sln
index e8834b9..6fdd523 100644
--- a/M.sln
+++ b/M.sln
@@ -1,79 +1,121 @@
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "M", "M.vcproj", "{1515C8EB-5C72-43DF-9D3A-0703F155F268}"
- ProjectSection(ProjectDependencies) = postProject
- {0E9F4403-1AA1-4824-A99F-041B1BF18D14} = {0E9F4403-1AA1-4824-A99F-041B1BF18D14}
- {62156246-DCEA-4713-95E0-C01F595F1A20} = {62156246-DCEA-4713-95E0-C01F595F1A20}
- {E46C11C7-5924-4F7C-B82E-5BEB8856A8BC} = {E46C11C7-5924-4F7C-B82E-5BEB8856A8BC}
- {86C1D2C7-C961-4017-88E8-63D0BCCBD0D5} = {86C1D2C7-C961-4017-88E8-63D0BCCBD0D5}
- {457CFEC8-5C3F-4C7E-98A6-B65E1DE22682} = {457CFEC8-5C3F-4C7E-98A6-B65E1DE22682}
- EndProjectSection
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2012
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "M", "M.vcxproj", "{1515C8EB-5C72-43DF-9D3A-0703F155F268}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "imap", "lib\imap\imap.vcproj", "{457CFEC8-5C3F-4C7E-98A6-B65E1DE22682}"
- ProjectSection(ProjectDependencies) = postProject
- {86C1D2C7-C961-4017-88E8-63D0BCCBD0D5} = {86C1D2C7-C961-4017-88E8-63D0BCCBD0D5}
- EndProjectSection
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "imap", "lib\imap\imap.vcxproj", "{457CFEC8-5C3F-4C7E-98A6-B65E1DE22682}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "compface", "lib\compface\compface.vcproj", "{0E9F4403-1AA1-4824-A99F-041B1BF18D14}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "compface", "lib\compface\compface.vcxproj", "{0E9F4403-1AA1-4824-A99F-041B1BF18D14}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dspam", "lib\dspam\dspam.vcproj", "{62156246-DCEA-4713-95E0-C01F595F1A20}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dspam", "lib\dspam\dspam.vcxproj", "{62156246-DCEA-4713-95E0-C01F595F1A20}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "config", "Mconfig.vcproj", "{86C1D2C7-C961-4017-88E8-63D0BCCBD0D5}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "config", "Mconfig.vcxproj", "{86C1D2C7-C961-4017-88E8-63D0BCCBD0D5}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "versit", "src\wx\vcard\versit.vcproj", "{E46C11C7-5924-4F7C-B82E-5BEB8856A8BC}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "versit", "src\wx\vcard\versit.vcxproj", "{E46C11C7-5924-4F7C-B82E-5BEB8856A8BC}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug DLL|Win32 = Debug DLL|Win32
+ Debug DLL|x64 = Debug DLL|x64
Debug|Win32 = Debug|Win32
Debug|x64 = Debug|x64
+ Release DLL|Win32 = Release DLL|Win32
+ Release DLL|x64 = Release DLL|x64
Release|Win32 = Release|Win32
Release|x64 = Release|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {1515C8EB-5C72-43DF-9D3A-0703F155F268}.Debug DLL|Win32.ActiveCfg = Debug DLL|x64
+ {1515C8EB-5C72-43DF-9D3A-0703F155F268}.Debug DLL|Win32.Build.0 = Debug DLL|x64
+ {1515C8EB-5C72-43DF-9D3A-0703F155F268}.Debug DLL|x64.ActiveCfg = Debug DLL|x64
+ {1515C8EB-5C72-43DF-9D3A-0703F155F268}.Debug DLL|x64.Build.0 = Debug DLL|x64
{1515C8EB-5C72-43DF-9D3A-0703F155F268}.Debug|Win32.ActiveCfg = Debug|Win32
{1515C8EB-5C72-43DF-9D3A-0703F155F268}.Debug|Win32.Build.0 = Debug|Win32
{1515C8EB-5C72-43DF-9D3A-0703F155F268}.Debug|x64.ActiveCfg = Debug|x64
{1515C8EB-5C72-43DF-9D3A-0703F155F268}.Debug|x64.Build.0 = Debug|x64
+ {1515C8EB-5C72-43DF-9D3A-0703F155F268}.Release DLL|Win32.ActiveCfg = Release DLL|Win32
+ {1515C8EB-5C72-43DF-9D3A-0703F155F268}.Release DLL|Win32.Build.0 = Release DLL|Win32
+ {1515C8EB-5C72-43DF-9D3A-0703F155F268}.Release DLL|x64.ActiveCfg = Release DLL|x64
+ {1515C8EB-5C72-43DF-9D3A-0703F155F268}.Release DLL|x64.Build.0 = Release DLL|x64
{1515C8EB-5C72-43DF-9D3A-0703F155F268}.Release|Win32.ActiveCfg = Release|Win32
{1515C8EB-5C72-43DF-9D3A-0703F155F268}.Release|Win32.Build.0 = Release|Win32
{1515C8EB-5C72-43DF-9D3A-0703F155F268}.Release|x64.ActiveCfg = Release|x64
{1515C8EB-5C72-43DF-9D3A-0703F155F268}.Release|x64.Build.0 = Release|x64
+ {457CFEC8-5C3F-4C7E-98A6-B65E1DE22682}.Debug DLL|Win32.ActiveCfg = Debug|x64
+ {457CFEC8-5C3F-4C7E-98A6-B65E1DE22682}.Debug DLL|Win32.Build.0 = Debug|x64
+ {457CFEC8-5C3F-4C7E-98A6-B65E1DE22682}.Debug DLL|x64.ActiveCfg = Debug|x64
+ {457CFEC8-5C3F-4C7E-98A6-B65E1DE22682}.Debug DLL|x64.Build.0 = Debug|x64
{457CFEC8-5C3F-4C7E-98A6-B65E1DE22682}.Debug|Win32.ActiveCfg = Debug|Win32
{457CFEC8-5C3F-4C7E-98A6-B65E1DE22682}.Debug|Win32.Build.0 = Debug|Win32
{457CFEC8-5C3F-4C7E-98A6-B65E1DE22682}.Debug|x64.ActiveCfg = Debug|x64
{457CFEC8-5C3F-4C7E-98A6-B65E1DE22682}.Debug|x64.Build.0 = Debug|x64
+ {457CFEC8-5C3F-4C7E-98A6-B65E1DE22682}.Release DLL|Win32.ActiveCfg = Release|Win32
+ {457CFEC8-5C3F-4C7E-98A6-B65E1DE22682}.Release DLL|Win32.Build.0 = Release|Win32
+ {457CFEC8-5C3F-4C7E-98A6-B65E1DE22682}.Release DLL|x64.ActiveCfg = Release|x64
+ {457CFEC8-5C3F-4C7E-98A6-B65E1DE22682}.Release DLL|x64.Build.0 = Release|x64
{457CFEC8-5C3F-4C7E-98A6-B65E1DE22682}.Release|Win32.ActiveCfg = Release|Win32
{457CFEC8-5C3F-4C7E-98A6-B65E1DE22682}.Release|Win32.Build.0 = Release|Win32
{457CFEC8-5C3F-4C7E-98A6-B65E1DE22682}.Release|x64.ActiveCfg = Release|x64
{457CFEC8-5C3F-4C7E-98A6-B65E1DE22682}.Release|x64.Build.0 = Release|x64
+ {0E9F4403-1AA1-4824-A99F-041B1BF18D14}.Debug DLL|Win32.ActiveCfg = Debug|x64
+ {0E9F4403-1AA1-4824-A99F-041B1BF18D14}.Debug DLL|Win32.Build.0 = Debug|x64
+ {0E9F4403-1AA1-4824-A99F-041B1BF18D14}.Debug DLL|x64.ActiveCfg = Debug|x64
+ {0E9F4403-1AA1-4824-A99F-041B1BF18D14}.Debug DLL|x64.Build.0 = Debug|x64
{0E9F4403-1AA1-4824-A99F-041B1BF18D14}.Debug|Win32.ActiveCfg = Debug|Win32
{0E9F4403-1AA1-4824-A99F-041B1BF18D14}.Debug|Win32.Build.0 = Debug|Win32
{0E9F4403-1AA1-4824-A99F-041B1BF18D14}.Debug|x64.ActiveCfg = Debug|x64
{0E9F4403-1AA1-4824-A99F-041B1BF18D14}.Debug|x64.Build.0 = Debug|x64
+ {0E9F4403-1AA1-4824-A99F-041B1BF18D14}.Release DLL|Win32.ActiveCfg = Release|Win32
+ {0E9F4403-1AA1-4824-A99F-041B1BF18D14}.Release DLL|Win32.Build.0 = Release|Win32
+ {0E9F4403-1AA1-4824-A99F-041B1BF18D14}.Release DLL|x64.ActiveCfg = Release|x64
+ {0E9F4403-1AA1-4824-A99F-041B1BF18D14}.Release DLL|x64.Build.0 = Release|x64
{0E9F4403-1AA1-4824-A99F-041B1BF18D14}.Release|Win32.ActiveCfg = Release|Win32
{0E9F4403-1AA1-4824-A99F-041B1BF18D14}.Release|Win32.Build.0 = Release|Win32
{0E9F4403-1AA1-4824-A99F-041B1BF18D14}.Release|x64.ActiveCfg = Release|x64
{0E9F4403-1AA1-4824-A99F-041B1BF18D14}.Release|x64.Build.0 = Release|x64
+ {62156246-DCEA-4713-95E0-C01F595F1A20}.Debug DLL|Win32.ActiveCfg = Debug|x64
+ {62156246-DCEA-4713-95E0-C01F595F1A20}.Debug DLL|Win32.Build.0 = Debug|x64
+ {62156246-DCEA-4713-95E0-C01F595F1A20}.Debug DLL|x64.ActiveCfg = Debug|x64
+ {62156246-DCEA-4713-95E0-C01F595F1A20}.Debug DLL|x64.Build.0 = Debug|x64
{62156246-DCEA-4713-95E0-C01F595F1A20}.Debug|Win32.ActiveCfg = Debug|Win32
{62156246-DCEA-4713-95E0-C01F595F1A20}.Debug|Win32.Build.0 = Debug|Win32
{62156246-DCEA-4713-95E0-C01F595F1A20}.Debug|x64.ActiveCfg = Debug|x64
{62156246-DCEA-4713-95E0-C01F595F1A20}.Debug|x64.Build.0 = Debug|x64
+ {62156246-DCEA-4713-95E0-C01F595F1A20}.Release DLL|Win32.ActiveCfg = Release|Win32
+ {62156246-DCEA-4713-95E0-C01F595F1A20}.Release DLL|Win32.Build.0 = Release|Win32
+ {62156246-DCEA-4713-95E0-C01F595F1A20}.Release DLL|x64.ActiveCfg = Release|x64
+ {62156246-DCEA-4713-95E0-C01F595F1A20}.Release DLL|x64.Build.0 = Release|x64
{62156246-DCEA-4713-95E0-C01F595F1A20}.Release|Win32.ActiveCfg = Release|Win32
{62156246-DCEA-4713-95E0-C01F595F1A20}.Release|Win32.Build.0 = Release|Win32
{62156246-DCEA-4713-95E0-C01F595F1A20}.Release|x64.ActiveCfg = Release|x64
{62156246-DCEA-4713-95E0-C01F595F1A20}.Release|x64.Build.0 = Release|x64
+ {86C1D2C7-C961-4017-88E8-63D0BCCBD0D5}.Debug DLL|Win32.ActiveCfg = Debug|x64
+ {86C1D2C7-C961-4017-88E8-63D0BCCBD0D5}.Debug DLL|Win32.Build.0 = Debug|x64
+ {86C1D2C7-C961-4017-88E8-63D0BCCBD0D5}.Debug DLL|x64.ActiveCfg = Debug|x64
+ {86C1D2C7-C961-4017-88E8-63D0BCCBD0D5}.Debug DLL|x64.Build.0 = Debug|x64
{86C1D2C7-C961-4017-88E8-63D0BCCBD0D5}.Debug|Win32.ActiveCfg = Debug|Win32
{86C1D2C7-C961-4017-88E8-63D0BCCBD0D5}.Debug|Win32.Build.0 = Debug|Win32
{86C1D2C7-C961-4017-88E8-63D0BCCBD0D5}.Debug|x64.ActiveCfg = Debug|x64
{86C1D2C7-C961-4017-88E8-63D0BCCBD0D5}.Debug|x64.Build.0 = Debug|x64
+ {86C1D2C7-C961-4017-88E8-63D0BCCBD0D5}.Release DLL|Win32.ActiveCfg = Release|Win32
+ {86C1D2C7-C961-4017-88E8-63D0BCCBD0D5}.Release DLL|Win32.Build.0 = Release|Win32
+ {86C1D2C7-C961-4017-88E8-63D0BCCBD0D5}.Release DLL|x64.ActiveCfg = Release|x64
+ {86C1D2C7-C961-4017-88E8-63D0BCCBD0D5}.Release DLL|x64.Build.0 = Release|x64
{86C1D2C7-C961-4017-88E8-63D0BCCBD0D5}.Release|Win32.ActiveCfg = Release|Win32
{86C1D2C7-C961-4017-88E8-63D0BCCBD0D5}.Release|Win32.Build.0 = Release|Win32
{86C1D2C7-C961-4017-88E8-63D0BCCBD0D5}.Release|x64.ActiveCfg = Release|x64
{86C1D2C7-C961-4017-88E8-63D0BCCBD0D5}.Release|x64.Build.0 = Release|x64
+ {E46C11C7-5924-4F7C-B82E-5BEB8856A8BC}.Debug DLL|Win32.ActiveCfg = Debug|x64
+ {E46C11C7-5924-4F7C-B82E-5BEB8856A8BC}.Debug DLL|Win32.Build.0 = Debug|x64
+ {E46C11C7-5924-4F7C-B82E-5BEB8856A8BC}.Debug DLL|x64.ActiveCfg = Debug|x64
+ {E46C11C7-5924-4F7C-B82E-5BEB8856A8BC}.Debug DLL|x64.Build.0 = Debug|x64
{E46C11C7-5924-4F7C-B82E-5BEB8856A8BC}.Debug|Win32.ActiveCfg = Debug|Win32
{E46C11C7-5924-4F7C-B82E-5BEB8856A8BC}.Debug|Win32.Build.0 = Debug|Win32
{E46C11C7-5924-4F7C-B82E-5BEB8856A8BC}.Debug|x64.ActiveCfg = Debug|x64
{E46C11C7-5924-4F7C-B82E-5BEB8856A8BC}.Debug|x64.Build.0 = Debug|x64
+ {E46C11C7-5924-4F7C-B82E-5BEB8856A8BC}.Release DLL|Win32.ActiveCfg = Release|Win32
+ {E46C11C7-5924-4F7C-B82E-5BEB8856A8BC}.Release DLL|Win32.Build.0 = Release|Win32
+ {E46C11C7-5924-4F7C-B82E-5BEB8856A8BC}.Release DLL|x64.ActiveCfg = Release|x64
+ {E46C11C7-5924-4F7C-B82E-5BEB8856A8BC}.Release DLL|x64.Build.0 = Release|x64
{E46C11C7-5924-4F7C-B82E-5BEB8856A8BC}.Release|Win32.ActiveCfg = Release|Win32
{E46C11C7-5924-4F7C-B82E-5BEB8856A8BC}.Release|Win32.Build.0 = Release|Win32
{E46C11C7-5924-4F7C-B82E-5BEB8856A8BC}.Release|x64.ActiveCfg = Release|x64
diff --git a/M.vcxproj b/M.vcxproj
index 90b1833..fa1e91c 100644
--- a/M.vcxproj
+++ b/M.vcxproj
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug DLL|Win32">
<Configuration>Debug DLL</Configuration>
@@ -38,48 +38,47 @@
<ProjectGuid>{1515C8EB-5C72-43DF-9D3A-0703F155F268}</ProjectGuid>
<RootNamespace>M</RootNamespace>
<Keyword>Win32Proj</Keyword>
- <VCTargetsPath Condition="'$(VCTargetsPath11)' != '' and '$(VSVersion)' == '' and $(VisualStudioVersion) == ''">$(VCTargetsPath11)</VCTargetsPath>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v100</PlatformToolset>
+ <PlatformToolset>v120_xp</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug DLL|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v100</PlatformToolset>
+ <PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>NotSet</CharacterSet>
- <PlatformToolset>v100</PlatformToolset>
+ <PlatformToolset>v120_xp</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release DLL|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>NotSet</CharacterSet>
- <PlatformToolset>v100</PlatformToolset>
+ <PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v100</PlatformToolset>
+ <PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug DLL|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v100</PlatformToolset>
+ <PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>NotSet</CharacterSet>
- <PlatformToolset>v100</PlatformToolset>
+ <PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release DLL|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>NotSet</CharacterSet>
- <PlatformToolset>v100</PlatformToolset>
+ <PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
@@ -136,11 +135,14 @@
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug DLL|x64'">true</LinkIncremental>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+ </PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<WholeProgramOptimization>true</WholeProgramOptimization>
<AdditionalIncludeDirectories>include;$(wxwin)/include/msvc;$(wxwin)/include;lib/compface;lib/imap/src/osdep/nt;lib/imap/src/c-client;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_UNICODE;wxNO_AUI_LIB;wxNO_GL_LIB;wxNO_MEDIA_LIB;wxNO_RIBBON_LIB;wxNO_RICHTEXT_LIB;wxNO_XRC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_UNICODE;wxMSVC_VERSION_AUTO;wxNO_AUI_LIB;wxNO_GL_LIB;wxNO_MEDIA_LIB;wxNO_RIBBON_LIB;wxNO_RICHTEXT_LIB;wxNO_XRC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>Mpch.h</PrecompiledHeaderFile>
@@ -156,7 +158,7 @@
<AdditionalDependencies>lib/imap/$(IntDir)imap.lib;lib/compface/$(IntDir)compface.lib;lib/dspam/$(IntDir)dspam.lib;src\wx\vcard\$(IntDir)versit.lib;winmm.lib;comctl32.lib;rpcrt4.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<ShowProgress>NotSet</ShowProgress>
<OutputFile>$(OutDir)M.exe</OutputFile>
- <AdditionalLibraryDirectories>$(wxwin)\lib\vc100_lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(wxwin)\lib\vc120_lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
<GenerateDebugInformation>true</GenerateDebugInformation>
<GenerateMapFile>true</GenerateMapFile>
@@ -190,7 +192,7 @@
<AdditionalDependencies>lib/imap/$(IntDir)imap.lib;lib/compface/$(IntDir)compface.lib;lib/dspam/$(IntDir)dspam.lib;src\wx\vcard\$(IntDir)versit.lib;winmm.lib;comctl32.lib;rpcrt4.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<ShowProgress>NotSet</ShowProgress>
<OutputFile>$(OutDir)M.exe</OutputFile>
- <AdditionalLibraryDirectories>$(wxwin)\lib\vc100_dll;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(wxwin)\lib\vc120_dll;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
<GenerateDebugInformation>true</GenerateDebugInformation>
<GenerateMapFile>true</GenerateMapFile>
@@ -296,7 +298,7 @@
<Link>
<AdditionalDependencies>lib/imap/$(IntDir)imap.lib;lib/compface/$(IntDir)compface.lib;lib/dspam/$(IntDir)dspam.lib;src\wx\vcard\$(IntDir)versit.lib;winmm.lib;comctl32.lib;rpcrt4.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)M.exe</OutputFile>
- <AdditionalLibraryDirectories>$(wxwin)\lib\vc100_lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(wxwin)\lib\vc120_lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -329,7 +331,7 @@
<Link>
<AdditionalDependencies>lib/imap/$(IntDir)imap.lib;lib/compface/$(IntDir)compface.lib;lib/dspam/$(IntDir)dspam.lib;src\wx\vcard\$(IntDir)versit.lib;winmm.lib;comctl32.lib;rpcrt4.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)M.exe</OutputFile>
- <AdditionalLibraryDirectories>$(wxwin)\lib\vc100_dll;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(wxwin)\lib\vc120_dll;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
diff --git a/M_vc10.sln b/M_vc10.sln
deleted file mode 100644
index 905fcf4..0000000
--- a/M_vc10.sln
+++ /dev/null
@@ -1,127 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "M", "M.vcxproj", "{1515C8EB-5C72-43DF-9D3A-0703F155F268}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "imap", "lib\imap\imap.vcxproj", "{457CFEC8-5C3F-4C7E-98A6-B65E1DE22682}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "compface", "lib\compface\compface.vcxproj", "{0E9F4403-1AA1-4824-A99F-041B1BF18D14}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dspam", "lib\dspam\dspam.vcxproj", "{62156246-DCEA-4713-95E0-C01F595F1A20}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "config", "Mconfig.vcxproj", "{86C1D2C7-C961-4017-88E8-63D0BCCBD0D5}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "versit", "src\wx\vcard\versit.vcxproj", "{E46C11C7-5924-4F7C-B82E-5BEB8856A8BC}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug DLL|Win32 = Debug DLL|Win32
- Debug DLL|x64 = Debug DLL|x64
- Debug|Win32 = Debug|Win32
- Debug|x64 = Debug|x64
- Release DLL|Win32 = Release DLL|Win32
- Release DLL|x64 = Release DLL|x64
- Release|Win32 = Release|Win32
- Release|x64 = Release|x64
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {1515C8EB-5C72-43DF-9D3A-0703F155F268}.Debug DLL|Win32.ActiveCfg = Debug DLL|x64
- {1515C8EB-5C72-43DF-9D3A-0703F155F268}.Debug DLL|Win32.Build.0 = Debug DLL|x64
- {1515C8EB-5C72-43DF-9D3A-0703F155F268}.Debug DLL|x64.ActiveCfg = Debug DLL|x64
- {1515C8EB-5C72-43DF-9D3A-0703F155F268}.Debug DLL|x64.Build.0 = Debug DLL|x64
- {1515C8EB-5C72-43DF-9D3A-0703F155F268}.Debug|Win32.ActiveCfg = Debug|Win32
- {1515C8EB-5C72-43DF-9D3A-0703F155F268}.Debug|Win32.Build.0 = Debug|Win32
- {1515C8EB-5C72-43DF-9D3A-0703F155F268}.Debug|x64.ActiveCfg = Debug|x64
- {1515C8EB-5C72-43DF-9D3A-0703F155F268}.Debug|x64.Build.0 = Debug|x64
- {1515C8EB-5C72-43DF-9D3A-0703F155F268}.Release DLL|Win32.ActiveCfg = Release DLL|Win32
- {1515C8EB-5C72-43DF-9D3A-0703F155F268}.Release DLL|Win32.Build.0 = Release DLL|Win32
- {1515C8EB-5C72-43DF-9D3A-0703F155F268}.Release DLL|x64.ActiveCfg = Release DLL|x64
- {1515C8EB-5C72-43DF-9D3A-0703F155F268}.Release DLL|x64.Build.0 = Release DLL|x64
- {1515C8EB-5C72-43DF-9D3A-0703F155F268}.Release|Win32.ActiveCfg = Release|Win32
- {1515C8EB-5C72-43DF-9D3A-0703F155F268}.Release|Win32.Build.0 = Release|Win32
- {1515C8EB-5C72-43DF-9D3A-0703F155F268}.Release|x64.ActiveCfg = Release|x64
- {1515C8EB-5C72-43DF-9D3A-0703F155F268}.Release|x64.Build.0 = Release|x64
- {457CFEC8-5C3F-4C7E-98A6-B65E1DE22682}.Debug DLL|Win32.ActiveCfg = Debug|x64
- {457CFEC8-5C3F-4C7E-98A6-B65E1DE22682}.Debug DLL|Win32.Build.0 = Debug|x64
- {457CFEC8-5C3F-4C7E-98A6-B65E1DE22682}.Debug DLL|x64.ActiveCfg = Debug|x64
- {457CFEC8-5C3F-4C7E-98A6-B65E1DE22682}.Debug DLL|x64.Build.0 = Debug|x64
- {457CFEC8-5C3F-4C7E-98A6-B65E1DE22682}.Debug|Win32.ActiveCfg = Debug|Win32
- {457CFEC8-5C3F-4C7E-98A6-B65E1DE22682}.Debug|Win32.Build.0 = Debug|Win32
- {457CFEC8-5C3F-4C7E-98A6-B65E1DE22682}.Debug|x64.ActiveCfg = Debug|x64
- {457CFEC8-5C3F-4C7E-98A6-B65E1DE22682}.Debug|x64.Build.0 = Debug|x64
- {457CFEC8-5C3F-4C7E-98A6-B65E1DE22682}.Release DLL|Win32.ActiveCfg = Release|Win32
- {457CFEC8-5C3F-4C7E-98A6-B65E1DE22682}.Release DLL|Win32.Build.0 = Release|Win32
- {457CFEC8-5C3F-4C7E-98A6-B65E1DE22682}.Release DLL|x64.ActiveCfg = Release|x64
- {457CFEC8-5C3F-4C7E-98A6-B65E1DE22682}.Release DLL|x64.Build.0 = Release|x64
- {457CFEC8-5C3F-4C7E-98A6-B65E1DE22682}.Release|Win32.ActiveCfg = Release|Win32
- {457CFEC8-5C3F-4C7E-98A6-B65E1DE22682}.Release|Win32.Build.0 = Release|Win32
- {457CFEC8-5C3F-4C7E-98A6-B65E1DE22682}.Release|x64.ActiveCfg = Release|x64
- {457CFEC8-5C3F-4C7E-98A6-B65E1DE22682}.Release|x64.Build.0 = Release|x64
- {0E9F4403-1AA1-4824-A99F-041B1BF18D14}.Debug DLL|Win32.ActiveCfg = Debug|x64
- {0E9F4403-1AA1-4824-A99F-041B1BF18D14}.Debug DLL|Win32.Build.0 = Debug|x64
- {0E9F4403-1AA1-4824-A99F-041B1BF18D14}.Debug DLL|x64.ActiveCfg = Debug|x64
- {0E9F4403-1AA1-4824-A99F-041B1BF18D14}.Debug DLL|x64.Build.0 = Debug|x64
- {0E9F4403-1AA1-4824-A99F-041B1BF18D14}.Debug|Win32.ActiveCfg = Debug|Win32
- {0E9F4403-1AA1-4824-A99F-041B1BF18D14}.Debug|Win32.Build.0 = Debug|Win32
- {0E9F4403-1AA1-4824-A99F-041B1BF18D14}.Debug|x64.ActiveCfg = Debug|x64
- {0E9F4403-1AA1-4824-A99F-041B1BF18D14}.Debug|x64.Build.0 = Debug|x64
- {0E9F4403-1AA1-4824-A99F-041B1BF18D14}.Release DLL|Win32.ActiveCfg = Release|Win32
- {0E9F4403-1AA1-4824-A99F-041B1BF18D14}.Release DLL|Win32.Build.0 = Release|Win32
- {0E9F4403-1AA1-4824-A99F-041B1BF18D14}.Release DLL|x64.ActiveCfg = Release|x64
- {0E9F4403-1AA1-4824-A99F-041B1BF18D14}.Release DLL|x64.Build.0 = Release|x64
- {0E9F4403-1AA1-4824-A99F-041B1BF18D14}.Release|Win32.ActiveCfg = Release|Win32
- {0E9F4403-1AA1-4824-A99F-041B1BF18D14}.Release|Win32.Build.0 = Release|Win32
- {0E9F4403-1AA1-4824-A99F-041B1BF18D14}.Release|x64.ActiveCfg = Release|x64
- {0E9F4403-1AA1-4824-A99F-041B1BF18D14}.Release|x64.Build.0 = Release|x64
- {62156246-DCEA-4713-95E0-C01F595F1A20}.Debug DLL|Win32.ActiveCfg = Debug|x64
- {62156246-DCEA-4713-95E0-C01F595F1A20}.Debug DLL|Win32.Build.0 = Debug|x64
- {62156246-DCEA-4713-95E0-C01F595F1A20}.Debug DLL|x64.ActiveCfg = Debug|x64
- {62156246-DCEA-4713-95E0-C01F595F1A20}.Debug DLL|x64.Build.0 = Debug|x64
- {62156246-DCEA-4713-95E0-C01F595F1A20}.Debug|Win32.ActiveCfg = Debug|Win32
- {62156246-DCEA-4713-95E0-C01F595F1A20}.Debug|Win32.Build.0 = Debug|Win32
- {62156246-DCEA-4713-95E0-C01F595F1A20}.Debug|x64.ActiveCfg = Debug|x64
- {62156246-DCEA-4713-95E0-C01F595F1A20}.Debug|x64.Build.0 = Debug|x64
- {62156246-DCEA-4713-95E0-C01F595F1A20}.Release DLL|Win32.ActiveCfg = Release|Win32
- {62156246-DCEA-4713-95E0-C01F595F1A20}.Release DLL|Win32.Build.0 = Release|Win32
- {62156246-DCEA-4713-95E0-C01F595F1A20}.Release DLL|x64.ActiveCfg = Release|x64
- {62156246-DCEA-4713-95E0-C01F595F1A20}.Release DLL|x64.Build.0 = Release|x64
- {62156246-DCEA-4713-95E0-C01F595F1A20}.Release|Win32.ActiveCfg = Release|Win32
- {62156246-DCEA-4713-95E0-C01F595F1A20}.Release|Win32.Build.0 = Release|Win32
- {62156246-DCEA-4713-95E0-C01F595F1A20}.Release|x64.ActiveCfg = Release|x64
- {62156246-DCEA-4713-95E0-C01F595F1A20}.Release|x64.Build.0 = Release|x64
- {86C1D2C7-C961-4017-88E8-63D0BCCBD0D5}.Debug DLL|Win32.ActiveCfg = Debug|x64
- {86C1D2C7-C961-4017-88E8-63D0BCCBD0D5}.Debug DLL|Win32.Build.0 = Debug|x64
- {86C1D2C7-C961-4017-88E8-63D0BCCBD0D5}.Debug DLL|x64.ActiveCfg = Debug|x64
- {86C1D2C7-C961-4017-88E8-63D0BCCBD0D5}.Debug DLL|x64.Build.0 = Debug|x64
- {86C1D2C7-C961-4017-88E8-63D0BCCBD0D5}.Debug|Win32.ActiveCfg = Debug|Win32
- {86C1D2C7-C961-4017-88E8-63D0BCCBD0D5}.Debug|Win32.Build.0 = Debug|Win32
- {86C1D2C7-C961-4017-88E8-63D0BCCBD0D5}.Debug|x64.ActiveCfg = Debug|x64
- {86C1D2C7-C961-4017-88E8-63D0BCCBD0D5}.Debug|x64.Build.0 = Debug|x64
- {86C1D2C7-C961-4017-88E8-63D0BCCBD0D5}.Release DLL|Win32.ActiveCfg = Release|Win32
- {86C1D2C7-C961-4017-88E8-63D0BCCBD0D5}.Release DLL|Win32.Build.0 = Release|Win32
- {86C1D2C7-C961-4017-88E8-63D0BCCBD0D5}.Release DLL|x64.ActiveCfg = Release|x64
- {86C1D2C7-C961-4017-88E8-63D0BCCBD0D5}.Release DLL|x64.Build.0 = Release|x64
- {86C1D2C7-C961-4017-88E8-63D0BCCBD0D5}.Release|Win32.ActiveCfg = Release|Win32
- {86C1D2C7-C961-4017-88E8-63D0BCCBD0D5}.Release|Win32.Build.0 = Release|Win32
- {86C1D2C7-C961-4017-88E8-63D0BCCBD0D5}.Release|x64.ActiveCfg = Release|x64
- {86C1D2C7-C961-4017-88E8-63D0BCCBD0D5}.Release|x64.Build.0 = Release|x64
- {E46C11C7-5924-4F7C-B82E-5BEB8856A8BC}.Debug DLL|Win32.ActiveCfg = Debug|x64
- {E46C11C7-5924-4F7C-B82E-5BEB8856A8BC}.Debug DLL|Win32.Build.0 = Debug|x64
- {E46C11C7-5924-4F7C-B82E-5BEB8856A8BC}.Debug DLL|x64.ActiveCfg = Debug|x64
- {E46C11C7-5924-4F7C-B82E-5BEB8856A8BC}.Debug DLL|x64.Build.0 = Debug|x64
- {E46C11C7-5924-4F7C-B82E-5BEB8856A8BC}.Debug|Win32.ActiveCfg = Debug|Win32
- {E46C11C7-5924-4F7C-B82E-5BEB8856A8BC}.Debug|Win32.Build.0 = Debug|Win32
- {E46C11C7-5924-4F7C-B82E-5BEB8856A8BC}.Debug|x64.ActiveCfg = Debug|x64
- {E46C11C7-5924-4F7C-B82E-5BEB8856A8BC}.Debug|x64.Build.0 = Debug|x64
- {E46C11C7-5924-4F7C-B82E-5BEB8856A8BC}.Release DLL|Win32.ActiveCfg = Release|Win32
- {E46C11C7-5924-4F7C-B82E-5BEB8856A8BC}.Release DLL|Win32.Build.0 = Release|Win32
- {E46C11C7-5924-4F7C-B82E-5BEB8856A8BC}.Release DLL|x64.ActiveCfg = Release|x64
- {E46C11C7-5924-4F7C-B82E-5BEB8856A8BC}.Release DLL|x64.Build.0 = Release|x64
- {E46C11C7-5924-4F7C-B82E-5BEB8856A8BC}.Release|Win32.ActiveCfg = Release|Win32
- {E46C11C7-5924-4F7C-B82E-5BEB8856A8BC}.Release|Win32.Build.0 = Release|Win32
- {E46C11C7-5924-4F7C-B82E-5BEB8856A8BC}.Release|x64.ActiveCfg = Release|x64
- {E46C11C7-5924-4F7C-B82E-5BEB8856A8BC}.Release|x64.Build.0 = Release|x64
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
-EndGlobal
diff --git a/Mconfig.vcxproj b/Mconfig.vcxproj
index e8e6347..fcb3bac 100644
--- a/Mconfig.vcxproj
+++ b/Mconfig.vcxproj
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@@ -23,28 +23,27 @@
<ProjectGuid>{86C1D2C7-C961-4017-88E8-63D0BCCBD0D5}</ProjectGuid>
<RootNamespace>config</RootNamespace>
<Keyword>MakeFileProj</Keyword>
- <VCTargetsPath Condition="'$(VCTargetsPath11)' != '' and '$(VSVersion)' == '' and $(VisualStudioVersion) == ''">$(VCTargetsPath11)</VCTargetsPath>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Utility</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
- <PlatformToolset>v100</PlatformToolset>
+ <PlatformToolset>v120_xp</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Utility</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
- <PlatformToolset>v100</PlatformToolset>
+ <PlatformToolset>v120_xp</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Utility</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
- <PlatformToolset>v100</PlatformToolset>
+ <PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Utility</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
- <PlatformToolset>v100</PlatformToolset>
+ <PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
@@ -68,14 +67,6 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</IntDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</IntDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Midl>
diff --git a/lib/compface/compface.vcxproj b/lib/compface/compface.vcxproj
index a7efce3..7d70c74 100644
--- a/lib/compface/compface.vcxproj
+++ b/lib/compface/compface.vcxproj
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@@ -20,32 +20,31 @@
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{0E9F4403-1AA1-4824-A99F-041B1BF18D14}</ProjectGuid>
- <VCTargetsPath Condition="'$(VCTargetsPath11)' != '' and '$(VSVersion)' == '' and $(VisualStudioVersion) == ''">$(VCTargetsPath11)</VCTargetsPath>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v100</PlatformToolset>
+ <PlatformToolset>v120_xp</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v100</PlatformToolset>
+ <PlatformToolset>v120_xp</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v100</PlatformToolset>
+ <PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v100</PlatformToolset>
+ <PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
diff --git a/lib/dspam/dspam.vcxproj b/lib/dspam/dspam.vcxproj
index 5870028..26be1bc 100644
--- a/lib/dspam/dspam.vcxproj
+++ b/lib/dspam/dspam.vcxproj
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@@ -21,32 +21,31 @@
<PropertyGroup Label="Globals">
<ProjectGuid>{62156246-DCEA-4713-95E0-C01F595F1A20}</ProjectGuid>
<RootNamespace>dspam</RootNamespace>
- <VCTargetsPath Condition="'$(VCTargetsPath11)' != '' and '$(VSVersion)' == '' and $(VisualStudioVersion) == ''">$(VCTargetsPath11)</VCTargetsPath>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v100</PlatformToolset>
+ <PlatformToolset>v120_xp</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v100</PlatformToolset>
+ <PlatformToolset>v120_xp</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v100</PlatformToolset>
+ <PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v100</PlatformToolset>
+ <PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
diff --git a/lib/imap/imap.vcxproj b/lib/imap/imap.vcxproj
index 3748bcf..093e3e4 100644
--- a/lib/imap/imap.vcxproj
+++ b/lib/imap/imap.vcxproj
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@@ -21,32 +21,31 @@
<PropertyGroup Label="Globals">
<ProjectGuid>{457cfec8-5c3f-4c7e-98a6-b65e1de22682}</ProjectGuid>
<RootNamespace>imap</RootNamespace>
- <VCTargetsPath Condition="'$(VCTargetsPath11)' != '' and '$(VSVersion)' == '' and $(VisualStudioVersion) == ''">$(VCTargetsPath11)</VCTargetsPath>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v100</PlatformToolset>
+ <PlatformToolset>v120_xp</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v100</PlatformToolset>
+ <PlatformToolset>v120_xp</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v100</PlatformToolset>
+ <PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v100</PlatformToolset>
+ <PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
diff --git a/src/wx/vcard/versit.vcxproj b/src/wx/vcard/versit.vcxproj
index c201670..8567654 100644
--- a/src/wx/vcard/versit.vcxproj
+++ b/src/wx/vcard/versit.vcxproj
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@@ -21,28 +21,27 @@
<PropertyGroup Label="Globals">
<ProjectGuid>{E46C11C7-5924-4F7C-B82E-5BEB8856A8BC}</ProjectGuid>
<RootNamespace>versit</RootNamespace>
- <VCTargetsPath Condition="'$(VCTargetsPath11)' != '' and '$(VSVersion)' == '' and $(VisualStudioVersion) == ''">$(VCTargetsPath11)</VCTargetsPath>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
- <PlatformToolset>v100</PlatformToolset>
+ <PlatformToolset>v120_xp</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
- <PlatformToolset>v100</PlatformToolset>
+ <PlatformToolset>v120_xp</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
- <PlatformToolset>v100</PlatformToolset>
+ <PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
- <PlatformToolset>v100</PlatformToolset>
+ <PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
-----------------------------------------------------------------------
Summary of changes:
.gitignore | 14 +----
M.sln | 78 +++++++++++++++++++------
M.vcxproj | 92 ++++++++++++++----------------
M_vc10.sln | 127 -----------------------------------------
Mconfig.vcxproj | 35 +++++++-----
lib/compface/compface.vcxproj | 27 ++++-----
lib/dspam/dspam.vcxproj | 27 ++++-----
lib/imap/imap.vcxproj | 27 ++++-----
src/gui/wxComposeView.cpp | 15 +++--
src/wx/vcard/versit.vcxproj | 27 ++++-----
10 files changed, 187 insertions(+), 282 deletions(-)
delete mode 100644 M_vc10.sln
hooks/post-receive
--
Mahogany sources repository.
--===============7273130880847569008==
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
------------------------------------------------------------------------------
Download BIRT iHub F-Type - The Free Enterprise-Grade BIRT Server
from Actuate! Instantly Supercharge Your Business Reports and Dashboards
with Interactivity, Sharing, Native Excel Exports, App Integration & more
Get technology previously reserved for billion-dollar corporations, FREE
http://pubads.g.doubleclick.net/gampad/clk?id=164703151&iu=/4140/ostg.clktrk
--===============7273130880847569008==
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
_______________________________________________
Mahogany-cvsupdates mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
--===============7273130880847569008==--