diff options
| author | Drew DeVault <sir@cmpwn.com> | 2017-05-31 15:43:13 -0400 |
|---|---|---|
| committer | Drew DeVault <sir@cmpwn.com> | 2017-05-31 15:43:13 -0400 |
| commit | 579909a36857575ee23a39abc82d4e3b34096385 (patch) | |
| tree | fe247909bc96d4ac2411bd297745c4aa1280eb07 | |
| parent | fee409bd0af6f2e77116e7d8eddf99dd5225b1dc (diff) | |
Promote types to a standalone subproject
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | backend/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | types/CMakeLists.txt (renamed from wayland/CMakeLists.txt) | 6 | ||||
| -rw-r--r-- | types/wlr_output.c (renamed from wayland/types/wlr_output.c) | 0 |
4 files changed, 5 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 616a8911..efb741df 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -60,7 +60,7 @@ include_directories(include) add_subdirectory(backend) add_subdirectory(common) -add_subdirectory(wayland) +add_subdirectory(types) add_subdirectory(session) add_subdirectory(example) diff --git a/backend/CMakeLists.txt b/backend/CMakeLists.txt index fc1793cf..ef612639 100644 --- a/backend/CMakeLists.txt +++ b/backend/CMakeLists.txt @@ -18,7 +18,7 @@ add_library(wlr-backend target_link_libraries(wlr-backend wlr-common - wlr-wayland + wlr-types ${WAYLAND_LIBRARIES} ${DRM_LIBRARIES} ${GBM_LIBRARIES} diff --git a/wayland/CMakeLists.txt b/types/CMakeLists.txt index 675a7bd2..eba92cc0 100644 --- a/wayland/CMakeLists.txt +++ b/types/CMakeLists.txt @@ -3,11 +3,11 @@ include_directories( ${WAYLAND_INCLUDE_DIR} ) -add_library(wlr-wayland - types/wlr_output.c +add_library(wlr-types + wlr_output.c ) -target_link_libraries(wlr-wayland +target_link_libraries(wlr-types wlr-common ${WAYLAND_LIBRARIES} ) diff --git a/wayland/types/wlr_output.c b/types/wlr_output.c index 21ffa078..21ffa078 100644 --- a/wayland/types/wlr_output.c +++ b/types/wlr_output.c |