godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-06 12:20:30 +00:00
Code Releases Wiki Activity

Disable asset library compilation if no openssl exists

Browse Source
This commit is contained in:
Juan Linietsky
2016-06-09 21:20:49 -03:00
parent a3890594fa
commit d02261fc84
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tools/editor/editor_node.cpp
View File

@@ -6381,7 +6381,11 @@ EditorNode::EditorNode() {
add_editor_plugin( memnew( CanvasItemEditorPlugin(this) ) ); add_editor_plugin( memnew( CanvasItemEditorPlugin(this) ) );
add_editor_plugin( memnew( SpatialEditorPlugin(this) ) ); add_editor_plugin( memnew( SpatialEditorPlugin(this) ) );
add_editor_plugin( memnew( ScriptEditorPlugin(this) ) ); add_editor_plugin( memnew( ScriptEditorPlugin(this) ) );
#ifdef OPENSSL_ENABLED
add_editor_plugin( memnew( AssetLibraryEditorPlugin(this) ) ); add_editor_plugin( memnew( AssetLibraryEditorPlugin(this) ) );
#else
#warning Asset Library will not compile without SSL
#endif
//more visually meaningful to have this later //more visually meaningful to have this later
raise_bottom_panel_item(AnimationPlayerEditor::singleton); raise_bottom_panel_item(AnimationPlayerEditor::singleton);

4
tools/editor/project_manager.cpp
View File

@@ -986,11 +986,15 @@ ProjectManager::ProjectManager() {
tree_vb->add_spacer(); tree_vb->add_spacer();
#ifdef OPENSSL_ENABLED
asset_library = memnew( EditorAssetLibrary(true) ); asset_library = memnew( EditorAssetLibrary(true) );
asset_library->set_name("Templates"); asset_library->set_name("Templates");
tabs->add_child(asset_library); tabs->add_child(asset_library);
#else
#warning Asset Library will not compile without SSL
#endif
CenterContainer *cc = memnew( CenterContainer ); CenterContainer *cc = memnew( CenterContainer );
Button * cancel = memnew( Button ); Button * cancel = memnew( Button );