[cpp-msbuild] 05/13: SSPCPP-765 No need to indirect the SSL lib names

[Rod Widdowson]

This is an automated email from the git hooks/post-receive script.

rdw pushed a commit to branch master
in repository cpp-msbuild.

View the commit online:
http://git.shibboleth.net/view/?p=cpp-msbuild.git;a=commit;h=8e83772a11177ea8049ec149c1ccc55b78fb7ca9

commit 8e83772a11177ea8049ec149c1ccc55b78fb7ca9
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Wed Dec 6 14:51:46 2017 +0000

    SSPCPP-765 No need to indirect the SSL lib names
    
    https://issues.shibboleth.net/jira/browse/SSPCPP-765
    
    SSLEAY32 and all that nonsense is a thing of the past.
---
 dependencies/config.bat | 6 ------
 dependencies/xsec.props | 8 ++++----
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/dependencies/config.bat b/dependencies/config.bat
index 27d32c3..22032b8 100644
--- a/dependencies/config.bat
+++ b/dependencies/config.bat
@@ -59,12 +59,6 @@ set OPENSSL_DIR=openssl-1.1.0g
 set OPENSSL_MM_VERSION=1.1.0.7
 set OPENSSL_FILE_VERSION=1_1
 
-
-set SSLLib=libcrypto.lib;libssl.lib
-set SSLLib_space=libcrypto.lib libssl.lib
-set SSLLibD=libcrypto.lib;libssl.lib
-set SSLLibD_space=libcrypto.lib libssl.lib
-
 set LIBCURL_DIR=curl-7.57.0
 set LIBCURL_NAME=libcurl5
 
diff --git a/dependencies/xsec.props b/dependencies/xsec.props
index 1a56fc5..1bc939c 100644
--- a/dependencies/xsec.props
+++ b/dependencies/xsec.props
@@ -8,7 +8,7 @@
     </ClCompile>
     <Link>
       <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories);$(ROOT_DIR)$(Xerces_dir)\Install32\$(MsVCVersion)\lib;$(ROOT_DIR)$(Openssl_dir)\out32dll.dbg;$(ROOT_DIR)$(OpenSSl_dir)\x86Debug\lib;</AdditionalLibraryDirectories>
-      <AdditionalDependencies>%(AdditionalDependencies);$(SSLLibD)</AdditionalDependencies>
+      <AdditionalDependencies>%(AdditionalDependencies);libcrypto.lib;libssl.lib)</AdditionalDependencies>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </Link>
   </ItemDefinitionGroup>
@@ -21,7 +21,7 @@
     </ClCompile>
     <Link>
       <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories);$(ROOT_DIR)$(Xerces_dir)\install64\$(MsVCVersion)\lib;$(ROOT_DIR)$(Openssl_dir)\out64dll.dbg;$(ROOT_DIR)$(OpenSSl_dir)\x64Debug\lib;</AdditionalLibraryDirectories>
-      <AdditionalDependencies>%(AdditionalDependencies);$(SSLLibD)</AdditionalDependencies>
+      <AdditionalDependencies>%(AdditionalDependencies);libcrypto.lib;libssl.lib</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
 
@@ -33,7 +33,7 @@
     </ClCompile>
     <Link>
       <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories);$(ROOT_DIR)$(Xerces_dir)\Install32\$(MsVCVersion)\lib;$(ROOT_DIR)$(Openssl_dir)\out32dll;$(ROOT_DIR)$(OpenSSl_dir)\x86\lib;</AdditionalLibraryDirectories>
-      <AdditionalDependencies>%(AdditionalDependencies);$(SSLLib)</AdditionalDependencies>
+      <AdditionalDependencies>%(AdditionalDependencies);libcrypto.lib;libssl.lib</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
 
@@ -44,7 +44,7 @@
       <MultiProcessorCompilation>true</MultiProcessorCompilation>    </ClCompile>
     <Link>
       <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories);$(ROOT_DIR)$(Xerces_dir)\Install64\$(MsVCVersion)\lib;$(ROOT_DIR)$(Openssl_dir)\out64dll;$(ROOT_DIR)$(OpenSSl_dir)\x64\lib;</AdditionalLibraryDirectories>
-      <AdditionalDependencies>%(AdditionalDependencies);;$(SSLLib)</AdditionalDependencies>
+      <AdditionalDependencies>%(AdditionalDependencies);libcrypto.lib;libssl.lib</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.