projects
/
profile
/
ivi
/
weston.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
de56c31
)
compositor: Fix compilation without xserver launcher
author
Benjamin Franzke
<benjaminfranzke@googlemail.com>
Wed, 7 Mar 2012 18:42:10 +0000
(19:42 +0100)
committer
Kristian Høgsberg
<krh@bitplanet.net>
Thu, 8 Mar 2012 18:15:02 +0000
(13:15 -0500)
src/compositor.c
patch
|
blob
|
history
diff --git
a/src/compositor.c
b/src/compositor.c
index
0e33971
..
96e7fe7
100644
(file)
--- 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);