Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix big_sur (osx 11.6) compilation #154

Merged
merged 2 commits into from
Oct 1, 2021
Merged

fix big_sur (osx 11.6) compilation #154

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2d8ee05
fix big sur compilation
jbmouret Oct 1, 2021
b771c88
stop lying about checking opengl on mac
jbmouret Oct 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 15 additions & 11 deletions waf_tools/magnum.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,9 +214,13 @@ def fatal(required, msg):
conf.end_msg(opengl_include_dir)

conf.start_msg('Magnum: Checking for OpenGL lib')
costashatz marked this conversation as resolved.
Show resolved Hide resolved
opengl_lib_dir = get_directory('libGL.'+suffix, libs_check)
magnum_libpaths = magnum_libpaths + [opengl_lib_dir]
magnum_libs = magnum_libs + ['GL']
# no need to check on osx (it works anyway)
# Osx 11.3 (Big Sur) does not have libGL.dylib anymore (there is libGL.tbd)
# but at any rate, OpenGL is a framework so checking the dylib is not really what we need
if conf.env['DEST_OS'] != 'darwin':
opengl_lib_dir = get_directory('libGL.'+suffix, libs_check)
magnum_libpaths = magnum_libpaths + [opengl_lib_dir]
magnum_libs = magnum_libs + ['GL']
conf.end_msg(['GL'])
costashatz marked this conversation as resolved.
Show resolved Hide resolved

conf.start_msg('Magnum: Checking for MagnumGL lib')
Expand Down Expand Up @@ -289,20 +293,20 @@ def fatal(required, msg):
try:
lib_dir = get_directory('lib'+lib_glfw+'.'+suffix, libs_check)
glfw_found = True

magnum_component_libpaths[component] = magnum_component_libpaths[component] + [lib_dir]
magnum_component_libs[component].append(lib_glfw)
break
except:
glfw_found = False

# GlfwApplication needs the libdl.so library
try:
lib_dir = get_directory('libdl.'+suffix, libs_check)
magnum_component_libpaths[component] = magnum_component_libpaths[component] + [lib_dir]
magnum_component_libs[component].append('dl')
except:
glfw_found = False
# GlfwApplication needs the libdl.so library (except on mac)
if conf.env['DEST_OS'] != 'darwin':
try:
lib_dir = get_directory('libdl.'+suffix, libs_check)
magnum_component_libpaths[component] = magnum_component_libpaths[component] + [lib_dir]
magnum_component_libs[component].append('dl')
except:
glfw_found = False

if not glfw_found:
fatal(required, 'Not found')
Expand Down