diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2016-06-09 21:20:49 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2016-06-09 21:20:49 -0300 |
| commit | d02261fc844b54ee5a1aa96ef675ee3b3c672744 (patch) | |
| tree | f4c4e2deb69eb67a06de205f243783d233c9131e | |
| parent | a3890594fa2798ef31d92e4195c84b7246860929 (diff) | |
Disable asset library compilation if no openssl exists
| -rw-r--r-- | tools/editor/editor_node.cpp | 4 | ||||
| -rw-r--r-- | tools/editor/project_manager.cpp | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/tools/editor/editor_node.cpp b/tools/editor/editor_node.cpp index d63a010272..269ecb1032 100644 --- a/tools/editor/editor_node.cpp +++ b/tools/editor/editor_node.cpp @@ -6381,7 +6381,11 @@ EditorNode::EditorNode() { add_editor_plugin( memnew( CanvasItemEditorPlugin(this) ) ); add_editor_plugin( memnew( SpatialEditorPlugin(this) ) ); add_editor_plugin( memnew( ScriptEditorPlugin(this) ) ); +#ifdef OPENSSL_ENABLED add_editor_plugin( memnew( AssetLibraryEditorPlugin(this) ) ); +#else +#warning Asset Library will not compile without SSL +#endif //more visually meaningful to have this later raise_bottom_panel_item(AnimationPlayerEditor::singleton); diff --git a/tools/editor/project_manager.cpp b/tools/editor/project_manager.cpp index c00bd0ab37..037b2f3eaf 100644 --- a/tools/editor/project_manager.cpp +++ b/tools/editor/project_manager.cpp @@ -986,11 +986,15 @@ ProjectManager::ProjectManager() { tree_vb->add_spacer(); +#ifdef OPENSSL_ENABLED asset_library = memnew( EditorAssetLibrary(true) ); asset_library->set_name("Templates"); tabs->add_child(asset_library); +#else +#warning Asset Library will not compile without SSL +#endif CenterContainer *cc = memnew( CenterContainer ); Button * cancel = memnew( Button ); |