mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

compositor: Fix compilation without xserver launcher

Browse Source
This commit is contained in:
Benjamin Franzke
2012-03-07 19:42:10 +01:00
committed by Kristian Høgsberg
parent de56c311d9
commit 0eee939d76
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/compositor.c
+4
View File
@@ -2561,8 +2561,10 @@ int main(int argc, char *argv[])
ec->option_idle_time = option_idle_time; ec->option_idle_time = option_idle_time;
ec->idle_time = option_idle_time; ec->idle_time = option_idle_time;
#ifdef BUILD_XSERVER_LAUNCHER
if (xserver) if (xserver)
weston_xserver_init(ec); weston_xserver_init(ec);
#endif
if (shell_init(ec) < 0) if (shell_init(ec) < 0)
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
@@ -2580,8 +2582,10 @@ int main(int argc, char *argv[])
/* prevent further rendering while shutting down */ /* prevent further rendering while shutting down */
ec->state = WESTON_COMPOSITOR_SLEEPING; ec->state = WESTON_COMPOSITOR_SLEEPING;
#ifdef BUILD_XSERVER_LAUNCHER
if (xserver) if (xserver)
weston_xserver_destroy(ec); weston_xserver_destroy(ec);
#endif
ec->shell->destroy(ec->shell); ec->shell->destroy(ec->shell);