Merge branch 'bugfixes' into feature

This commit is contained in:
arch1t3cht 2023-12-02 17:27:55 +01:00
commit 160cf46b98
2 changed files with 11 additions and 4 deletions

View File

@ -56,9 +56,9 @@ Copy-New-Item $InstallerDepsDir\dictionaries\en_US.aff $PortableOutputDir\dicti
Copy-New-Item $InstallerDepsDir\dictionaries\en_US.dic $PortableOutputDir\dictionaries
Write-Output 'Copying - codecs'
Write-Output 'Copying - codecs\Avisynth'
Copy-New-Item $InstallerDepsDir\AvisynthPlus64\x64\system\DevIL.dll $PortableOutputDir
Copy-New-Item $InstallerDepsDir\AvisynthPlus64\x64\AviSynth.dll $PortableOutputDir
Copy-New-Item $InstallerDepsDir\AvisynthPlus64\x64\plugins\DirectShowSource.dll $PortableOutputDir
Copy-New-Item $InstallerDepsDir\AvisynthPlus64\x64\Output\system\DevIL.dll $PortableOutputDir
Copy-New-Item $InstallerDepsDir\AvisynthPlus64\x64\Output\AviSynth.dll $PortableOutputDir
Copy-New-Item $InstallerDepsDir\AvisynthPlus64\x64\Output\plugins\DirectShowSource.dll $PortableOutputDir
Write-Output 'Copying - codecs\VapourSynth'
Copy-New-Item $InstallerDepsDir\L-SMASH-Works\libvslsmashsource.dll $PortableOutputDir\vapoursynth
Copy-New-Item $InstallerDepsDir\bestaudiosource\win64\BestAudioSource.dll $PortableOutputDir\vapoursynth

View File

@ -54,7 +54,6 @@ aegisub_src = files(
'command/vis_tool.cpp',
'compat.cpp',
'context.cpp',
'crash_writer.cpp',
'dialog_about.cpp',
'dialog_align.cpp',
'dialog_attachments.cpp',
@ -177,6 +176,8 @@ if host_machine.system() == 'darwin'
)
elif host_machine.system() == 'windows'
aegisub_src += files(
'avisynth_wrap.cpp',
'crash_writer_minidump.cpp',
'font_file_lister_gdi.cpp',
# 'libass_gdi_fontselect.cpp',
)
@ -221,6 +222,12 @@ elif host_machine.system() == 'windows'
aegisub_src += windows.compile_resources('res/strings.rc')
endif
if host_machine.system() != 'windows'
aegisub_src += files(
'crash_writer.cpp'
)
endif
if conf.has('WITH_FONTCONFIG')
aegisub_src += files('font_file_lister_fontconfig.cpp')
endif