Skip to content

Commit 3760840

Browse files
committed
Updates to project files to move _NT target to 0x600
1 parent 7ca0534 commit 3760840

28 files changed

+229
-171
lines changed

contrib/win32/openssh/Win32-OpenSSH.sln

Lines changed: 0 additions & 96 deletions
Original file line numberDiff line numberDiff line change
@@ -45,30 +45,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sftp", "sftp.vcxproj", "{BB
4545
{8660C2FE-9874-432D-B047-E042BB41DBE0} = {8660C2FE-9874-432D-B047-E042BB41DBE0}
4646
EndProjectSection
4747
EndProject
48-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ssh-add", "ssh-add.vcxproj", "{029797FF-C986-43DE-95CD-2E771E86AEBC}"
49-
ProjectSection(ProjectDependencies) = postProject
50-
{05E1115F-8529-46D0-AAAF-52A404CE79A7} = {05E1115F-8529-46D0-AAAF-52A404CE79A7}
51-
{8F9D3B74-8D33-448E-9762-26E8DCC6B2F4} = {8F9D3B74-8D33-448E-9762-26E8DCC6B2F4}
52-
{DD483F7D-C553-4740-BC1A-903805AD0174} = {DD483F7D-C553-4740-BC1A-903805AD0174}
53-
{8660C2FE-9874-432D-B047-E042BB41DBE0} = {8660C2FE-9874-432D-B047-E042BB41DBE0}
54-
EndProjectSection
55-
EndProject
56-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ssh-agent", "ssh-agent.vcxproj", "{02E88337-C701-453B-90D8-31988C276937}"
57-
ProjectSection(ProjectDependencies) = postProject
58-
{05E1115F-8529-46D0-AAAF-52A404CE79A7} = {05E1115F-8529-46D0-AAAF-52A404CE79A7}
59-
{8F9D3B74-8D33-448E-9762-26E8DCC6B2F4} = {8F9D3B74-8D33-448E-9762-26E8DCC6B2F4}
60-
{DD483F7D-C553-4740-BC1A-903805AD0174} = {DD483F7D-C553-4740-BC1A-903805AD0174}
61-
{8660C2FE-9874-432D-B047-E042BB41DBE0} = {8660C2FE-9874-432D-B047-E042BB41DBE0}
62-
EndProjectSection
63-
EndProject
64-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ssh-pkcs11-helper", "ssh-pkcs11-helper.vcxproj", "{C3C50D2E-7A16-43A9-8A4B-F67CEA1B634F}"
65-
ProjectSection(ProjectDependencies) = postProject
66-
{05E1115F-8529-46D0-AAAF-52A404CE79A7} = {05E1115F-8529-46D0-AAAF-52A404CE79A7}
67-
{8F9D3B74-8D33-448E-9762-26E8DCC6B2F4} = {8F9D3B74-8D33-448E-9762-26E8DCC6B2F4}
68-
{DD483F7D-C553-4740-BC1A-903805AD0174} = {DD483F7D-C553-4740-BC1A-903805AD0174}
69-
{8660C2FE-9874-432D-B047-E042BB41DBE0} = {8660C2FE-9874-432D-B047-E042BB41DBE0}
70-
EndProjectSection
71-
EndProject
7248
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sftp-server", "sftp-server.vcxproj", "{6657614F-7821-4D55-96EF-7C3C4B551880}"
7349
ProjectSection(ProjectDependencies) = postProject
7450
{05E1115F-8529-46D0-AAAF-52A404CE79A7} = {05E1115F-8529-46D0-AAAF-52A404CE79A7}
@@ -78,22 +54,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sftp-server", "sftp-server.
7854
{8660C2FE-9874-432D-B047-E042BB41DBE0} = {8660C2FE-9874-432D-B047-E042BB41DBE0}
7955
EndProjectSection
8056
EndProject
81-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ssh-keyscan", "ssh-keyscan.vcxproj", "{D6A23380-8970-4E05-B132-A61283CCE588}"
82-
ProjectSection(ProjectDependencies) = postProject
83-
{05E1115F-8529-46D0-AAAF-52A404CE79A7} = {05E1115F-8529-46D0-AAAF-52A404CE79A7}
84-
{8F9D3B74-8D33-448E-9762-26E8DCC6B2F4} = {8F9D3B74-8D33-448E-9762-26E8DCC6B2F4}
85-
{DD483F7D-C553-4740-BC1A-903805AD0174} = {DD483F7D-C553-4740-BC1A-903805AD0174}
86-
{8660C2FE-9874-432D-B047-E042BB41DBE0} = {8660C2FE-9874-432D-B047-E042BB41DBE0}
87-
EndProjectSection
88-
EndProject
89-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ssh-keysign", "ssh-keysign.vcxproj", "{23B9D630-B86E-410D-9B39-CBDEF1AD4F52}"
90-
ProjectSection(ProjectDependencies) = postProject
91-
{05E1115F-8529-46D0-AAAF-52A404CE79A7} = {05E1115F-8529-46D0-AAAF-52A404CE79A7}
92-
{8F9D3B74-8D33-448E-9762-26E8DCC6B2F4} = {8F9D3B74-8D33-448E-9762-26E8DCC6B2F4}
93-
{DD483F7D-C553-4740-BC1A-903805AD0174} = {DD483F7D-C553-4740-BC1A-903805AD0174}
94-
{8660C2FE-9874-432D-B047-E042BB41DBE0} = {8660C2FE-9874-432D-B047-E042BB41DBE0}
95-
EndProjectSection
96-
EndProject
9757
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sshd", "sshd.vcxproj", "{F58FF6BA-098B-4DB9-9609-A030DFB4D03F}"
9858
ProjectSection(ProjectDependencies) = postProject
9959
{05E1115F-8529-46D0-AAAF-52A404CE79A7} = {05E1115F-8529-46D0-AAAF-52A404CE79A7}
@@ -107,14 +67,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "config", "config.vcxproj",
10767
EndProject
10868
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ssh-lsa", "ssh-lsa.vcxproj", "{02FB3D98-6516-42C6-9762-98811A99960F}"
10969
EndProject
110-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scp", "scp.vcxproj", "{29B98ADF-1285-49CE-BF6C-AA92C5D2FB24}"
111-
ProjectSection(ProjectDependencies) = postProject
112-
{05E1115F-8529-46D0-AAAF-52A404CE79A7} = {05E1115F-8529-46D0-AAAF-52A404CE79A7}
113-
{8F9D3B74-8D33-448E-9762-26E8DCC6B2F4} = {8F9D3B74-8D33-448E-9762-26E8DCC6B2F4}
114-
{DD483F7D-C553-4740-BC1A-903805AD0174} = {DD483F7D-C553-4740-BC1A-903805AD0174}
115-
{8660C2FE-9874-432D-B047-E042BB41DBE0} = {8660C2FE-9874-432D-B047-E042BB41DBE0}
116-
EndProjectSection
117-
EndProject
11870
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "win32compatUnittests", "win32compatUnittests.vcxproj", "{780CAFE4-4BC5-407B-B3A6-71C4114826A7}"
11971
ProjectSection(ProjectDependencies) = postProject
12072
{05E1115F-8529-46D0-AAAF-52A404CE79A7} = {05E1115F-8529-46D0-AAAF-52A404CE79A7}
@@ -182,30 +134,6 @@ Global
182134
{BBEFF9D7-0BC3-41D1-908B-8052158B5052}.Release|x64.Build.0 = Release|x64
183135
{BBEFF9D7-0BC3-41D1-908B-8052158B5052}.Release|x86.ActiveCfg = Release|Win32
184136
{BBEFF9D7-0BC3-41D1-908B-8052158B5052}.Release|x86.Build.0 = Release|Win32
185-
{029797FF-C986-43DE-95CD-2E771E86AEBC}.Debug|x64.ActiveCfg = Debug|x64
186-
{029797FF-C986-43DE-95CD-2E771E86AEBC}.Debug|x64.Build.0 = Debug|x64
187-
{029797FF-C986-43DE-95CD-2E771E86AEBC}.Debug|x86.ActiveCfg = Debug|Win32
188-
{029797FF-C986-43DE-95CD-2E771E86AEBC}.Debug|x86.Build.0 = Debug|Win32
189-
{029797FF-C986-43DE-95CD-2E771E86AEBC}.Release|x64.ActiveCfg = Release|x64
190-
{029797FF-C986-43DE-95CD-2E771E86AEBC}.Release|x64.Build.0 = Release|x64
191-
{029797FF-C986-43DE-95CD-2E771E86AEBC}.Release|x86.ActiveCfg = Release|Win32
192-
{029797FF-C986-43DE-95CD-2E771E86AEBC}.Release|x86.Build.0 = Release|Win32
193-
{02E88337-C701-453B-90D8-31988C276937}.Debug|x64.ActiveCfg = Debug|x64
194-
{02E88337-C701-453B-90D8-31988C276937}.Debug|x64.Build.0 = Debug|x64
195-
{02E88337-C701-453B-90D8-31988C276937}.Debug|x86.ActiveCfg = Debug|Win32
196-
{02E88337-C701-453B-90D8-31988C276937}.Debug|x86.Build.0 = Debug|Win32
197-
{02E88337-C701-453B-90D8-31988C276937}.Release|x64.ActiveCfg = Release|x64
198-
{02E88337-C701-453B-90D8-31988C276937}.Release|x64.Build.0 = Release|x64
199-
{02E88337-C701-453B-90D8-31988C276937}.Release|x86.ActiveCfg = Release|Win32
200-
{02E88337-C701-453B-90D8-31988C276937}.Release|x86.Build.0 = Release|Win32
201-
{C3C50D2E-7A16-43A9-8A4B-F67CEA1B634F}.Debug|x64.ActiveCfg = Debug|x64
202-
{C3C50D2E-7A16-43A9-8A4B-F67CEA1B634F}.Debug|x64.Build.0 = Debug|x64
203-
{C3C50D2E-7A16-43A9-8A4B-F67CEA1B634F}.Debug|x86.ActiveCfg = Debug|Win32
204-
{C3C50D2E-7A16-43A9-8A4B-F67CEA1B634F}.Debug|x86.Build.0 = Debug|Win32
205-
{C3C50D2E-7A16-43A9-8A4B-F67CEA1B634F}.Release|x64.ActiveCfg = Release|x64
206-
{C3C50D2E-7A16-43A9-8A4B-F67CEA1B634F}.Release|x64.Build.0 = Release|x64
207-
{C3C50D2E-7A16-43A9-8A4B-F67CEA1B634F}.Release|x86.ActiveCfg = Release|Win32
208-
{C3C50D2E-7A16-43A9-8A4B-F67CEA1B634F}.Release|x86.Build.0 = Release|Win32
209137
{6657614F-7821-4D55-96EF-7C3C4B551880}.Debug|x64.ActiveCfg = Debug|x64
210138
{6657614F-7821-4D55-96EF-7C3C4B551880}.Debug|x64.Build.0 = Debug|x64
211139
{6657614F-7821-4D55-96EF-7C3C4B551880}.Debug|x86.ActiveCfg = Debug|Win32
@@ -214,22 +142,6 @@ Global
214142
{6657614F-7821-4D55-96EF-7C3C4B551880}.Release|x64.Build.0 = Release|x64
215143
{6657614F-7821-4D55-96EF-7C3C4B551880}.Release|x86.ActiveCfg = Release|Win32
216144
{6657614F-7821-4D55-96EF-7C3C4B551880}.Release|x86.Build.0 = Release|Win32
217-
{D6A23380-8970-4E05-B132-A61283CCE588}.Debug|x64.ActiveCfg = Debug|x64
218-
{D6A23380-8970-4E05-B132-A61283CCE588}.Debug|x64.Build.0 = Debug|x64
219-
{D6A23380-8970-4E05-B132-A61283CCE588}.Debug|x86.ActiveCfg = Debug|Win32
220-
{D6A23380-8970-4E05-B132-A61283CCE588}.Debug|x86.Build.0 = Debug|Win32
221-
{D6A23380-8970-4E05-B132-A61283CCE588}.Release|x64.ActiveCfg = Release|x64
222-
{D6A23380-8970-4E05-B132-A61283CCE588}.Release|x64.Build.0 = Release|x64
223-
{D6A23380-8970-4E05-B132-A61283CCE588}.Release|x86.ActiveCfg = Release|Win32
224-
{D6A23380-8970-4E05-B132-A61283CCE588}.Release|x86.Build.0 = Release|Win32
225-
{23B9D630-B86E-410D-9B39-CBDEF1AD4F52}.Debug|x64.ActiveCfg = Debug|x64
226-
{23B9D630-B86E-410D-9B39-CBDEF1AD4F52}.Debug|x64.Build.0 = Debug|x64
227-
{23B9D630-B86E-410D-9B39-CBDEF1AD4F52}.Debug|x86.ActiveCfg = Debug|Win32
228-
{23B9D630-B86E-410D-9B39-CBDEF1AD4F52}.Debug|x86.Build.0 = Debug|Win32
229-
{23B9D630-B86E-410D-9B39-CBDEF1AD4F52}.Release|x64.ActiveCfg = Release|x64
230-
{23B9D630-B86E-410D-9B39-CBDEF1AD4F52}.Release|x64.Build.0 = Release|x64
231-
{23B9D630-B86E-410D-9B39-CBDEF1AD4F52}.Release|x86.ActiveCfg = Release|Win32
232-
{23B9D630-B86E-410D-9B39-CBDEF1AD4F52}.Release|x86.Build.0 = Release|Win32
233145
{F58FF6BA-098B-4DB9-9609-A030DFB4D03F}.Debug|x64.ActiveCfg = Debug|x64
234146
{F58FF6BA-098B-4DB9-9609-A030DFB4D03F}.Debug|x64.Build.0 = Debug|x64
235147
{F58FF6BA-098B-4DB9-9609-A030DFB4D03F}.Debug|x86.ActiveCfg = Debug|Win32
@@ -254,14 +166,6 @@ Global
254166
{02FB3D98-6516-42C6-9762-98811A99960F}.Release|x64.Build.0 = Release|x64
255167
{02FB3D98-6516-42C6-9762-98811A99960F}.Release|x86.ActiveCfg = Release|Win32
256168
{02FB3D98-6516-42C6-9762-98811A99960F}.Release|x86.Build.0 = Release|Win32
257-
{29B98ADF-1285-49CE-BF6C-AA92C5D2FB24}.Debug|x64.ActiveCfg = Debug|x64
258-
{29B98ADF-1285-49CE-BF6C-AA92C5D2FB24}.Debug|x64.Build.0 = Debug|x64
259-
{29B98ADF-1285-49CE-BF6C-AA92C5D2FB24}.Debug|x86.ActiveCfg = Debug|Win32
260-
{29B98ADF-1285-49CE-BF6C-AA92C5D2FB24}.Debug|x86.Build.0 = Debug|Win32
261-
{29B98ADF-1285-49CE-BF6C-AA92C5D2FB24}.Release|x64.ActiveCfg = Release|x64
262-
{29B98ADF-1285-49CE-BF6C-AA92C5D2FB24}.Release|x64.Build.0 = Release|x64
263-
{29B98ADF-1285-49CE-BF6C-AA92C5D2FB24}.Release|x86.ActiveCfg = Release|Win32
264-
{29B98ADF-1285-49CE-BF6C-AA92C5D2FB24}.Release|x86.Build.0 = Release|Win32
265169
{780CAFE4-4BC5-407B-B3A6-71C4114826A7}.Debug|x64.ActiveCfg = Debug|x64
266170
{780CAFE4-4BC5-407B-B3A6-71C4114826A7}.Debug|x64.Build.0 = Debug|x64
267171
{780CAFE4-4BC5-407B-B3A6-71C4114826A7}.Debug|x86.ActiveCfg = Debug|Win32

contrib/win32/openssh/config.h.vs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -529,7 +529,7 @@
529529
/* #undef HAVE_INET_NTOA */
530530

531531
/* Define to 1 if you have the `inet_ntop' function. */
532-
/* #undef HAVE_INET_NTOP */
532+
#define HAVE_INET_NTOP 1
533533

534534
/* Define to 1 if you have the `innetgr' function. */
535535
/* #undef HAVE_INNETGR */
@@ -711,7 +711,7 @@
711711
#define HAVE_PID_T 1
712712

713713
/* Define to 1 if you have the `poll' function. */
714-
/* #undef HAVE_POLL */
714+
#define HAVE_POLL 1
715715

716716
/* Define to 1 if you have the <poll.h> header file. */
717717
/* #undef HAVE_POLL_H */
@@ -1017,7 +1017,7 @@
10171017
/* #undef HAVE_SYS_NERR */
10181018

10191019
/* Define to 1 if you have the <sys/poll.h> header file. */
1020-
/* #undef HAVE_SYS_POLL_H */
1020+
#define HAVE_SYS_POLL_H 1
10211021

10221022
/* Define to 1 if you have the <sys/prctl.h> header file. */
10231023
/* #undef HAVE_SYS_PRCTL_H */
@@ -1056,7 +1056,7 @@
10561056
/* #undef HAVE_SYS_TIMERS_H */
10571057

10581058
/* Define to 1 if you have the <sys/time.h> header file. */
1059-
/* #undef HAVE_SYS_TIME_H
1059+
#define HAVE_SYS_TIME_H 1
10601060

10611061
/* Define to 1 if you have the <sys/types.h> header file. */
10621062
#define HAVE_SYS_TYPES_H 1
@@ -1707,6 +1707,7 @@ struct iovec
17071707

17081708
// define building with MS Visual Studio Compiler and runtime and not with MingW/gcc compiler
17091709
#define WIN32_VS 1
1710+
#define __STDC__ 1
17101711
// Use Pragma Systems Remote Console modules for shell sessions so that cmd/powershell fully
17111712
// works remotely over SSH like they operate in a local machine
17121713
//#define WIN32_PRAGMA_REMCON

contrib/win32/openssh/keygen.vcxproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@
101101
</PrecompiledHeader>
102102
<WarningLevel>Level1</WarningLevel>
103103
<Optimization>Disabled</Optimization>
104-
<PreprocessorDefinitions>_WIN32_WINNT=0x501;WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
104+
<PreprocessorDefinitions>_WIN32_WINNT=0x600;WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
105105
<SDLCheck>false</SDLCheck>
106106
<AdditionalIncludeDirectories>$(SolutionDir);$(OpenSSL-Win32-Debug-Path)include;$(OpenSSH-Src-Path)includes;$(OpenSSH-Src-Path);$(OpenSSH-Src-Path)contrib\win32\win32compat\includes;$(OpenSSH-Src-Path)contrib\win32\win32compat;$(OpenSSH-Src-Path)libkrb;$(OpenSSH-Src-Path)libkrb\libKrb5;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
107107
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -120,7 +120,7 @@
120120
</PrecompiledHeader>
121121
<WarningLevel>Level1</WarningLevel>
122122
<Optimization>Disabled</Optimization>
123-
<PreprocessorDefinitions>_WIN32_WINNT=0x501;WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
123+
<PreprocessorDefinitions>_WIN32_WINNT=0x600;WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
124124
<SDLCheck>false</SDLCheck>
125125
<AdditionalIncludeDirectories>$(SolutionDir);$(OpenSSL-x64-Debug-Path)include;$(OpenSSH-Src-Path)includes;$(OpenSSH-Src-Path);$(OpenSSH-Src-Path)contrib\win32\win32compat\includes;$(OpenSSH-Src-Path)contrib\win32\win32compat;$(OpenSSH-Src-Path)libkrb;$(OpenSSH-Src-Path)libkrb\libKrb5;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
126126
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -141,7 +141,7 @@
141141
<Optimization>MaxSpeed</Optimization>
142142
<FunctionLevelLinking>true</FunctionLevelLinking>
143143
<IntrinsicFunctions>true</IntrinsicFunctions>
144-
<PreprocessorDefinitions>_WIN32_WINNT=0x501;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
144+
<PreprocessorDefinitions>_WIN32_WINNT=0x600;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
145145
<SDLCheck>false</SDLCheck>
146146
<AdditionalIncludeDirectories>$(SolutionDir);$(OpenSSL-Win32-Release-Path)include;$(OpenSSH-Src-Path)includes;$(OpenSSH-Src-Path);$(OpenSSH-Src-Path)contrib\win32\win32compat\includes;$(OpenSSH-Src-Path)contrib\win32\win32compat;$(OpenSSH-Src-Path)libkrb;$(OpenSSH-Src-Path)libkrb\libKrb5;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
147147
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -163,7 +163,7 @@
163163
<Optimization>MaxSpeed</Optimization>
164164
<FunctionLevelLinking>true</FunctionLevelLinking>
165165
<IntrinsicFunctions>true</IntrinsicFunctions>
166-
<PreprocessorDefinitions>_WIN32_WINNT=0x501;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
166+
<PreprocessorDefinitions>_WIN32_WINNT=0x600;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
167167
<SDLCheck>false</SDLCheck>
168168
<AdditionalIncludeDirectories>$(SolutionDir);$(OpenSSL-x64-Release-Path)include;$(OpenSSH-Src-Path)includes;$(OpenSSH-Src-Path);$(OpenSSH-Src-Path)contrib\win32\win32compat\includes;$(OpenSSH-Src-Path)contrib\win32\win32compat;$(OpenSSH-Src-Path)libkrb;$(OpenSSH-Src-Path)libkrb\libKrb5;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
169169
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>

contrib/win32/openssh/libssh.vcxproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@
9595
<PrecompiledHeader>NotUsing</PrecompiledHeader>
9696
<WarningLevel>Level1</WarningLevel>
9797
<Optimization>Disabled</Optimization>
98-
<PreprocessorDefinitions>_WIN32_WINNT=0x501;WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
98+
<PreprocessorDefinitions>_WIN32_WINNT=0x600;WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
9999
<SDLCheck>false</SDLCheck>
100100
<AdditionalIncludeDirectories>$(SolutionDir);$(OpenSSL-Win32-Debug-Path)include;$(OpenSSH-Src-Path)includes;$(OpenSSH-Src-Path);$(OpenSSH-Src-Path)contrib\win32\win32compat\includes;$(OpenSSH-Src-Path)contrib\win32\win32compat;$(OpenSSH-Src-Path)libkrb;$(OpenSSH-Src-Path)libkrb\libKrb5;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
101101
<ExceptionHandling>false</ExceptionHandling>
@@ -113,7 +113,7 @@
113113
<PrecompiledHeader>NotUsing</PrecompiledHeader>
114114
<WarningLevel>Level1</WarningLevel>
115115
<Optimization>Disabled</Optimization>
116-
<PreprocessorDefinitions>_WIN32_WINNT=0x501;WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
116+
<PreprocessorDefinitions>_WIN32_WINNT=0x600;WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
117117
<SDLCheck>false</SDLCheck>
118118
<AdditionalIncludeDirectories>$(SolutionDir);$(OpenSSL-x64-Debug-Path)include;$(OpenSSH-Src-Path)includes;$(OpenSSH-Src-Path);$(OpenSSH-Src-Path)contrib\win32\win32compat\includes;$(OpenSSH-Src-Path)contrib\win32\win32compat;$(OpenSSH-Src-Path)libkrb;$(OpenSSH-Src-Path)libkrb\libKrb5;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
119119
<ExceptionHandling>false</ExceptionHandling>
@@ -133,7 +133,7 @@
133133
<Optimization>MaxSpeed</Optimization>
134134
<FunctionLevelLinking>true</FunctionLevelLinking>
135135
<IntrinsicFunctions>true</IntrinsicFunctions>
136-
<PreprocessorDefinitions>_WIN32_WINNT=0x501;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
136+
<PreprocessorDefinitions>_WIN32_WINNT=0x600;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
137137
<SDLCheck>false</SDLCheck>
138138
<AdditionalIncludeDirectories>$(SolutionDir);$(OpenSSL-Win32-Release-Path)include;$(OpenSSH-Src-Path)includes;$(OpenSSH-Src-Path);$(OpenSSH-Src-Path)contrib\win32\win32compat\includes;$(OpenSSH-Src-Path)contrib\win32\win32compat;$(OpenSSH-Src-Path)libkrb;$(OpenSSH-Src-Path)libkrb\libKrb5;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
139139
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -152,7 +152,7 @@
152152
<Optimization>MaxSpeed</Optimization>
153153
<FunctionLevelLinking>true</FunctionLevelLinking>
154154
<IntrinsicFunctions>true</IntrinsicFunctions>
155-
<PreprocessorDefinitions>_WIN32_WINNT=0x501;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
155+
<PreprocessorDefinitions>_WIN32_WINNT=0x600;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
156156
<SDLCheck>false</SDLCheck>
157157
<AdditionalIncludeDirectories>$(SolutionDir);$(OpenSSL-x64-Release-Path)include;$(OpenSSH-Src-Path)includes;$(OpenSSH-Src-Path);$(OpenSSH-Src-Path)contrib\win32\win32compat\includes;$(OpenSSH-Src-Path)contrib\win32\win32compat;$(OpenSSH-Src-Path)libkrb;$(OpenSSH-Src-Path)libkrb\libKrb5;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
158158
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>

0 commit comments

Comments
 (0)