mirror of https://github.com/odrling/Aegisub
fix build (again)
This commit is contained in:
parent
49eaeafe52
commit
324dd164f2
|
@ -25,24 +25,23 @@ jobs:
|
||||||
mingw-w64-x86_64-ninja
|
mingw-w64-x86_64-ninja
|
||||||
mingw-w64-x86_64-meson
|
mingw-w64-x86_64-meson
|
||||||
mingw-w64-x86_64-cmake
|
mingw-w64-x86_64-cmake
|
||||||
mingw-w64-x86_64-python-pip
|
mingw-w64-x86_64-wxWidgets
|
||||||
|
mingw-w64-x86_64-boost
|
||||||
- name: Irrational Python things
|
mingw-w64-x86_64-libass
|
||||||
run: |
|
mingw-w64-x86_64-glib2
|
||||||
MSYSTEM= pip install --upgrade certifi
|
mingw-w64-x86_64-ffms2
|
||||||
|
mingw-w64-x86_64-icu
|
||||||
|
mingw-w64-x86_64-imagemagick
|
||||||
|
|
||||||
- name: Build Aegisub
|
- name: Build Aegisub
|
||||||
run: |
|
run: |
|
||||||
MSYSTEM= meson builddir -Dbuildtype=release -Ddefault_library=static
|
meson builddir -Dbuildtype=release -Ddefault_library=static
|
||||||
ninja -C builddir
|
ninja -C builddir
|
||||||
|
|
||||||
- name: Create installer
|
- name: Create installer
|
||||||
run: |
|
run: |
|
||||||
tree
|
tree
|
||||||
curl -o "aegisub-codecs.zip" https://mugen.karaokes.moe/downloads/aegisub-codecs.zip
|
curl -o "aegisub-codecs.zip" https://mugen.karaokes.moe/downloads/aegisub-codecs.zip
|
||||||
for i in po/*.po; do
|
|
||||||
msgfmt -o $(basename $i .po).mo $i
|
|
||||||
done
|
|
||||||
cd packages/win_installer
|
cd packages/win_installer
|
||||||
curl -o "innosetup.zip" https://hikari.butaishoujo.moe/b/52a01bb4/innosetup.zip
|
curl -o "innosetup.zip" https://hikari.butaishoujo.moe/b/52a01bb4/innosetup.zip
|
||||||
unzip innosetup.zip
|
unzip innosetup.zip
|
||||||
|
|
|
@ -123,7 +123,6 @@ if host_machine.system() == 'windows'
|
||||||
endif
|
endif
|
||||||
|
|
||||||
deps += openssl_dep
|
deps += openssl_dep
|
||||||
|
|
||||||
deps += dependency('zlib')
|
deps += dependency('zlib')
|
||||||
|
|
||||||
wx_dep = dependency('wxWidgets', version: '>=3.0.0',
|
wx_dep = dependency('wxWidgets', version: '>=3.0.0',
|
||||||
|
|
|
@ -211,12 +211,30 @@ foreach opt: opt_src
|
||||||
endif
|
endif
|
||||||
endforeach
|
endforeach
|
||||||
|
|
||||||
# avisynth for windows build
|
|
||||||
if host_machine.system() == 'windows'
|
if host_machine.system() == 'windows'
|
||||||
aegisub_src += [
|
res_inc = include_directories(
|
||||||
'audio_provider_avs.cpp',
|
'bitmaps/windows',
|
||||||
'video_provider_avs.cpp',
|
)
|
||||||
]
|
|
||||||
|
res_dep_files = files(
|
||||||
|
'bitmaps/windows/icon.ico',
|
||||||
|
'bitmaps/windows/eyedropper.cur',
|
||||||
|
)
|
||||||
|
|
||||||
|
raw_wx_windres_args = wx_dep.get_variable(configtool : 'rescomp').split()
|
||||||
|
wx_windres_args = []
|
||||||
|
foreach arg : raw_wx_windres_args
|
||||||
|
if arg != 'windres'
|
||||||
|
wx_windres_args += arg
|
||||||
|
endif
|
||||||
|
endforeach
|
||||||
|
windows = import('windows')
|
||||||
|
|
||||||
|
aegisub_src += windows.compile_resources('res/res.rc',
|
||||||
|
args : wx_windres_args,
|
||||||
|
depend_files : res_dep_files,
|
||||||
|
include_directories : [res_inc, version_inc]
|
||||||
|
)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -21,9 +21,9 @@ eyedropper_cursor CURSOR "../bitmaps/windows/eyedropper.cur"
|
||||||
|
|
||||||
// We supply the manifest ourselves
|
// We supply the manifest ourselves
|
||||||
#define wxUSE_NO_MANIFEST 1
|
#define wxUSE_NO_MANIFEST 1
|
||||||
#include "wx/msw/wx.rc"
|
#include <wx/msw/wx.rc>
|
||||||
|
|
||||||
#include "../../build/git_version.h"
|
#include "git_version.h"
|
||||||
#include <Winver.h>
|
#include <Winver.h>
|
||||||
|
|
||||||
#ifdef _DEBUG
|
#ifdef _DEBUG
|
||||||
|
@ -53,8 +53,8 @@ eyedropper_cursor CURSOR "../bitmaps/windows/eyedropper.cur"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
VS_VERSION_INFO VERSIONINFO
|
VS_VERSION_INFO VERSIONINFO
|
||||||
FILEVERSION RESOURCE_BASE_VERSION, BUILD_GIT_VERSION_NUMBER
|
FILEVERSION 0, BUILD_GIT_VERSION_NUMBER
|
||||||
PRODUCTVERSION RESOURCE_BASE_VERSION, 0
|
PRODUCTVERSION 0, 0
|
||||||
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
|
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
|
||||||
FILEFLAGS (AGI_RC_FLAG_DEBUG|AGI_RC_FLAG_PRERELEASE)
|
FILEFLAGS (AGI_RC_FLAG_DEBUG|AGI_RC_FLAG_PRERELEASE)
|
||||||
FILEOS VOS__WINDOWS32
|
FILEOS VOS__WINDOWS32
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
[wrap-file]
|
[wrap-file]
|
||||||
directory = boost_1_74_0
|
directory = boost_1_74_0
|
||||||
source_url = https://hikari.butaishoujo.moe/b/afff36d3/boost_1_74_0.tar.gz
|
source_url = https://dl.bintray.com/boostorg/release/1.74.0/source/boost_1_74_0.tar.gz
|
||||||
source_filename = boost_1_74_0.tar.gz
|
source_filename = boost_1_74_0.tar.gz
|
||||||
source_hash = afff36d392885120bcac079148c177d1f6f7730ec3d47233aa51b0afa4db94a5
|
source_hash = afff36d392885120bcac079148c177d1f6f7730ec3d47233aa51b0afa4db94a5
|
||||||
patch_directory = boost
|
patch_directory = boost
|
||||||
|
|
Loading…
Reference in New Issue