mirrors/EWF
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Be sure to use ecf custom variable "ssl_enabled" and not the variant "httpd_ssl_enabled" or else.

Browse Source 
Include again the openssl include folder for EiffelStudio before 16.11, otherwise eif_openssl is not found.
This commit is contained in:
Jocelyn Fiat
2016-10-14 14:32:04 +02:00
parent 16f667af2c
commit a4d737d548
6 changed files with 56 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
library/network/http_network/http_network-safe.ecf
View File

@@ -34,6 +34,28 @@
<custom name="httpd_ssl_enabled" value="true"/>
</condition>
</library>
<external_include location="$(ISE_LIBRARY)/unstable/library/network/socket/netssl/spec/include">
<condition>
<platform excluded_value="windows"/>
<custom name="ssl_enabled" value="true"/>
<version type="compiler" max="16.11.0.0"/>
</condition>
</external_include>
<external_include location="$(ISE_LIBRARY)\unstable\library\network\socket\netssl\spec\include">
<condition>
<platform value="windows"/>
<custom name="ssl_enabled" value="true"/>
<version type="compiler" max="16.11.0.0"/>
</condition>
</external_include>
<external_cflag value="-D_WINSOCKAPI_">
<condition>
<platform value="windows"/>
<custom name="ssl_enabled" value="true"/>
<version type="compiler" max="16.11.0.0"/>
</condition>
</external_cflag>
<cluster name="network" location=".\src\">
<file_rule>
<exclude>/http_stream_socket_ext.e$</exclude>

25
library/network/http_network/http_network.ecf
View File

@@ -34,6 +34,28 @@
<custom name="httpd_ssl_enabled" value="true"/>
</condition>
</library>
<external_include location="$(ISE_LIBRARY)/unstable/library/network/socket/netssl/spec/include">
<condition>
<platform excluded_value="windows"/>
<custom name="ssl_enabled" value="true"/>
<version type="compiler" max="16.11.0.0"/>
</condition>
</external_include>
<external_include location="$(ISE_LIBRARY)\unstable\library\network\socket\netssl\spec\include">
<condition>
<platform value="windows"/>
<custom name="ssl_enabled" value="true"/>
<version type="compiler" max="16.11.0.0"/>
</condition>
</external_include>
<external_cflag value="-D_WINSOCKAPI_">
<condition>
<platform value="windows"/>
<custom name="ssl_enabled" value="true"/>
<version type="compiler" max="16.11.0.0"/>
</condition>
</external_cflag>
<cluster name="network" location=".\src\">
<file_rule>
<exclude>/http_stream_socket_ext.e$</exclude>
@@ -95,4 +117,7 @@
</cluster>
</cluster>
</target>
<target name="http_network_ssl" extends="http_network">
<variable name="ssl_enabled" value="true" />
</target>
</system>