diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2014-05-01 09:53:37 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2014-05-01 09:53:37 -0300 |
| commit | 4dc4e96c8a4fb7e34ecae3a39ef0f3f3fb275e97 (patch) | |
| tree | 73da4d4d6d0fa1b4c6761a63ac3674aead8b12e3 /drivers/register_driver_types.cpp | |
| parent | 5ab65f0eadec6a67eda622787206a01c8af2cf7e (diff) | |
| download | redot-engine-4dc4e96c8a4fb7e34ecae3a39ef0f3f3fb275e97.tar.gz | |
-OpenSSL Fixes
Diffstat (limited to 'drivers/register_driver_types.cpp')
| -rw-r--r-- | drivers/register_driver_types.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/register_driver_types.cpp b/drivers/register_driver_types.cpp index c3db59da77..e2af1e5336 100644 --- a/drivers/register_driver_types.cpp +++ b/drivers/register_driver_types.cpp @@ -20,9 +20,6 @@ #include "etc1/image_etc.h" #include "chibi/event_stream_chibi.h" -#ifdef OPENSSL_ENABLED -#include "openssl/stream_peer_openssl.h" -#endif #ifdef TOOLS_ENABLED #include "squish/image_compress_squish.h" @@ -98,6 +95,10 @@ static ResourceFormatLoaderVideoStreamTheora* theora_stream_loader = NULL; static ResourceFormatLoaderAudioStreamMPC * mpc_stream_loader=NULL; #endif +#ifdef OPENSSL_ENABLED +#include "openssl/register_openssl.h" +#endif + void register_core_driver_types() { #ifdef PNG_ENABLED @@ -197,8 +198,7 @@ void register_driver_types() { #ifdef OPENSSL_ENABLED - ObjectTypeDB::register_type<StreamPeerOpenSSL>(); - StreamPeerOpenSSL::initialize_ssl(); + register_openssl(); #endif #ifdef THEORA_ENABLED @@ -253,7 +253,7 @@ void unregister_driver_types() { #ifdef OPENSSL_ENABLED - StreamPeerOpenSSL::finalize_ssl(); + unregister_openssl(); #endif finalize_chibi(); |