mirror of
https://github.com/hyprwm/wlroots-hyprland.git
synced 2024-11-25 22:25:58 +01:00
config: Avoid clash with other config-headers
This commit is contained in:
parent
a0d2a6b445
commit
ff13849624
18 changed files with 19 additions and 16 deletions
|
@ -18,7 +18,7 @@
|
|||
#include <linux/major.h>
|
||||
#endif
|
||||
#include <xf86drm.h>
|
||||
#include "config.h"
|
||||
#include <wlr/config.h>
|
||||
#include <wlr/util/log.h>
|
||||
#include "backend/session/direct-ipc.h"
|
||||
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
#include <sys/stat.h>
|
||||
#include <fcntl.h>
|
||||
#include <wayland-server.h>
|
||||
#include "config.h"
|
||||
#include <wlr/config.h>
|
||||
#include <wlr/backend/session/interface.h>
|
||||
#include <wlr/util/log.h>
|
||||
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
#include <wayland-server.h>
|
||||
#include <xf86drm.h>
|
||||
#include <xf86drmMode.h>
|
||||
#include "config.h"
|
||||
#include <wlr/config.h>
|
||||
#include <wlr/backend/session.h>
|
||||
#include <wlr/backend/session/interface.h>
|
||||
#include <wlr/util/log.h>
|
||||
|
|
|
@ -7,9 +7,10 @@
|
|||
#include <string.h>
|
||||
#include <unistd.h>
|
||||
#include <sys/param.h>
|
||||
#include "config.h"
|
||||
#include <wlr/config.h>
|
||||
#include <wlr/util/log.h>
|
||||
#include <wlr/types/wlr_box.h>
|
||||
#include "support/config.h"
|
||||
#include "shared.h"
|
||||
#include "ini.h"
|
||||
|
||||
|
|
1
include/meson.build
Normal file
1
include/meson.build
Normal file
|
@ -0,0 +1 @@
|
|||
subdir('wlr')
|
|
@ -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>
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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>
|
||||
|
|
1
include/wlr/meson.build
Normal file
1
include/wlr/meson.build
Normal file
|
@ -0,0 +1 @@
|
|||
configure_file(output: 'config.h', install_dir: 'include/wlr', configuration: conf_data)
|
|
@ -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>
|
||||
|
|
|
@ -89,10 +89,10 @@ if get_option('enable_xwayland')
|
|||
else
|
||||
exclude_files += ['xwayland.h', 'xwm.h']
|
||||
endif
|
||||
configure_file(output: 'config.h', install_dir: 'include/wlr', configuration: conf_data)
|
||||
install_subdir('include/wlr', install_dir: 'include', exclude_files: exclude_files)
|
||||
|
||||
|
||||
subdir('include')
|
||||
subdir('protocol')
|
||||
subdir('render')
|
||||
subdir('backend')
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
#include <strings.h>
|
||||
#include <unistd.h>
|
||||
#include <sys/param.h>
|
||||
#include "config.h"
|
||||
#include <wlr/config.h>
|
||||
#include <wlr/util/log.h>
|
||||
#include <wlr/types/wlr_box.h>
|
||||
#include "rootston/config.h"
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
#include <time.h>
|
||||
#include <stdlib.h>
|
||||
#include <math.h>
|
||||
#include "config.h"
|
||||
#include <wlr/config.h>
|
||||
#include <wlr/types/wlr_box.h>
|
||||
#include <wlr/types/wlr_compositor.h>
|
||||
#include <wlr/types/wlr_cursor.h>
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
#include <stdlib.h>
|
||||
#include <unistd.h>
|
||||
#include <wayland-server.h>
|
||||
#include "config.h"
|
||||
#include <wlr/config.h>
|
||||
#include <wlr/backend.h>
|
||||
#include <wlr/backend/headless.h>
|
||||
#include <wlr/backend/multi.h>
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <wayland-server.h>
|
||||
#include "config.h"
|
||||
#include <wlr/config.h>
|
||||
#include <wlr/types/wlr_xcursor_manager.h>
|
||||
#include <wlr/util/log.h>
|
||||
#include "rootston/xcursor.h"
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
#include <stdlib.h>
|
||||
#include <stdbool.h>
|
||||
#include <wayland-server.h>
|
||||
#include "config.h"
|
||||
#include <wlr/config.h>
|
||||
#include <wlr/types/wlr_box.h>
|
||||
#include <wlr/types/wlr_surface.h>
|
||||
#include <wlr/xwayland.h>
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <wayland-server.h>
|
||||
#include "config.h"
|
||||
#include <wlr/config.h>
|
||||
#include <wlr/types/wlr_xdg_shell_v6.h>
|
||||
#include <wlr/types/wlr_surface.h>
|
||||
#include <wlr/types/wlr_seat.h>
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
#include <xcb/xfixes.h>
|
||||
#include <xcb/xcb_image.h>
|
||||
#include <xcb/render.h>
|
||||
#include "config.h"
|
||||
#include <wlr/config.h>
|
||||
#include "wlr/util/log.h"
|
||||
#include "wlr/util/edges.h"
|
||||
#include "wlr/types/wlr_surface.h"
|
||||
|
|
Loading…
Reference in a new issue