mirror of https://github.com/odrling/Aegisub
Merge branch 'bugfixes' into feature
This commit is contained in:
commit
160cf46b98
|
@ -56,9 +56,9 @@ Copy-New-Item $InstallerDepsDir\dictionaries\en_US.aff $PortableOutputDir\dicti
|
||||||
Copy-New-Item $InstallerDepsDir\dictionaries\en_US.dic $PortableOutputDir\dictionaries
|
Copy-New-Item $InstallerDepsDir\dictionaries\en_US.dic $PortableOutputDir\dictionaries
|
||||||
Write-Output 'Copying - codecs'
|
Write-Output 'Copying - codecs'
|
||||||
Write-Output 'Copying - codecs\Avisynth'
|
Write-Output 'Copying - codecs\Avisynth'
|
||||||
Copy-New-Item $InstallerDepsDir\AvisynthPlus64\x64\system\DevIL.dll $PortableOutputDir
|
Copy-New-Item $InstallerDepsDir\AvisynthPlus64\x64\Output\system\DevIL.dll $PortableOutputDir
|
||||||
Copy-New-Item $InstallerDepsDir\AvisynthPlus64\x64\AviSynth.dll $PortableOutputDir
|
Copy-New-Item $InstallerDepsDir\AvisynthPlus64\x64\Output\AviSynth.dll $PortableOutputDir
|
||||||
Copy-New-Item $InstallerDepsDir\AvisynthPlus64\x64\plugins\DirectShowSource.dll $PortableOutputDir
|
Copy-New-Item $InstallerDepsDir\AvisynthPlus64\x64\Output\plugins\DirectShowSource.dll $PortableOutputDir
|
||||||
Write-Output 'Copying - codecs\VapourSynth'
|
Write-Output 'Copying - codecs\VapourSynth'
|
||||||
Copy-New-Item $InstallerDepsDir\L-SMASH-Works\libvslsmashsource.dll $PortableOutputDir\vapoursynth
|
Copy-New-Item $InstallerDepsDir\L-SMASH-Works\libvslsmashsource.dll $PortableOutputDir\vapoursynth
|
||||||
Copy-New-Item $InstallerDepsDir\bestaudiosource\win64\BestAudioSource.dll $PortableOutputDir\vapoursynth
|
Copy-New-Item $InstallerDepsDir\bestaudiosource\win64\BestAudioSource.dll $PortableOutputDir\vapoursynth
|
||||||
|
|
|
@ -54,7 +54,6 @@ aegisub_src = files(
|
||||||
'command/vis_tool.cpp',
|
'command/vis_tool.cpp',
|
||||||
'compat.cpp',
|
'compat.cpp',
|
||||||
'context.cpp',
|
'context.cpp',
|
||||||
'crash_writer.cpp',
|
|
||||||
'dialog_about.cpp',
|
'dialog_about.cpp',
|
||||||
'dialog_align.cpp',
|
'dialog_align.cpp',
|
||||||
'dialog_attachments.cpp',
|
'dialog_attachments.cpp',
|
||||||
|
@ -177,6 +176,8 @@ if host_machine.system() == 'darwin'
|
||||||
)
|
)
|
||||||
elif host_machine.system() == 'windows'
|
elif host_machine.system() == 'windows'
|
||||||
aegisub_src += files(
|
aegisub_src += files(
|
||||||
|
'avisynth_wrap.cpp',
|
||||||
|
'crash_writer_minidump.cpp',
|
||||||
'font_file_lister_gdi.cpp',
|
'font_file_lister_gdi.cpp',
|
||||||
# 'libass_gdi_fontselect.cpp',
|
# 'libass_gdi_fontselect.cpp',
|
||||||
)
|
)
|
||||||
|
@ -221,6 +222,12 @@ elif host_machine.system() == 'windows'
|
||||||
aegisub_src += windows.compile_resources('res/strings.rc')
|
aegisub_src += windows.compile_resources('res/strings.rc')
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
if host_machine.system() != 'windows'
|
||||||
|
aegisub_src += files(
|
||||||
|
'crash_writer.cpp'
|
||||||
|
)
|
||||||
|
endif
|
||||||
|
|
||||||
if conf.has('WITH_FONTCONFIG')
|
if conf.has('WITH_FONTCONFIG')
|
||||||
aegisub_src += files('font_file_lister_fontconfig.cpp')
|
aegisub_src += files('font_file_lister_fontconfig.cpp')
|
||||||
endif
|
endif
|
||||||
|
|
Loading…
Reference in New Issue