mantarimay
/
Aegisub
forked from mia/Aegisub
1
0
Fork 0
Code Pull Requests Activity

Re-enable MacOS CI

This commit is contained in:
Ryan Lucia 2021-05-21 22:02:21 -04:00
parent a856030078
commit aeba7a390e
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
.github/workflows/ci.yml vendored
View File

@ -38,18 +38,18 @@ jobs:
buildtype: release, buildtype: release,
args: '' args: ''
} }
#- { - {
# name: macOS Debug, name: macOS Debug,
# os: macos-latest, os: macos-latest,
# buildtype: debugoptimized, buildtype: debugoptimized,
# args: -Ddefault_library=static args: -Ddefault_library=static
#} }
#- { - {
# name: macOS Release, name: macOS Release,
# os: macos-latest, os: macos-latest,
# buildtype: release, buildtype: release,
# args: -Ddefault_library=static args: -Ddefault_library=static
#} }
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2

4
meson.build
View File

@ -230,7 +230,7 @@ if host_machine.system() == 'windows' and not get_option('directsound').disabled
endif endif
if host_machine.system() == 'darwin' if host_machine.system() == 'darwin'
frameworks_dep = dependency('appleframeworks', modules : ['CoreText', 'CoreFoundation', 'AppKit', 'Carbon']) frameworks_dep = dependency('appleframeworks', modules : ['CoreText', 'CoreFoundation', 'AppKit', 'Carbon', 'IOKit'])
deps += frameworks_dep deps += frameworks_dep
endif endif
@ -326,7 +326,7 @@ aegisub_c_pch = ['src/include/agi_pre_c.h']
aegisub = executable('aegisub', aegisub_src, version_h, acconf, aegisub = executable('aegisub', aegisub_src, version_h, acconf,
link_with: [libresrc, libluabins, libaegisub], link_with: [libresrc, libluabins, libaegisub],
include_directories: [libaegisub_inc, libresrc_inc, version_inc, deps_inc], include_directories: [libaegisub_inc, libresrc_inc, version_inc, deps_inc, include_directories('src')],
cpp_pch: aegisub_cpp_pch, cpp_pch: aegisub_cpp_pch,
c_pch: aegisub_c_pch, c_pch: aegisub_c_pch,
install: true, install: true,