Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2019-11-25 07:45:03 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-11-25 07:45:49 +0300
commitbb0708a483f5058f228b2b15f4801467ebddde9d (patch)
tree3cc0c6e2682f7d7ecd7b05328f60ec33e6205125 /source/blender/editors
parentb2d940250c73e055a2eb82f51ac7d2e352623995 (diff)
CMake: support building without Python
Resolve linking issues, warnings.
Diffstat (limited to 'source/blender/editors')
-rw-r--r--source/blender/editors/interface/interface.c1
-rw-r--r--source/blender/editors/interface/interface_region_tooltip.c6
-rw-r--r--source/blender/editors/mesh/CMakeLists.txt1
-rw-r--r--source/blender/editors/object/CMakeLists.txt2
-rw-r--r--source/blender/editors/space_api/CMakeLists.txt2
-rw-r--r--source/blender/editors/util/numinput.c1
6 files changed, 11 insertions, 2 deletions
diff --git a/source/blender/editors/interface/interface.c b/source/blender/editors/interface/interface.c
index ff6b65ffbfc..8af8fdb06a1 100644
--- a/source/blender/editors/interface/interface.c
+++ b/source/blender/editors/interface/interface.c
@@ -2777,6 +2777,7 @@ static bool ui_number_from_string(bContext *C, const char *str, double *r_value)
#ifdef WITH_PYTHON
return BPY_execute_string_as_number(C, NULL, str, true, r_value);
#else
+ UNUSED_VARS(C);
*r_value = atof(str);
return true;
#endif
diff --git a/source/blender/editors/interface/interface_region_tooltip.c b/source/blender/editors/interface/interface_region_tooltip.c
index 3f20e8247b9..8cea80bac7f 100644
--- a/source/blender/editors/interface/interface_region_tooltip.c
+++ b/source/blender/editors/interface/interface_region_tooltip.c
@@ -295,6 +295,8 @@ static void ui_tooltip_region_free_cb(ARegion *ar)
/** \name ToolTip Creation
* \{ */
+#ifdef WITH_PYTHON
+
static bool ui_tooltip_data_append_from_keymap(bContext *C, uiTooltipData *data, wmKeyMap *keymap)
{
const int fields_len_init = data->fields_len;
@@ -345,6 +347,8 @@ static bool ui_tooltip_data_append_from_keymap(bContext *C, uiTooltipData *data,
return (fields_len_init != data->fields_len);
}
+#endif /* WITH_PYTHON */
+
/**
* Special tool-system exception.
*/
@@ -607,6 +611,8 @@ static uiTooltipData *ui_tooltip_data_from_tool(bContext *C, uiBut *but, bool is
BLI_assert(0);
}
}
+#else
+ UNUSED_VARS(is_label);
#endif /* WITH_PYTHON */
if (data->fields_len == 0) {
diff --git a/source/blender/editors/mesh/CMakeLists.txt b/source/blender/editors/mesh/CMakeLists.txt
index 88da40b947f..e41445aef09 100644
--- a/source/blender/editors/mesh/CMakeLists.txt
+++ b/source/blender/editors/mesh/CMakeLists.txt
@@ -78,6 +78,7 @@ set(SRC
set(LIB
bf_blenkernel
bf_blenlib
+ bf_windowmanager
)
if(WITH_INTERNATIONAL)
diff --git a/source/blender/editors/object/CMakeLists.txt b/source/blender/editors/object/CMakeLists.txt
index aabfa78cf58..69abe475fed 100644
--- a/source/blender/editors/object/CMakeLists.txt
+++ b/source/blender/editors/object/CMakeLists.txt
@@ -73,7 +73,9 @@ set(SRC
set(LIB
bf_blenkernel
bf_blenlib
+ bf_editor_mesh
bf_render
+ bf_windowmanager
)
add_definitions(${GL_DEFINITIONS})
diff --git a/source/blender/editors/space_api/CMakeLists.txt b/source/blender/editors/space_api/CMakeLists.txt
index 74d9b703c68..de1c905b08b 100644
--- a/source/blender/editors/space_api/CMakeLists.txt
+++ b/source/blender/editors/space_api/CMakeLists.txt
@@ -35,8 +35,6 @@ set(SRC
)
set(LIB
- bf_editor_io
- bf_editor_sound
bf_editor_space_action
bf_editor_space_buttons
bf_editor_space_clip
diff --git a/source/blender/editors/util/numinput.c b/source/blender/editors/util/numinput.c
index aca695be245..ead841642d7 100644
--- a/source/blender/editors/util/numinput.c
+++ b/source/blender/editors/util/numinput.c
@@ -298,6 +298,7 @@ bool user_string_to_number(
return success;
}
#else
+ UNUSED_VARS(C, unit, type);
*r_value = atof(str);
return true;
#endif