diff options
| author | Drew DeVault <sir@cmpwn.com> | 2017-12-27 09:22:38 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-27 09:22:38 -0800 |
| commit | fea5aee9cff78b724c7b179c3b49ed42b1526b8f (patch) | |
| tree | 08ebec5b7cf3983b6321e2fee884a7e00f267617 /include | |
| parent | a0d2a6b445f33b608019809f581a80d28062178d (diff) | |
| parent | 71e42dae909c8e94f82873f9eee0c50f0284fbdd (diff) | |
Merge pull request #526 from besser82/bugfix/config_header_avoid_clashes
Further improvements to header files and shared lib version
Diffstat (limited to 'include')
| -rw-r--r-- | include/meson.build | 1 | ||||
| -rw-r--r-- | include/rootston/desktop.h | 2 | ||||
| -rw-r--r-- | include/rootston/server.h | 2 | ||||
| -rw-r--r-- | include/rootston/view.h | 2 | ||||
| -rw-r--r-- | include/wlr/meson.build | 14 | ||||
| -rw-r--r-- | include/wlr/xwayland.h | 2 |
6 files changed, 19 insertions, 4 deletions
diff --git a/include/meson.build b/include/meson.build new file mode 100644 index 00000000..d16d6ef4 --- /dev/null +++ b/include/meson.build @@ -0,0 +1 @@ +subdir('wlr') diff --git a/include/rootston/desktop.h b/include/rootston/desktop.h index 7039cfcf..a016bb94 100644 --- a/include/rootston/desktop.h +++ b/include/rootston/desktop.h @@ -2,7 +2,7 @@ #define _ROOTSTON_DESKTOP_H #include <time.h> #include <wayland-server.h> -#include "config.h" +#include <wlr/config.h> #include <wlr/types/wlr_output.h> #include <wlr/types/wlr_output_layout.h> #include <wlr/types/wlr_compositor.h> diff --git a/include/rootston/server.h b/include/rootston/server.h index a014c749..0c26ea92 100644 --- a/include/rootston/server.h +++ b/include/rootston/server.h @@ -1,7 +1,7 @@ #ifndef _ROOTSTON_SERVER_H #define _ROOTSTON_SERVER_H #include <wayland-server.h> -#include "config.h" +#include <wlr/config.h> #include <wlr/backend.h> #include <wlr/backend/session.h> #include <wlr/types/wlr_data_device.h> diff --git a/include/rootston/view.h b/include/rootston/view.h index 53e96764..579b148a 100644 --- a/include/rootston/view.h +++ b/include/rootston/view.h @@ -2,7 +2,7 @@ #define _ROOTSTON_VIEW_H #include <stdbool.h> -#include "config.h" +#include <wlr/config.h> #include <wlr/types/wlr_box.h> #include <wlr/types/wlr_surface.h> #include <wlr/types/wlr_xdg_shell_v6.h> diff --git a/include/wlr/meson.build b/include/wlr/meson.build new file mode 100644 index 00000000..84dc5ae9 --- /dev/null +++ b/include/wlr/meson.build @@ -0,0 +1,14 @@ +version_array = meson.project_version().split('.') +version_data = configuration_data() +version_data.set_quoted('WLR_VERSION_STR', meson.project_version()) +version_data.set('WLR_VERSION_MAJOR', version_array[0]) +version_data.set('WLR_VERSION_MINOR', version_array[1]) +version_data.set('WLR_VERSION_MICRO', version_array[2]) +version_data.set('WLR_VERSION_NUM', '(WLR_VERSION_MAJOR << 16) | (WLR_VERSION_MINOR << 8) | WLR_VERSION_MICRO') +version_data.set('WLR_VERSION_API_CURRENT', so_version[0]) +version_data.set('WLR_VERSION_API_REVISION', so_version[1]) +version_data.set('WLR_VERSION_API_AGE', so_version[2]) + +header_install_dir = 'include/@0@/wlr'.format(meson.project_name()) +configure_file(output: 'config.h', install_dir: header_install_dir, configuration: conf_data) +configure_file(output: 'version.h', install_dir: header_install_dir, configuration: version_data) diff --git a/include/wlr/xwayland.h b/include/wlr/xwayland.h index 37b09204..8d71a7ab 100644 --- a/include/wlr/xwayland.h +++ b/include/wlr/xwayland.h @@ -3,7 +3,7 @@ #include <time.h> #include <stdbool.h> -#include "config.h" +#include <wlr/config.h> #include <wlr/types/wlr_compositor.h> #include <wlr/types/wlr_seat.h> #include <xcb/xcb.h> |