diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 49c155393..25563535d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -38,18 +38,18 @@ jobs: buildtype: release, args: '' } - #- { - # name: macOS Debug, - # os: macos-latest, - # buildtype: debugoptimized, - # args: -Ddefault_library=static - #} - #- { - # name: macOS Release, - # os: macos-latest, - # buildtype: release, - # args: -Ddefault_library=static - #} + - { + name: macOS Debug, + os: macos-latest, + buildtype: debugoptimized, + args: -Ddefault_library=static + } + - { + name: macOS Release, + os: macos-latest, + buildtype: release, + args: -Ddefault_library=static + } steps: - uses: actions/checkout@v2 diff --git a/meson.build b/meson.build index a8480e927..cd03a4f27 100644 --- a/meson.build +++ b/meson.build @@ -230,7 +230,7 @@ if host_machine.system() == 'windows' and not get_option('directsound').disabled endif 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 endif @@ -326,7 +326,7 @@ aegisub_c_pch = ['src/include/agi_pre_c.h'] aegisub = executable('aegisub', aegisub_src, version_h, acconf, 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, c_pch: aegisub_c_pch, install: true,