mia/Aegisub
1
0
Fork 1
Code Issues Pull requests Projects Releases Wiki Activity

meson: fix warnings, cleanup

Browse source
This commit is contained in:
Ryan 2021-01-30 12:02:18 -05:00
parent 73ad926880
commit 36b75b827d
5 changed files with 7 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
meson.build
View file

@ -46,10 +46,6 @@ endif
docdir = prefix / 'doc' docdir = prefix / 'doc'
dataroot = datadir / 'aegisub' dataroot = datadir / 'aegisub'
if host_machine.system() == 'windows'
endif
# MSVC sets this automatically with -MDd, but it has a different meaning on other platforms # MSVC sets this automatically with -MDd, but it has a different meaning on other platforms
if get_option('debug') and host_machine.system() != 'windows' if get_option('debug') and host_machine.system() != 'windows'
add_project_arguments('-D_DEBUG', language: 'cpp') add_project_arguments('-D_DEBUG', language: 'cpp')

8
packages/meson.build
View file

@ -1,15 +1,15 @@
conf_pkg = configuration_data() conf_pkg = configuration_data()
if host_machine.system() == 'windows' if host_machine.system() == 'windows'
installer_setup = find_program(meson.source_root() / 'tools/win-installer-setup.ps1', ) installer_setup = find_program(meson.project_source_root() / 'tools/win-installer-setup.ps1', )
run_target('win-installer', run_target('win-installer',
command: [installer_setup, meson.build_root(), meson.source_root()]) command: [installer_setup, meson.project_build_root(), meson.project_source_root()])
elif host_machine.system() == 'darwin' elif host_machine.system() == 'darwin'
# temporary hack until version.sh generates this properly # temporary hack until version.sh generates this properly
run_command('cp', meson.source_root() / 'tools' / 'osx-bundle.sed', meson.build_root()) run_command('cp', meson.project_source_root() / 'tools' / 'osx-bundle.sed', meson.project_build_root())
fontconfig_conf = run_command('pkg-config', '--variable=confdir', 'fontconfig').stdout().strip() fontconfig_conf = run_command('pkg-config', '--variable=confdir', 'fontconfig').stdout().strip()
run_target('osx-bundle', run_target('osx-bundle',
command: ['../tools/osx-bundle.sh', meson.source_root(), meson.build_root(), 'wx-config', fontconfig_conf, '', command: ['../tools/osx-bundle.sh', meson.project_source_root(), meson.project_build_root(), 'wx-config', fontconfig_conf, '',
get_option('build_osx_bundle') ? 'TRUE' : 'FALSE']) get_option('build_osx_bundle') ? 'TRUE' : 'FALSE'])
else else
conf_pkg.set('AEGISUB_COMMAND', 'aegisub') conf_pkg.set('AEGISUB_COMMAND', 'aegisub')

2
src/libresrc/meson.build
View file

@ -1,4 +1,4 @@
respack = find_program('../../tools/respack.py') respack = find_program(meson.project_source_root() / 'tools/respack.py')
resrc = [ resrc = [
custom_target('bitmap.{cpp,h}', custom_target('bitmap.{cpp,h}',

2
src/meson.build
View file

@ -257,4 +257,4 @@ aegisub = executable('aegisub', aegisub_src, version_h, acconf,
install: true, install: true,
install_dir: bindir, install_dir: bindir,
dependencies: deps, dependencies: deps,
gui_app: true) win_subsystem: 'windows')

3
tools/respack.py
View file

@ -1,7 +1,6 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
import sys import sys, os
import os
manifestfile, cppfile, hfile = sys.argv[1:] manifestfile, cppfile, hfile = sys.argv[1:]