glava-config build process and initial widget layout

2019-09-04 10:46:56 -07:00
parent a38f79e279
commit 7d6d7e2987
11 changed files with 663 additions and 26681 deletions
--- a/meson.build
+++ b/meson.build
@@ -1,135 +1,166 @@
 project(
-	'glava',
-	'c',
-	version: run_command('git', 'describe', '--tags').stdout().strip()
-)
+  'glava',
+  'c',
+  version: run_command('git', 'describe', '--tags').stdout().strip(),
+  default_options:['buildtype=release', 'strip=true', 'optimization=2'])

 cc = meson.get_compiler('c')
+add_project_arguments('-Wstringop-overflow=0', language: 'c')

-if get_option('buildtype').startswith('debug')
-	add_project_arguments(
-		'-O0',
-		'-ggdb',
-		'-Wall',
-		'-DGLAVA_DEBUG',
-		language: 'c'
-	)
-	if get_option('glad')
-		run_command('./glad_generate.sh', 'c-debug')
-	endif
-else
-	add_project_arguments(
-		'-O2',
-		'-Wstringop-overflow=0',
-		language: 'c'
-	)
-	if get_option('glad')
-		run_command('./glad_generate.sh')
-	endif
+if get_option('glad')
+  if get_option('buildtype').startswith('debug')
+	run_command('./glad_generate.sh', 'c-debug')
+  else
+    run_command('./glad_generate.sh')
+  endif
 endif

 glava_dependencies = [
-	dependency('threads'),
-	cc.find_library('pulse'),
-	cc.find_library('pulse-simple'),
-	cc.find_library('dl'),
-	cc.find_library('m'),
-	cc.find_library('X11'),
-	cc.find_library('Xext')
+  dependency('threads'),
+  cc.find_library('pulse'),
+  cc.find_library('pulse-simple'),
+  cc.find_library('dl'),
+  cc.find_library('m'),
+  cc.find_library('X11'),
+  cc.find_library('Xext')
 ]

+shader_dir = get_option('shader_install_dir')
 glava_version = meson.project_version()
 if glava_version == ''
-	glava_version = 'unknown'
+  glava_version = 'unknown'
 endif

-shaderdir = get_option('shaderdir')
-if host_machine.system() == 'linux'
-	add_project_arguments(
-		'-DGLAVA_UNIX',
-		language: 'c'
-	)
+if host_machine.system() == 'linux' or host_machine.system() == 'bsd'
+  add_project_arguments('-DGLAVA_UNIX', language: 'c')
 endif
+
+# Note: the OSX install directives only exist for future platform support
 if host_machine.system() == 'darwin'
-	add_project_arguments(
-		'-DGLAVA_OSX',
-		language: 'c'
-	)
-	shaderdir = '/Library/glava/'
+  add_project_arguments('-DGLAVA_OSX', language: 'c')
+  error('OSX targets are not supported, see issue #86.')
+  # shader_dir = '/Library/glava/'
 endif

 if get_option('enable_glfw')
-	add_project_arguments(
-		'-DGLAVA_GLFW',
-		language: 'c'
-	)
-	glava_dependencies += cc.find_library('glfw')
+  add_project_arguments('-DGLAVA_GLFW', language: 'c')
+  glava_dependencies += cc.find_library('glfw')
 endif

 if not get_option('disable_glx')
-	add_project_arguments(
-		'-DGLAVA_GLX',
-		language: 'c'
-	)
-	glava_dependencies += cc.find_library('Xrender')
+  add_project_arguments('-DGLAVA_GLX', language: 'c')
+  glava_dependencies += cc.find_library('Xrender')
 endif

 if get_option('standalone')
-	add_project_arguments(
-		'-DGLAVA_STANDALONE',
-		language: 'c')
+  add_project_arguments('-DGLAVA_STANDALONE', language: 'c')
+endif
+
+resource_dir = get_option('resource_install_dir')
+if get_option('standalone')
+  resource_dir = '..'
 endif

 add_project_arguments(
-	'-DGLAVA_VERSION="'+glava_version+'"',
-	'-DSHADER_INSTALL_PATH="'+shaderdir+'/glava"',
-    '-I/usr/include/obs',
-    '-fvisibility=hidden',
-	language: 'c'
-)
+  '-DGLAVA_VERSION="' + glava_version + '"',
+  '-DSHADER_INSTALL_PATH="' + shader_dir + '/glava"',
+  '-DGLAVA_RESOURCE_PATH="' + resource_dir + '/resources"',
+  '-I/usr/include/obs',
+  '-fvisibility=hidden',
+  language: 'c')

 libglava = shared_library(
-	'glava',
-	sources: run_command('find', 'glava', '-type', 'f', '-name', '*.c', '-print').stdout().strip().split('\n'),
-	dependencies: glava_dependencies,
-	install: true
-)
+  'glava',
+  sources: run_command('find', 'glava', '-type', 'f', '-name', '*.c', '-print')
+           .stdout().strip().split('\n'),
+  dependencies: glava_dependencies,
+  install:      true)

 executable(
-    'glava',
-    sources: run_command('find', 'glava-cli', '-type', 'f', '-name', '*.c', '-print').stdout().strip().split('\n'),
-    link_with: libglava,
-    c_args: '-I' + meson.source_root() + '/glava',
-    install: true
-)
+  'glava',
+  sources:   'glava-cli/cli.c',
+  link_with: libglava,
+  c_args:    '-I' + meson.source_root() + '/glava',
+  install:   true)

-executable(
-	'glava-config',
-	sources: run_command('find', 'glava-config', '-type', 'f', '-name', '*.c', '-print').stdout().strip().split('\n'),
-	dependencies: [
-		cc.find_library('GL'),
-		cc.find_library('X11')
-	],
-	c_args: '-Wunused-but-set-variable',
-	install: true
-)
+if not get_option('disable_config')
+  
+  # Generator and target for lua objects used by `glava-config`.
+  # This has been written such that ninja can detect when sources
+  # need to be rebuilt.

-if not get_option('disable_obs')
-    shared_library(
-        'glava-obs',
-        sources: run_command('find', 'glava-obs', '-type', 'f', '-name', '*.c', '-print').stdout().strip().split('\n'),
-        link_with: libglava,
-        dependencies: [
-	        dependency('threads'),
-		    cc.find_library('GL'),
-		    cc.find_library('X11'),
-            cc.find_library('obs'),
-	        cc.find_library('dl')
-	    ],
-	    install: true,
-        install_dir : '/usr/lib/obs-plugins'
-    )
+  luac_input_ext  = 'lua'
+  luac_output_ext = 'lua'
+  
+  luac_args = ['-o', '@OUTPUT@', '@INPUT@']
+  if not get_option('buildtype').startswith('debug')
+    luac_args += '-s'
+  endif
+  glava_config_lua_sources = run_command(
+    'find', 'glava-config', '-type', 'f', '-name', '*.' + luac_input_ext, '-print'
+  ).stdout().strip().split('\n')
+  glava_config_lua_targets = []
+  foreach s: run_command(
+    'basename', '-s.' + luac_input_ext, glava_config_lua_sources
+  ).stdout().strip().split('\n')
+    glava_config_lua_targets += s + '.' + luac_output_ext
+  endforeach
+  
+  luac_target = custom_target(
+    'glava-config-luac',
+    input: generator(
+      find_program('luac'),
+      output:    '@BASENAME@.' + luac_output_ext,
+      arguments: ['-o', '@OUTPUT@', '@INPUT@']).process(glava_config_lua_sources),
+    output:           glava_config_lua_targets,
+    command:          [find_program('cp'), '-t', '@OUTDIR@', '@INPUT@'],
+    build_by_default: true,
+    install:          true,
+    install_dir:      get_option('lua_install_dir') + '/glava-config')
+
+  executable(
+    'glava-config',
+    install: true,
+    sources: 'glava-config/entry.c',
+    dependencies: [
+	  cc.find_library('X11'),
+      cc.find_library('lua')
+    ])
+
+  # Local glava-config environment symlink for standalone execution
+  if get_option('standalone')
+    env_target = custom_target(
+      'glava-config-env', input: [], output: 'glava-env',
+      depends:          luac_target,
+      command:          [find_program('mkdir'), '-p', 'glava-env'],
+      build_by_default: true)
+    
+    custom_target(
+      'glava-config-ln', input: [], output: '.PHONY',
+      depends:          env_target,
+      command:          [find_program('ln'), '-sfT',
+                         '../glava-config-luac@cus',
+                         'glava-env/glava-config'],
+      build_by_default: true)
+  endif
 endif

-install_subdir('shaders/glava', install_dir: shaderdir)
+if not get_option('disable_obs')
+  shared_library(
+    'glava-obs',
+	install:     true,
+    install_dir: get_option('obs_plugin_install_dir'),
+    sources:     'glava-obs/entry.c',
+    link_with:   libglava,
+    dependencies: [
+	  dependency('threads'),
+	  cc.find_library('GL'),
+	  cc.find_library('X11'),
+      cc.find_library('obs'),
+	  cc.find_library('dl')
+	])
+endif
+
+install_subdir('shaders/glava', install_dir: shader_dir)
+install_subdir('resources', install_dir: resource_dir)
 install_headers('glava/glava.h')