From: Benjamin Franzke Date: Wed, 7 Mar 2012 18:42:10 +0000 (+0100) Subject: compositor: Fix compilation without xserver launcher X-Git-Tag: 20120702.1049~394 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0eee939d76a4f3c507785cb40b99ba0d02fc981b;p=profile%2Fivi%2Fweston.git compositor: Fix compilation without xserver launcher --- 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);