Skip to content

Commit c85ac95

Browse files
committed
meson: add macos specific tweaks
Treat files as Objective-C++ instead of C++ because some included macos headers are Objective-C++ Objective-C++ apparently is a superset of C++ so we should be all good
1 parent bc20719 commit c85ac95

File tree

1 file changed

+16
-4
lines changed

1 file changed

+16
-4
lines changed

meson.build

+16-4
Original file line numberDiff line numberDiff line change
@@ -262,11 +262,22 @@ if host_machine.system() == 'linux'
262262
subdir: 'openframeworks'
263263
)
264264

265+
elif host_machine.system() == 'darwin'
266+
267+
deps += [dependency('appleframeworks', modules : ['Cocoa', 'AppKit', 'Foundation', 'AVKit', 'GLKit'])]
268+
add_project_arguments('-ObjC++', language: 'cpp')
269+
270+
sources += files(
271+
'libs/openFrameworks/sound/ofAVEngineSoundPlayer.mm'
272+
'libs/openFrameworks/video/ofAVFoundationGrabber.mm'
273+
'libs/openFrameworks/video/ofAVFoundationPlayer.mm'
274+
)
275+
265276
endif
266277

267-
# We need to treat this dependency independently
278+
# We need to treat this dependency independently
268279
# because if it's not installed in the host system,
269-
# we will use the .wrap file in the subprojects file AND
280+
# we will use the .wrap file in the subprojects file AND
270281
# need to change a define in the cmake subproject
271282
uriparser_dep = dependency('uriparser', required: false)
272283
if not uriparser_dep.found()
@@ -298,7 +309,7 @@ freeimage_dep = compiler.find_library('freeimage', has_headers: ['FreeImage.h'],
298309
if not freeimage_dep.found()
299310
freeimage_opts = cmake.subproject_options()
300311
# doesn't compile with the define bellow
301-
# freeimage_opts.add_cmake_defines({'BUILD_SHARED_LIBS': true})
312+
# freeimage_opts.add_cmake_defines({'BUILD_SHARED_LIBS': true})
302313
# We need -fPIC to link against the produced static library
303314
freeimage_opts.add_cmake_defines({'CMAKE_POSITION_INDEPENDENT_CODE': true})
304315
freeimage_proj = cmake.subproject('freeimage', options: freeimage_opts)
@@ -311,7 +322,8 @@ lib = library('openFrameworks',
311322
sources,
312323
include_directories: inc,
313324
dependencies: deps,
314-
install: true)
325+
install: true,
326+
)
315327

316328
openframeworks_dep = declare_dependency(link_with: lib, include_directories: inc, dependencies: deps)
317329

0 commit comments

Comments
 (0)