Skip to content

Commit

Permalink
meson: Remove outdated deps_inc variable
Browse files Browse the repository at this point in the history
  • Loading branch information
arch1t3cht committed Jan 27, 2025
1 parent 987fad8 commit dd48a1a
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 5 deletions.
2 changes: 1 addition & 1 deletion libaegisub/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ libaegisub_inc = include_directories('include')
libaegisub = static_library('aegisub', libaegisub_src, aegisub_order_dep,
c_args: aegisub_defines,
cpp_args: aegisub_defines,
include_directories: [libaegisub_inc, deps_inc],
include_directories: libaegisub_inc,
cpp_pch: libaegisub_cpp_pch,
c_pch: libaegisub_c_pch,
dependencies: deps)
3 changes: 1 addition & 2 deletions meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,6 @@ if get_option('enable_update_checker')
endif

deps = []
deps_inc = []

if host_machine.system() == 'darwin'
add_languages('objc', 'objcpp')
Expand Down Expand Up @@ -414,7 +413,7 @@ aegisub = executable('aegisub', aegisub_src, version_h, resrc, aegisub_order_dep
c_args: aegisub_defines,
cpp_args: aegisub_defines,
link_with: [libresrc, libaegisub],
include_directories: [libaegisub_inc, libresrc_inc, version_inc, deps_inc, include_directories('src')],
include_directories: [libaegisub_inc, libresrc_inc, version_inc, include_directories('src')],
cpp_pch: aegisub_cpp_pch,
c_pch: aegisub_c_pch,
install: true,
Expand Down
2 changes: 1 addition & 1 deletion src/libresrc/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -100,4 +100,4 @@ resrc += custom_target('default_config.{cpp,h}',


libresrc_inc = include_directories('.')
libresrc = static_library('resrc', 'libresrc.cpp', resrc, include_directories: deps_inc, dependencies: deps)
libresrc = static_library('resrc', 'libresrc.cpp', resrc, dependencies: deps)
2 changes: 1 addition & 1 deletion tests/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ endif
runner = executable(
'gtest-main',
tests_src,
include_directories: [tests_inc, libaegisub_inc, deps_inc],
include_directories: [tests_inc, libaegisub_inc],
dependencies: [tests_deps, deps],
cpp_args: tests_args,
link_with: libaegisub,
Expand Down

0 comments on commit dd48a1a

Please sign in to comment.