-
Notifications
You must be signed in to change notification settings - Fork 4
/
winlibs.patch
117 lines (116 loc) · 4.77 KB
/
winlibs.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
win32/cyrus-sasl.props | 4 ++--
win32/openssl.props | 2 +-
win32/sasl2.vcxproj | 16 ++++++++++++----
win32/sasldb.props | 2 +-
win32/sasldb.vcxproj | 8 ++++----
5 files changed, 20 insertions(+), 12 deletions(-)
diff --git a/win32/cyrus-sasl.props b/win32/cyrus-sasl.props
index 340034a..ac4b44c 100644
--- a/win32/cyrus-sasl.props
+++ b/win32/cyrus-sasl.props
@@ -5,8 +5,8 @@
<InstallRoot>..\..\..\msvc\$(Platform)\</InstallRoot>
<InstallLibDir>$(InstallRoot)\lib\</InstallLibDir>
<InstallBinDir>$(InstallRoot)\bin\</InstallBinDir>
- <SaslDependencyRoot>$(InstallRoot)</SaslDependencyRoot>
- <SaslDependencyLibDir>$(InstallLibDir)</SaslDependencyLibDir>
+ <SaslDependencyRoot>..\..\deps</SaslDependencyRoot>
+ <SaslDependencyLibDir>$(SaslDependencyRoot)\lib</SaslDependencyLibDir>
<SaslIntermediateLibDir>$(SolutionDir)$(Platform)\$(Configuration)</SaslIntermediateLibDir>
<Krb5Dir>C:\msvc\krb</Krb5Dir>
</PropertyGroup>
diff --git a/win32/openssl.props b/win32/openssl.props
index 86c5c41..e0e2a86 100644
--- a/win32/openssl.props
+++ b/win32/openssl.props
@@ -6,7 +6,7 @@
</ClCompile>
<Link>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <AdditionalDependencies>libeay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(SaslDependencyLibDir)\libcrypto.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
</Project>
\ No newline at end of file
diff --git a/win32/sasl2.vcxproj b/win32/sasl2.vcxproj
index 42f1990..b3715f0 100644
--- a/win32/sasl2.vcxproj
+++ b/win32/sasl2.vcxproj
@@ -75,10 +75,18 @@
<Import Project="openssl.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <TargetName>libsasl_debug</TargetName>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <TargetName>libsasl</TargetName>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <TargetName>libsasl_debug</TargetName>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <TargetName>libsasl</TargetName>
+ </PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
diff --git a/win32/sasldb.props b/win32/sasldb.props
index 84591c9..42922e7 100644
--- a/win32/sasldb.props
+++ b/win32/sasldb.props
@@ -6,7 +6,7 @@
</ClCompile>
<Link>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <AdditionalDependencies>lmdb.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>liblmdb_a.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
</Project>
\ No newline at end of file
diff --git a/win32/sasldb.vcxproj b/win32/sasldb.vcxproj
index 265e03f..7a263b0 100644
--- a/win32/sasldb.vcxproj
+++ b/win32/sasldb.vcxproj
@@ -125,7 +125,7 @@
<SDLCheck>true</SDLCheck>
</ClCompile>
<Lib>
- <AdditionalDependencies>lmdb.lib</AdditionalDependencies>
+ <AdditionalDependencies>liblmdb_a.lib</AdditionalDependencies>
</Lib>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -135,7 +135,7 @@
<SDLCheck>true</SDLCheck>
</ClCompile>
<Lib>
- <AdditionalDependencies>lmdb.lib</AdditionalDependencies>
+ <AdditionalDependencies>liblmdb_a.lib</AdditionalDependencies>
</Lib>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -151,7 +151,7 @@
<OptimizeReferences>true</OptimizeReferences>
</Link>
<Lib>
- <AdditionalDependencies>lmdb.lib</AdditionalDependencies>
+ <AdditionalDependencies>liblmdb_a.lib</AdditionalDependencies>
</Lib>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -167,7 +167,7 @@
<OptimizeReferences>true</OptimizeReferences>
</Link>
<Lib>
- <AdditionalDependencies>lmdb.lib</AdditionalDependencies>
+ <AdditionalDependencies>liblmdb_a.lib</AdditionalDependencies>
</Lib>
</ItemDefinitionGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />