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 | 7c448b408126aef0561be0761871f968921d7db0 (diff) | |
| download | sway-c3457de28a37d074a960cd464445de02d6527997.tar.xz | |
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: - gdk-pixbuf2 sources: - https://git.sr.ht/~sircmpwn/sway + - https://git.sr.ht/~sircmpwn/wlroots tasks: + - wlroots: | + cd wlroots + mkdir build + cd build + meson --prefix=/usr .. + ninja + sudo ninja install - setup: | cd sway 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: - wlc-git - libcap script: - - "cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE ." - - "make" + - git clone https://github.com/swaywm/wlroots + - cd wlroots + - mkdir build + - cd build + - meson --prefix=/usr .. + - sudo ninja install + - cd ../.. + - cmake . + - make + - cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE . + - make script: - "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 @@ struct sway_server { // TODO WLR - //struct roots_desktop *desktop; //struct roots_input *input; struct wl_display *wl_display; |