[PATCH] compositor: Fix compilation without xserver launcher

Juan Zhao juan.j.zhao at linux.intel.com
Wed Mar 7 18:06:20 PST 2012


  On 03/08/2012 02:42 AM, Benjamin Franzke wrote:
> ---
>   src/compositor.c |    4 ++++
>   1 files changed, 4 insertions(+), 0 deletions(-)
>
> diff --git a/src/compositor.c b/src/compositor.c
> index 0e33971..96e7fe7 100644
> --- a/src/compositor.c
> +++ b/src/compositor.c
> @@ -2561,8 +2561,10 @@ int main(int argc, char *argv[])
>   	ec->option_idle_time = option_idle_time;
>   	ec->idle_time = option_idle_time;
>
> +#ifdef BUILD_XSERVER_LAUNCHER
>   	if (xserver)
>   		weston_xserver_init(ec);
> +#endif
>
>   	if (shell_init(ec)<  0)
>   		exit(EXIT_FAILURE);
> @@ -2580,8 +2582,10 @@ int main(int argc, char *argv[])
>   	/* prevent further rendering while shutting down */
>   	ec->state = WESTON_COMPOSITOR_SLEEPING;
>
> +#ifdef BUILD_XSERVER_LAUNCHER
>   	if (xserver)
>   		weston_xserver_destroy(ec);
> +#endif
>
>   	ec->shell->destroy(ec->shell);
>
It's useful.
Because when I'm debugging gdl-backend on Intel-CE platform, I don't 
need xserver-launcher but this brings trouble while building.

Thanks,
Juan


More information about the wayland-devel mailing list