diff options
author | Drew DeVault <sir@cmpwn.com> | 2017-10-22 10:45:11 -0400 |
---|---|---|
committer | Drew DeVault <sir@cmpwn.com> | 2017-11-11 09:09:17 -0500 |
commit | c3457de28a37d074a960cd464445de02d6527997 (patch) | |
tree | 8bba9695d3ce5da95da29e1135b8ddcc88a09db4 | |
parent | Fire up the wlroots backend and run the event loop (diff) | |
download | sway-c3457de28a37d074a960cd464445de02d6527997.tar.gz sway-c3457de28a37d074a960cd464445de02d6527997.tar.zst sway-c3457de28a37d074a960cd464445de02d6527997.zip |
Fix build yml files
-rw-r--r-- | .build.yml | 8 | ||||
-rw-r--r-- | .travis.yml | 13 | ||||
-rw-r--r-- | include/sway/server.h | 1 |
3 files changed, 19 insertions, 3 deletions
@@ -12,7 +12,15 @@ packages: | |||
12 | - gdk-pixbuf2 | 12 | - gdk-pixbuf2 |
13 | sources: | 13 | sources: |
14 | - https://git.sr.ht/~sircmpwn/sway | 14 | - https://git.sr.ht/~sircmpwn/sway |
15 | - https://git.sr.ht/~sircmpwn/wlroots | ||
15 | tasks: | 16 | tasks: |
17 | - wlroots: | | ||
18 | cd wlroots | ||
19 | mkdir build | ||
20 | cd build | ||
21 | meson --prefix=/usr .. | ||
22 | ninja | ||
23 | sudo ninja install | ||
16 | - setup: | | 24 | - setup: | |
17 | cd sway | 25 | cd sway |
18 | mkdir build | 26 | mkdir build |
diff --git a/.travis.yml b/.travis.yml index 3eeb1682..be7ac3e0 100644 --- a/.travis.yml +++ b/.travis.yml | |||
@@ -24,8 +24,17 @@ arch: | |||
24 | - wlc-git | 24 | - wlc-git |
25 | - libcap | 25 | - libcap |
26 | script: | 26 | script: |
27 | - "cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE ." | 27 | - git clone https://github.com/swaywm/wlroots |
28 | - "make" | 28 | - cd wlroots |
29 | - mkdir build | ||
30 | - cd build | ||
31 | - meson --prefix=/usr .. | ||
32 | - sudo ninja install | ||
33 | - cd ../.. | ||
34 | - cmake . | ||
35 | - make | ||
36 | - cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE . | ||
37 | - make | ||
29 | 38 | ||
30 | script: | 39 | script: |
31 | - "curl -s https://raw.githubusercontent.com/mikkeloscar/arch-travis/master/arch-travis.sh | bash" | 40 | - "curl -s https://raw.githubusercontent.com/mikkeloscar/arch-travis/master/arch-travis.sh | bash" |
diff --git a/include/sway/server.h b/include/sway/server.h index 471a0270..9cd760ac 100644 --- a/include/sway/server.h +++ b/include/sway/server.h | |||
@@ -11,7 +11,6 @@ | |||
11 | 11 | ||
12 | struct sway_server { | 12 | struct sway_server { |
13 | // TODO WLR | 13 | // TODO WLR |
14 | //struct roots_desktop *desktop; | ||
15 | //struct roots_input *input; | 14 | //struct roots_input *input; |
16 | 15 | ||
17 | struct wl_display *wl_display; | 16 | struct wl_display *wl_display; |