Compare commits

...

1 Commits

Author SHA1 Message Date
Marcel Hollerbach 09c6315a61 efl: work arround something weird 2020-09-30 19:45:43 +02:00
4 changed files with 12 additions and 3 deletions

View File

@ -156,6 +156,8 @@ main(int argc, char **argv)
if (!eina_init())
return -1;
__efl_internal_appear();
_edje_cc_log_dom = eina_log_domain_register
("edje_cc", EDJE_CC_DEFAULT_LOG_COLOR);
if (_edje_cc_log_dom < 0)

View File

@ -343,7 +343,8 @@ efl_config_string_get(const Efl_Config *obj, const char *name)
/* work-around bug in gcc --as-needed link optimization */
EAPI void __efl_internal_init(void);
/* work-around bug in linkers where --as-needed strips all the libaries only having weak symbols */
EAPI void __efl_internal_appear(void);
#if defined ( __cplusplus )
}
#endif

View File

@ -111,6 +111,12 @@ __efl_internal_init(void)
efl_model_init();
}
EAPI void
__efl_internal_appear(void)
{
/* work-around bug in linkers where --as-needed strips all the libaries only having weak symbols */
}
static Eina_Value
_efl_ui_view_factory_item_created(Eo *factory, void *data EINA_UNUSED, const Eina_Value v)
{

View File

@ -525,13 +525,13 @@ typedef Eina_Bool (*Elm_Event_Cb)(void *data, Evas_Object *obj, Evas
EAPI extern double _elm_startup_time;
#ifndef ELM_LIB_QUICKLAUNCH
#define ELM_MAIN() int main(int argc, char **argv) { int ret__; _elm_startup_time = ecore_time_unix_get(); elm_init(argc, argv); ret__ = elm_main(argc, argv); elm_shutdown(); return ret__; } /**< macro to be used after the elm_main() function */
#define ELM_MAIN() int main(int argc, char **argv) { int ret__; __efl_internal_appear(); _elm_startup_time = ecore_time_unix_get(); elm_init(argc, argv); ret__ = elm_main(argc, argv); elm_shutdown(); return ret__; } /**< macro to be used after the elm_main() function */
#else
/** @deprecated macro to be used after the elm_main() function.
* Do not define ELM_LIB_QUICKLAUNCH
* Compile your programs with -fpie and -pie -rdynamic instead, to generate a single binary (linkable executable).
*/
#define ELM_MAIN() int main(int argc, char **argv) { int ret__; _elm_startup_time = ecore_time_unix_get(); ret__ = elm_quicklaunch_fallback(argc, argv); elm_shutdown(); return ret__; }
#define ELM_MAIN() int main(int argc, char **argv) { int ret__; __efl_internal_appear(); _elm_startup_time = ecore_time_unix_get(); ret__ = elm_quicklaunch_fallback(argc, argv); elm_shutdown(); return ret__; }
#endif
#define __EFL_UI_IS_REQUIRED