1. clamav-devel
  2. Commit 42d20bf36dff1a0522fa2d45a5f29a6e8299bac3
Browse code

Fix lib path

Jake Fehr authored on 2017/05/03 07:07:04
Showing 3 changed files
win32/libclamav.vcxproj
History View file @ 42d20bf
... ... 
@@ -242,10 +242,10 @@
242 242 
       <OptimizeReferences>true</OptimizeReferences>
243 243 
       <AdditionalDependencies>ws2_32.lib;mspack.lib;%(AdditionalDependencies)</AdditionalDependencies>
244 244 
       <ModuleDefinitionFile>$(SolutionDir)libclamav.def</ModuleDefinitionFile>
245 
-      <AdditionalLibraryDirectories>$(CLAM_DEPENDENCIES)\$(PlatformName)\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
245 
+      <AdditionalLibraryDirectories>$(CLAM_DEPENDENCIES)\$(PlatformName)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
246 246 
     </Link>
247 247 
     <Lib>
248 
-      <AdditionalLibraryDirectories>$(CLAM_DEPENDENCIES)\$(PlatformName)\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
248 
+      <AdditionalLibraryDirectories>$(CLAM_DEPENDENCIES)\$(PlatformName)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
249 249 
     </Lib>
250 250 
   </ItemDefinitionGroup>
251 251 
   <ItemGroup>
win32/libclamunrar.vcxproj
History View file @ 42d20bf
... ... 
@@ -138,7 +138,7 @@
138 138 
       <SubSystem>Windows</SubSystem>
139 139 
       <GenerateDebugInformation>true</GenerateDebugInformation>
140 140 
       <ModuleDefinitionFile>$(SolutionDir)libclamunrar.def</ModuleDefinitionFile>
141 
-      <AdditionalLibraryDirectories>$(CLAM_DEPENDENCIES)\$(PlatformName)\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
141 
+      <AdditionalLibraryDirectories>$(CLAM_DEPENDENCIES)\$(PlatformName)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
142 142 
     </Link>
143 143 
   </ItemDefinitionGroup>
144 144 
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
... ... 
@@ -155,7 +155,7 @@
155 155 
       <SubSystem>Windows</SubSystem>
156 156 
       <GenerateDebugInformation>true</GenerateDebugInformation>
157 157 
       <ModuleDefinitionFile>$(SolutionDir)libclamunrar.def</ModuleDefinitionFile>
158 
-      <AdditionalLibraryDirectories>$(CLAM_DEPENDENCIES)\$(PlatformName)\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
158 
+      <AdditionalLibraryDirectories>$(CLAM_DEPENDENCIES)\$(PlatformName)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
159 159 
     </Link>
160 160 
   </ItemDefinitionGroup>
161 161 
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
... ... 
@@ -176,7 +176,7 @@
176 176 
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
177 177 
       <OptimizeReferences>true</OptimizeReferences>
178 178 
       <ModuleDefinitionFile>$(SolutionDir)libclamunrar.def</ModuleDefinitionFile>
179 
-      <AdditionalLibraryDirectories>$(CLAM_DEPENDENCIES)\$(PlatformName)\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
179 
+      <AdditionalLibraryDirectories>$(CLAM_DEPENDENCIES)\$(PlatformName)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
180 180 
     </Link>
181 181 
   </ItemDefinitionGroup>
182 182 
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">
... ... 
@@ -197,7 +197,7 @@
197 197 
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
198 198 
       <OptimizeReferences>true</OptimizeReferences>
199 199 
       <ModuleDefinitionFile>$(SolutionDir)libclamunrar.def</ModuleDefinitionFile>
200 
-      <AdditionalLibraryDirectories>$(CLAM_DEPENDENCIES)\$(PlatformName)\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
200 
+      <AdditionalLibraryDirectories>$(CLAM_DEPENDENCIES)\$(PlatformName)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
201 201 
     </Link>
202 202 
   </ItemDefinitionGroup>
203 203 
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
... ... 
@@ -218,7 +218,7 @@
218 218 
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
219 219 
       <OptimizeReferences>true</OptimizeReferences>
220 220 
       <ModuleDefinitionFile>$(SolutionDir)libclamunrar.def</ModuleDefinitionFile>
221 
-      <AdditionalLibraryDirectories>$(CLAM_DEPENDENCIES)\$(PlatformName)\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
221 
+      <AdditionalLibraryDirectories>$(CLAM_DEPENDENCIES)\$(PlatformName)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
222 222 
     </Link>
223 223 
   </ItemDefinitionGroup>
224 224 
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">
... ... 
@@ -239,7 +239,7 @@
239 239 
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
240 240 
       <OptimizeReferences>true</OptimizeReferences>
241 241 
       <ModuleDefinitionFile>$(SolutionDir)libclamunrar.def</ModuleDefinitionFile>
242 
-      <AdditionalLibraryDirectories>$(CLAM_DEPENDENCIES)\$(PlatformName)\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
242 
+      <AdditionalLibraryDirectories>$(CLAM_DEPENDENCIES)\$(PlatformName)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
243 243 
     </Link>
244 244 
   </ItemDefinitionGroup>
245 245 
   <ItemGroup>
win32/libclamunrar_iface.vcxproj
History View file @ 42d20bf
... ... 
@@ -138,7 +138,7 @@
138 138 
       <SubSystem>Windows</SubSystem>
139 139 
       <GenerateDebugInformation>true</GenerateDebugInformation>
140 140 
       <ModuleDefinitionFile>$(SolutionDir)libclamunrar_iface.def</ModuleDefinitionFile>
141 
-      <AdditionalLibraryDirectories>$(CLAM_DEPENDENCIES)\$(PlatformName)\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
141 
+      <AdditionalLibraryDirectories>$(CLAM_DEPENDENCIES)\$(PlatformName)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
142 142 
     </Link>
143 143 
     <ProjectReference />
144 144 
     <ProjectReference />
... ... 
@@ -157,7 +157,7 @@
157 157 
       <SubSystem>Windows</SubSystem>
158 158 
       <GenerateDebugInformation>true</GenerateDebugInformation>
159 159 
       <ModuleDefinitionFile>$(SolutionDir)libclamunrar_iface.def</ModuleDefinitionFile>
160 
-      <AdditionalLibraryDirectories>$(CLAM_DEPENDENCIES)\$(PlatformName)\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
160 
+      <AdditionalLibraryDirectories>$(CLAM_DEPENDENCIES)\$(PlatformName)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
161 161 
     </Link>
162 162 
     <ProjectReference />
163 163 
     <ProjectReference />
... ... 
@@ -180,7 +180,7 @@
180 180 
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
181 181 
       <OptimizeReferences>true</OptimizeReferences>
182 182 
       <ModuleDefinitionFile>$(SolutionDir)libclamunrar_iface.def</ModuleDefinitionFile>
183 
-      <AdditionalLibraryDirectories>$(CLAM_DEPENDENCIES)\$(PlatformName)\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
183 
+      <AdditionalLibraryDirectories>$(CLAM_DEPENDENCIES)\$(PlatformName)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
184 184 
     </Link>
185 185 
     <ProjectReference />
186 186 
     <ProjectReference />
... ... 
@@ -203,7 +203,7 @@
203 203 
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
204 204 
       <OptimizeReferences>true</OptimizeReferences>
205 205 
       <ModuleDefinitionFile>$(SolutionDir)libclamunrar_iface.def</ModuleDefinitionFile>
206 
-      <AdditionalLibraryDirectories>$(CLAM_DEPENDENCIES)\$(PlatformName)\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
206 
+      <AdditionalLibraryDirectories>$(CLAM_DEPENDENCIES)\$(PlatformName)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
207 207 
     </Link>
208 208 
     <ProjectReference />
209 209 
     <ProjectReference />
... ... 
@@ -226,7 +226,7 @@
226 226 
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
227 227 
       <OptimizeReferences>true</OptimizeReferences>
228 228 
       <ModuleDefinitionFile>$(SolutionDir)libclamunrar_iface.def</ModuleDefinitionFile>
229 
-      <AdditionalLibraryDirectories>$(CLAM_DEPENDENCIES)\$(PlatformName)\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
229 
+      <AdditionalLibraryDirectories>$(CLAM_DEPENDENCIES)\$(PlatformName)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
230 230 
     </Link>
231 231 
     <ProjectReference />
232 232 
     <ProjectReference />
... ... 
@@ -249,7 +249,7 @@
249 249 
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
250 250 
       <OptimizeReferences>true</OptimizeReferences>
251 251 
       <ModuleDefinitionFile>$(SolutionDir)libclamunrar_iface.def</ModuleDefinitionFile>
252 
-      <AdditionalLibraryDirectories>$(CLAM_DEPENDENCIES)\$(PlatformName)\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
252 
+      <AdditionalLibraryDirectories>$(CLAM_DEPENDENCIES)\$(PlatformName)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
253 253 
     </Link>
254 254 
     <ProjectReference />
255 255 
     <ProjectReference />