Skip to content

Commit

Permalink
Renamed wlr variables to scenefx ones
Browse files Browse the repository at this point in the history
  • Loading branch information
ErikReider committed May 7, 2024
1 parent 750ec5a commit 81ccdfe
Show file tree
Hide file tree
Showing 8 changed files with 15 additions and 15 deletions.
12 changes: 6 additions & 6 deletions meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ project(

# When doing a major or minor release, *always* increase soversion. This isn't
# necessary for bugfix releases. Increasing soversion is required because
# wlroots never guarantees ABI stability -- only API stability is guaranteed
# SceneFX never guarantees ABI stability -- only API stability is guaranteed
# between minor releases.
soversion = 1

Expand Down Expand Up @@ -139,8 +139,8 @@ pixman = dependency('pixman-1',
math = cc.find_library('m')
rt = cc.find_library('rt')

wlr_files = []
wlr_deps = [
scenefx_files = []
scenefx_deps = [
wlroots,
wayland_server,
drm,
Expand All @@ -161,17 +161,17 @@ subdir('include')
scenefx_inc = include_directories('include')

lib_scenefx = library(
meson.project_name(), wlr_files,
meson.project_name(), scenefx_files,
soversion: soversion.to_string(),
dependencies: wlr_deps,
dependencies: scenefx_deps,
include_directories: [ scenefx_inc ],
install: true,
)


scenefx = declare_dependency(
link_with: lib_scenefx,
dependencies: wlr_deps,
dependencies: scenefx_deps,
include_directories: scenefx_inc,
)

Expand Down
4 changes: 2 additions & 2 deletions protocol/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -68,15 +68,15 @@ foreach name, path : protocols
output: '@BASENAME@-protocol.c',
command: [wayland_scanner, 'private-code', '@INPUT@', '@OUTPUT@'],
)
wlr_files += code
scenefx_files += code

server_header = custom_target(
name.underscorify() + '_server_h',
input: path,
output: '@BASENAME@-protocol.h',
command: [wayland_scanner, 'server-header', '@INPUT@', '@OUTPUT@'],
)
wlr_files += server_header
scenefx_files += server_header

client_header = custom_target(
name.underscorify() + '_client_h',
Expand Down
2 changes: 1 addition & 1 deletion render/fx_renderer/gles2/shaders/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ shaders = [
foreach name : shaders
output = name.underscorify() + '_src.h'
var = name.underscorify() + '_src'
wlr_files += custom_target(
scenefx_files += custom_target(
output,
command: [embed, var],
input: name,
Expand Down
4 changes: 2 additions & 2 deletions render/fx_renderer/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ elif 'auto' in renderers and get_option('auto_features').disabled()
renderers = []
endif

wlr_files += files(
scenefx_files += files(
'matrix.c',
'util.c',
'shaders.c',
Expand All @@ -23,7 +23,7 @@ if 'gles2' in renderers or 'auto' in renderers
glesv2 = dependency('glesv2', required: 'gles2' in renderers)

if egl.found() and gbm.found() and glesv2.found()
wlr_deps += [egl, gbm, glesv2]
scenefx_deps += [egl, gbm, glesv2]
endif
subdir('gles2')
endif
Expand Down
2 changes: 1 addition & 1 deletion render/meson.build
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
wlr_files += files(
scenefx_files += files(
'pixel_format.c',
'egl.c',
)
Expand Down
2 changes: 1 addition & 1 deletion types/fx/meson.build
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
wlr_files += files(
scenefx_files += files(
'shadow_data.c',
'blur_data.c',
)
2 changes: 1 addition & 1 deletion types/meson.build
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
wlr_files += files(
scenefx_files += files(
'scene/wlr_scene.c',
'output/wlr_output.c',
'buffer/buffer.c',
Expand Down
2 changes: 1 addition & 1 deletion util/meson.build
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
wlr_files += files(
scenefx_files += files(
'array.c',
'env.c',
'time.c',
Expand Down

0 comments on commit 81ccdfe

Please sign in to comment.