Skip to content

Commit 566095b

Browse files
charleneaugercharleneauger
committed
build(projet): update libs path
1 parent a31af27 commit 566095b

File tree

5 files changed

+20
-20
lines changed

5 files changed

+20
-20
lines changed

‎Agent/OCSInventory.vcxproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@
142142
<AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
143143
</ResourceCompile>
144144
<Link>
145-
<AdditionalDependencies>Wsnmp32.lib;Wsock32.lib;..\External_Deps\libeay32.lib;..\External_Deps\ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
145+
<AdditionalDependencies>Wsnmp32.lib;Wsock32.lib;..\External_Deps\libcrypto.lib;..\External_Deps\libssl.lib;%(AdditionalDependencies)</AdditionalDependencies>
146146
<OutputFile>$(OutDir)OCSInventory.exe</OutputFile>
147147
<GenerateDebugInformation>true</GenerateDebugInformation>
148148
<SubSystem>Windows</SubSystem>
@@ -172,7 +172,7 @@
172172
<AdditionalManifestDependencies>
173173
</AdditionalManifestDependencies>
174174
<OptimizeReferences>true</OptimizeReferences>
175-
<AdditionalDependencies>Wsnmp32.lib;Wsock32.lib;..\External_Deps\libeay32.lib;..\External_Deps\ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
175+
<AdditionalDependencies>Wsnmp32.lib;Wsock32.lib;..\External_Deps\libcrypto.lib;..\External_Deps\libssl.lib;%(AdditionalDependencies)</AdditionalDependencies>
176176
</Link>
177177
<ResourceCompile>
178178
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

‎ComHTTP/ComHTTP.vcxproj

+4-4
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@
122122
<MkTypLibCompatible>false</MkTypLibCompatible>
123123
</Midl>
124124
<ClCompile>
125-
<AdditionalIncludeDirectories>..\External_Deps\openssl-1.0.2r\inc32;..\External_Deps\curl-7.64.1\include;..\External_Deps\tinyxml;..\OCSInventory Front;..\OcsWmi;..\SysInfo;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
125+
<AdditionalIncludeDirectories>..\External_Deps\openssl-1.1.1w\out32\include;..\External_Deps\curl-7.88.1\include;..\External_Deps\tinyxml;..\OCSInventory Front;..\OcsWmi;..\SysInfo;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
126126
<PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;_USRDLL;_AFX_NO_DB_SUPPORT;_AFX_NO_DAO_SUPPORT;_CRT_SECURE_NO_DEPRECATE;_BIND_TO_CURRENT_VCLIBS_VERSION;OCS_PROVIDER_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
127127
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
128128
<PrecompiledHeader />
@@ -136,7 +136,7 @@
136136
<AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
137137
</ResourceCompile>
138138
<Link>
139-
<AdditionalDependencies>..\External_Deps\libeay32.lib;..\External_Deps\libcurl.lib;%(AdditionalDependencies)</AdditionalDependencies>
139+
<AdditionalDependencies>..\External_Deps\libcrypto.lib;..\External_Deps\libcurl.lib;%(AdditionalDependencies)</AdditionalDependencies>
140140
<OutputFile>$(OutDir)$(ProjectName).dll</OutputFile>
141141
<ModuleDefinitionFile />
142142
<GenerateDebugInformation>true</GenerateDebugInformation>
@@ -150,7 +150,7 @@
150150
</ItemDefinitionGroup>
151151
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
152152
<ClCompile>
153-
<AdditionalIncludeDirectories>..\External_Deps\openssl-1.0.2r\inc32;..\External_Deps\curl-7.64.1\include;..\External_Deps\tinyxml;..\OCSInventory Front;..\OcsWmi;..\SysInfo;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
153+
<AdditionalIncludeDirectories>..\External_Deps\openssl-1.1.1w\out\include;..\External_Deps\curl-7.88.1\include;..\External_Deps\tinyxml;..\OCSInventory Front;..\OcsWmi;..\SysInfo;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
154154
</ClCompile>
155155
</ItemDefinitionGroup>
156156
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -160,7 +160,7 @@
160160
</ClCompile>
161161
<Link>
162162
<OutputFile>$(OutDir)$(ProjectName).dll</OutputFile>
163-
<AdditionalDependencies>..\External_Deps\libeay32.lib;..\External_Deps\libcurl.lib;%(AdditionalDependencies)</AdditionalDependencies>
163+
<AdditionalDependencies>..\External_Deps\libcrypto.lib;..\External_Deps\libcurl.lib;%(AdditionalDependencies)</AdditionalDependencies>
164164
<GenerateDebugInformation>true</GenerateDebugInformation>
165165
<SubSystem>Windows</SubSystem>
166166
<OptimizeReferences>true</OptimizeReferences>

‎OCSInventory Front/OCSInventory Front.vcxproj

+4-4
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@
123123
<MkTypLibCompatible>false</MkTypLibCompatible>
124124
</Midl>
125125
<ClCompile>
126-
<AdditionalIncludeDirectories>..\External_Deps\zlib-1.2.8;..\External_Deps\openssl-1.0.2r\inc32;..\External_Deps\tinyxml;../OcsWmi;..\Sysinfo;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
126+
<AdditionalIncludeDirectories>..\External_Deps\zlib-1.3.1;..\External_Deps\openssl-1.1.1w\out32\include;..\External_Deps\tinyxml;../OcsWmi;..\Sysinfo;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
127127
<PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;_USRDLL;_AFX_NO_DB_SUPPORT;_AFX_NO_DAO_SUPPORT;_CRT_SECURE_NO_DEPRECATE;_BIND_TO_CURRENT_VCLIBS_VERSION;OCSINVENTORYFRONT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
128128
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
129129
<PrecompiledHeader />
@@ -137,7 +137,7 @@
137137
<AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
138138
</ResourceCompile>
139139
<Link>
140-
<AdditionalDependencies>..\External_Deps\zdll.lib;..\External_Deps\libeay32.lib;WtsApi32.lib;Userenv.lib;mfcs140u.lib;MSVCRT.lib;%(AdditionalDependencies)</AdditionalDependencies>
140+
<AdditionalDependencies>..\External_Deps\zdll.lib;..\External_Deps\libcrypto.lib;WtsApi32.lib;Userenv.lib;mfcs140u.lib;MSVCRT.lib;%(AdditionalDependencies)</AdditionalDependencies>
141141
<ModuleDefinitionFile />
142142
<GenerateDebugInformation>true</GenerateDebugInformation>
143143
<SubSystem>Windows</SubSystem>
@@ -150,7 +150,7 @@
150150
</ItemDefinitionGroup>
151151
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
152152
<ClCompile>
153-
<AdditionalIncludeDirectories>..\External_Deps\zlib-1.2.8;..\External_Deps\openssl-1.0.2r\inc32;..\External_Deps\tinyxml;../OcsWmi;..\Sysinfo;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
153+
<AdditionalIncludeDirectories>..\External_Deps\zlib-1.3.1;..\External_Deps\openssl-1.1.1w\out\include;..\External_Deps\tinyxml;../OcsWmi;..\Sysinfo;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
154154
</ClCompile>
155155
</ItemDefinitionGroup>
156156
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -159,7 +159,7 @@
159159
<PreprocessorDefinitions>_WIN64;_WINDOWS;NDEBUG;_USRDLL;_AFX_NO_DB_SUPPORT;_AFX_NO_DAO_SUPPORT;_CRT_SECURE_NO_DEPRECATE;_BIND_TO_CURRENT_VCLIBS_VERSION;OCSINVENTORYFRONT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
160160
</ClCompile>
161161
<Link>
162-
<AdditionalDependencies>..\External_Deps\zdll.lib;..\External_Deps\libeay32.lib;WtsApi32.lib;Userenv.lib;mfcs140u.lib;MSVCRT.lib;%(AdditionalDependencies)</AdditionalDependencies>
162+
<AdditionalDependencies>..\External_Deps\zdll.lib;..\External_Deps\libcrypto.lib;WtsApi32.lib;Userenv.lib;mfcs140u.lib;MSVCRT.lib;%(AdditionalDependencies)</AdditionalDependencies>
163163
<GenerateDebugInformation>true</GenerateDebugInformation>
164164
<SubSystem>Windows</SubSystem>
165165
<OptimizeReferences>true</OptimizeReferences>

‎Service/Service.vcxproj

+6-6
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@
110110
<ClCompile>
111111
<Optimization>MaxSpeed</Optimization>
112112
<IntrinsicFunctions>true</IntrinsicFunctions>
113-
<AdditionalIncludeDirectories>..\External_Deps\openssl-1.0.2r\inc32;..\External_Deps\ZipArchive;..\OcsWmi;..\Sysinfo;..\OCSInventory Front;..\External_Deps\tinyxml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
113+
<AdditionalIncludeDirectories>..\External_Deps\openssl-1.1.1w\out32\include;..\External_Deps\ZipArchive;..\OcsWmi;..\Sysinfo;..\OCSInventory Front;..\External_Deps\tinyxml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
114114
<PreprocessorDefinitions>WIN32;_CONSOLE;NDEBUG;_BIND_TO_CURRENT_VCLIBS_VERSION;%(PreprocessorDefinitions)</PreprocessorDefinitions>
115115
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
116116
<FunctionLevelLinking>true</FunctionLevelLinking>
@@ -119,7 +119,7 @@
119119
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
120120
</ClCompile>
121121
<Link>
122-
<AdditionalDependencies>..\External_Deps\libeay32.lib;..\External_Deps\ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
122+
<AdditionalDependencies>..\External_Deps\libcrypto.lib;..\External_Deps\libssl.lib;%(AdditionalDependencies)</AdditionalDependencies>
123123
<OutputFile>$(OutDir)OcsService.exe</OutputFile>
124124
<GenerateDebugInformation>true</GenerateDebugInformation>
125125
<SubSystem>Console</SubSystem>
@@ -137,7 +137,7 @@
137137
</ItemDefinitionGroup>
138138
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
139139
<ClCompile>
140-
<AdditionalIncludeDirectories>..\External_Deps\openssl-1.0.2r\inc32;..\External_Deps\ZipArchive;..\OcsWmi;..\Sysinfo;..\OCSInventory Front;..\External_Deps\tinyxml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
140+
<AdditionalIncludeDirectories>..\External_Deps\openssl-1.1.1w\out\include;..\External_Deps\ZipArchive;..\OcsWmi;..\Sysinfo;..\OCSInventory Front;..\External_Deps\tinyxml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
141141
</ClCompile>
142142
</ItemDefinitionGroup>
143143
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -149,7 +149,7 @@
149149
</ClCompile>
150150
<Link>
151151
<OutputFile>$(OutDir)OcsService.exe</OutputFile>
152-
<AdditionalDependencies>..\External_Deps\libeay32.lib;..\External_Deps\ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
152+
<AdditionalDependencies>..\External_Deps\libcrypto.lib;..\External_Deps\libssl.lib;%(AdditionalDependencies)</AdditionalDependencies>
153153
<GenerateDebugInformation>true</GenerateDebugInformation>
154154
<SubSystem>Console</SubSystem>
155155
<OptimizeReferences>true</OptimizeReferences>
@@ -183,10 +183,10 @@
183183
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"C:\Program Files (x86)\Microsoft SDKs\Windows\v7.1A\bin\mc.exe" %(Filename)%(Extension)
184184
</Command>
185185
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(RootDir)%(Directory)\%(Filename).h;%(Outputs)</Outputs>
186-
<Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"C:\Program Files (x86)\Windows Kits\10\bin\10.0.18362.0\x86\mc.exe" %(Filename)%(Extension)
186+
<Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"C:\Program Files (x86)\Windows Kits\10\bin\10.0.26100.0\x86\mc.exe" %(Filename)%(Extension)
187187
</Command>
188188
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RootDir)%(Directory)\%(Filename).h;%(Outputs)</Outputs>
189-
<Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"C:\Program Files (x86)\Windows Kits\10\bin\10.0.19041.0\x64\mc.exe" %(Filename)%(Extension)
189+
<Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"C:\Program Files (x86)\Windows Kits\10\bin\10.0.26100.0\x64\mc.exe" %(Filename)%(Extension)
190190
</Command>
191191
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)%(Directory)\%(Filename).h;%(Outputs)</Outputs>
192192
</CustomBuild>

‎SysInfo/SysInfo.vcxproj

+4-4
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@
121121
<MkTypLibCompatible>false</MkTypLibCompatible>
122122
</Midl>
123123
<ClCompile>
124-
<AdditionalIncludeDirectories>..\OcsWmi;..\External_Deps\openssl-1.0.2r\inc32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
124+
<AdditionalIncludeDirectories>..\OcsWmi;..\External_Deps\openssl-1.1.1w\out32\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
125125
<PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;_USRDLL;_AFX_NO_DB_SUPPORT;_AFX_NO_DAO_SUPPORT;_CRT_SECURE_NO_DEPRECATE;_BIND_TO_CURRENT_VCLIBS_VERSION;SYSINFO_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
126126
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
127127
<PrecompiledHeader />
@@ -135,7 +135,7 @@
135135
<AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
136136
</ResourceCompile>
137137
<Link>
138-
<AdditionalDependencies>..\External_Deps\libeay32.lib;wbemuuid.lib;%(AdditionalDependencies)</AdditionalDependencies>
138+
<AdditionalDependencies>..\External_Deps\libcrypto.lib;wbemuuid.lib;%(AdditionalDependencies)</AdditionalDependencies>
139139
<ModuleDefinitionFile />
140140
<GenerateDebugInformation>true</GenerateDebugInformation>
141141
<SubSystem>Windows</SubSystem>
@@ -148,7 +148,7 @@
148148
</ItemDefinitionGroup>
149149
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
150150
<ClCompile>
151-
<AdditionalIncludeDirectories>..\OcsWmi;..\External_Deps\openssl-1.0.2r\inc32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
151+
<AdditionalIncludeDirectories>..\OcsWmi;..\External_Deps\openssl-1.1.1w\out\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
152152
</ClCompile>
153153
</ItemDefinitionGroup>
154154
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -157,7 +157,7 @@
157157
<PreprocessorDefinitions>_WIN64;_WINDOWS;NDEBUG;_USRDLL;_AFX_NO_DB_SUPPORT;_AFX_NO_DAO_SUPPORT;_CRT_SECURE_NO_DEPRECATE;_BIND_TO_CURRENT_VCLIBS_VERSION;SYSINFO_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
158158
</ClCompile>
159159
<Link>
160-
<AdditionalDependencies>..\External_Deps\libeay32.lib;wbemuuid.lib;%(AdditionalDependencies)</AdditionalDependencies>
160+
<AdditionalDependencies>..\External_Deps\libcrypto.lib;wbemuuid.lib;%(AdditionalDependencies)</AdditionalDependencies>
161161
<GenerateDebugInformation>true</GenerateDebugInformation>
162162
<SubSystem>Windows</SubSystem>
163163
<OptimizeReferences>true</OptimizeReferences>

0 commit comments

Comments
 (0)