mirrors/mkxp-z
1
0
Fork 0
mirror of https://github.com/mkxp-z/mkxp-z.git synced 2025-09-10 12:02:53 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Correctly add Windows resources

Browse source
This commit is contained in:
Inori 2019-07-30 09:17:20 -04:00 • committed by Inori
parent be9eda93c0
commit d641c7187c
2 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
meson.build
View file

@ -1,4 +1,4 @@
project('mkxp', 'cpp', version: '1.0', meson_version: '>=0.45.1')
project('mkxp', 'cpp', version: '1.0')
xxd = find_program('xxd')
binding_dir = 'binding-' + get_option('binding')
@ -16,20 +16,22 @@ subdir('shader')
subdir('assets')
all_sources = [main_headers, main_source, binding_headers, binding_source, processed_shaders, processed_assets]
include_dirs = [include_directories('src', binding_dir)]
linker_args = []
if host_system == 'windows'
subdir('windows')
all_sources += windows_resources
include_dirs += include_directories('windows')
elif host_system == 'darwin'
if meson.get_compiler('cpp').get_id() == 'clang'
add_project_arguments(['-std=c++11','-stdlib=libc++'], language: 'cpp')
endif
endif
executable('mkxp.@1@.@0@'.format(host_machine.cpu(), host_system),
executable('@0@-@1@_@2@'.format(meson.project_name(), host_system, host_machine.cpu_family()),
sources: all_sources,
dependencies: [main_dependencies, binding_dependencies],
include_directories: include_directories('src', binding_dir),
include_directories: include_dirs
)

11
windows/meson.build
View file

@ -1,10 +1,9 @@
win = import('Windows')
win = import('windows')
res = files(
'icon.ico',
'resource.h',
'resource.rc'
'resource.h',
'icon.ico',
'resource.rc'
)
windows_resources = win.compile_resources(depend_files: windows_resources)
windows_resources = win.compile_resources('resource.rc', depend_files: res)