Browse Source

Merge pull request #191 from fcoulombegoogle/master

- Reference Readme.md in Visual Studio sln.
- Fixed linker rule against libsasl.lib
- Don't use deprecated __line when possible
pull/2/merge
Hoà V. DINH 7 years ago
parent
commit
9b5d5cdf17
6 changed files with 9 additions and 6 deletions
  1. +2
    -0
      build-windows/README.md
  2. +0
    -1
      build-windows/build_headers.list
  3. +2
    -0
      build-windows/libetpan-config.h
  4. +1
    -1
      build-windows/libetpan.sln
  5. +3
    -3
      build-windows/libetpan/libetpan.vcxproj
  6. +1
    -1
      libetpan-config.h.in

+ 2
- 0
build-windows/README.md View File

@ -13,6 +13,7 @@ Also, you'll need all the dependencies, download the most recent binary builds i
- [Cyrus SASL](http://d.etpan.org/mailcore2-deps/cyrus-sasl-win32/)
- [zlib](http://d.etpan.org/mailcore2-deps/zlib-win32/)
- [OpenSSL](http://d.etpan.org/mailcore2-deps/misc-win32/)
- [SASL](http://d.etpan.org/mailcore2-deps/cyrus-sasl-win32/)
### Build using Visual Studio 2013 ###
@ -20,6 +21,7 @@ You'll need all the dependencies, download the most recent binary builds in:
- [zlib](http://d.etpan.org/mailcore2-deps/zlib-win32/)
- [OpenSSL](http://d.etpan.org/mailcore2-deps/misc-win32/)
- [SASL](http://d.etpan.org/mailcore2-deps/cyrus-sasl-win32/)
#### Instructions for zlib ####


+ 0
- 1
build-windows/build_headers.list View File

@ -151,7 +151,6 @@ src\low-level\smtp\mailsmtp_socket.h
src\low-level\smtp\mailsmtp_ssl.h
src\low-level\smtp\mailsmtp_types.h
src\main\libetpan.h
src\main\libetpan_version.h
src\windows\win_etpan.h
build-windows\libetpan-config.h
build-windows\libetpan_version.h

+ 2
- 0
build-windows/libetpan-config.h View File

@ -80,7 +80,9 @@
#include <limits.h>
#ifdef _MSC_VER
# define MMAP_UNAVAILABLE
# ifndef __cplusplus
# define inline __inline
# endif
#else
# include <sys/param.h>
#endif


+ 1
- 1
build-windows/libetpan.sln View File

@ -4,7 +4,7 @@ VisualStudioVersion = 12.0.31101.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{B2C11050-3E46-4E10-B734-F9203A75AA46}"
ProjectSection(SolutionItems) = preProject
README.txt = README.txt
README.md = README.md
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libetpan", "libetpan\libetpan.vcxproj", "{BA4DED3C-E56F-4484-BFC3-9C13E461A1BE}"


+ 3
- 3
build-windows/libetpan/libetpan.vcxproj View File

@ -98,7 +98,7 @@
</ClCompile>
<Link>
<AdditionalOptions>/DLL %(AdditionalOptions)</AdditionalOptions>
<AdditionalDependencies>libsasl2.dll;zlib.lib;Ws2_32.lib;ssleay32MDd.lib;libeay32MDd.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>libsasl2.lib;zlib.lib;Ws2_32.lib;ssleay32MDd.lib;libeay32MDd.lib;%(AdditionalDependencies)</AdditionalDependencies>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>../../third-party/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<IgnoreSpecificDefaultLibraries>C;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
@ -130,7 +130,7 @@
</ClCompile>
<Link>
<AdditionalOptions>/DLL %(AdditionalOptions)</AdditionalOptions>
<AdditionalDependencies>libsasl2.dll;zlib.lib;Ws2_32.lib;ssleay32MDd.lib;libeay32MDd.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>libsasl2.lib;zlib.lib;Ws2_32.lib;ssleay32MDd.lib;libeay32MDd.lib;%(AdditionalDependencies)</AdditionalDependencies>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>../../third-party/lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<IgnoreSpecificDefaultLibraries>C;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
@ -412,4 +412,4 @@ build_headers.bat
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
</Project>

+ 1
- 1
libetpan-config.h.in View File

@ -9,7 +9,7 @@
@if WIN32
@ define MMAP_UNAVAILABLE
@endif
@ifdef _MSC_VER
@if defined(_MSC_VER) && !defined(__cplusplus)
@ define inline __inline
@endif
#ifdef HAVE_LIMITS_H


Loading…
Cancel
Save