From 631ed45c280cb306d1e23d2090916ad2b2d2e007 Mon Sep 17 00:00:00 2001 From: Splendide Imaginarius <119545140+Splendide-Imaginarius@users.noreply.github.com> Date: Thu, 26 Oct 2023 04:10:26 +0000 Subject: [PATCH] Support Windows resources outside of repo directory --- meson.build | 6 +++--- windows/meson.build | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/meson.build b/meson.build index 170b654..17bb062 100644 --- a/meson.build +++ b/meson.build @@ -125,10 +125,10 @@ global_include_dirs += include_directories('src', 'binding') rpath = '' if host_system == 'windows' - windows_resource_directory = get_option('windows_resource_directory') - subdir(windows_resource_directory) + windows_resource_directory = '../' + get_option('windows_resource_directory') + subdir('windows') global_sources += windows_resources - global_include_dirs += include_directories(windows_resource_directory) + global_include_dirs += include_directories('windows') else subdir('linux') rpath = '$ORIGIN/lib' diff --git a/windows/meson.build b/windows/meson.build index d41b0af..3b49417 100644 --- a/windows/meson.build +++ b/windows/meson.build @@ -1,10 +1,10 @@ win = import('windows') res = files( -'resource.h', -'icon.ico', -'mkxpz.manifest', -'resource.rc' +windows_resource_directory + '/resource.h', +windows_resource_directory + '/icon.ico', +windows_resource_directory + '/mkxpz.manifest', +windows_resource_directory + '/resource.rc' ) -windows_resources = win.compile_resources('resource.rc', depend_files: res) +windows_resources = win.compile_resources(windows_resource_directory + '/resource.rc', depend_files: res)