Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
sherlock.lv2
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
OpenMusicKontrollers
sherlock.lv2
Commits
d9bae3fa
Commit
d9bae3fa
authored
Nov 07, 2018
by
Hanspeter Portner
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
meson: fix darwin.
parent
1555db1c
Pipeline
#35929529
failed with stages
in 2 minutes and 42 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
6 deletions
+7
-6
VERSION
VERSION
+1
-1
meson.build
meson.build
+6
-5
No files found.
VERSION
View file @
d9bae3fa
0.17.1
7
3
0.17.1
8
3
meson.build
View file @
d9bae3fa
...
...
@@ -15,6 +15,7 @@ sratom_dep = dependency('sratom-0', version : '>=0.6.0', static : static_link)
dsp_deps = [m_dep, lv2_dep]
ui_deps = [m_dep, lv2_dep, sratom_dep]
ui_links = []
pugl_inc = include_directories('pugl')
props_inc = include_directories('props.lv2')
...
...
@@ -70,12 +71,11 @@ if host_machine.system() == 'windows'
ui_deps += cc.find_library('user32')
ui_srcs += 'pugl/pugl/pugl_win.cpp'
elif host_machine.system() == 'darwin'
#
add_languages('objc')
add_languages('objc')
conf_data.set('UI_TYPE', 'CocoaUI')
#ui_deps += cc.find_library('Cocoa')
#ui_deps += cc.find_library('gl')
#ui_deps += dependency('appleframeworks', modules : 'cocoa')
#ui_srcs += 'pugl/pugl/pugl_osx.m'
ui_links += ['-framework', 'OpenGL']
ui_links += ['-framework', 'Cocoa']
ui_srcs += 'pugl/pugl/pugl_osx.m'
else
conf_data.set('UI_TYPE', 'X11UI')
ui_deps += dependency('gl')
...
...
@@ -97,6 +97,7 @@ ui = shared_module('sherlock_nk', ui_srcs,
include_directories : inc_dir,
name_prefix : '',
dependencies : ui_deps,
link_args : ui_links,
install : true,
install_dir : inst_dir)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment