mirrors/zathura
1
0
Fork 0
mirror of https://git.pwmt.org/pwmt/zathura.git synced 2024-12-27 12:26:00 +01:00
Code Issues Projects Releases Packages Wiki Activity

Refactor Gtk OSX Application support

Browse source
This commit is contained in:
Sebastian Ramacher 2021-01-05 09:46:31 +01:00
parent bf3d1d820d
commit 0150d47204
3 changed files with 9 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
meson.build
View file

@ -50,7 +50,6 @@ build_dependencies = [libm, girara, glib, gio, gthread, gmodule, gtk3, cairo]
if host_machine.system() == 'darwin' if host_machine.system() == 'darwin'
gtk_mac_integration = dependency('gtk-mac-integration-gtk3') gtk_mac_integration = dependency('gtk-mac-integration-gtk3')
build_dependencies += gtk_mac_integration build_dependencies += gtk_mac_integration
conf_data.set('GTKOSXAPPLICATION', true)
endif endif
@ -62,6 +61,10 @@ defines = [
'-D_DEFAULT_SOURCE', '-D_DEFAULT_SOURCE',
] ]
if host_machine.system() == 'darwin'
defines += '-DGTKOSXAPPLICATION'
endif
# compile flags # compile flags
flags = [ flags = [
'-Werror=implicit-function-declaration', '-Werror=implicit-function-declaration',
@ -109,12 +112,6 @@ version_header = configure_file(
configuration: conf_data configuration: conf_data
) )
os_dependency_header = configure_file(
input: 'zathura/os-dependency.h.in',
output: 'zathura-os-dependency.h',
configuration: conf_data
)
include_directories = [ include_directories = [
include_directories('.') include_directories('.')
] ]
@ -157,7 +154,7 @@ sources = files(
sources += zathura_resources sources += zathura_resources
sources += additional_sources sources += additional_sources
# header fiels to install # header files to install
headers = files( headers = files(
'zathura/document.h', 'zathura/document.h',
'zathura/links.h', 'zathura/links.h',
@ -167,7 +164,6 @@ headers = files(
'zathura/types.h', 'zathura/types.h',
) )
headers += version_header headers += version_header
headers += os_dependency_header
# zathura helper library # zathura helper library
libzathura = static_library('zathura', libzathura = static_library('zathura',

5
zathura/main.c
View file

@ -1,6 +1,9 @@
/* SPDX-License-Identifier: Zlib */ /* SPDX-License-Identifier: Zlib */
#include "zathura-os-dependency.h" #ifdef GTKOSXAPPLICATION
#include <gtkosxapplication.h>
#endif
#include <girara/settings.h> #include <girara/settings.h>
#include <girara/log.h> #include <girara/log.h>

8
zathura/os-dependency.h.in
View file

@ -1,8 +0,0 @@
/* SPDX-License-Identifier: Zlib */
#mesondefine GTKOSXAPPLICATION
#ifdef GTKOSXAPPLICATION
#include <gtkosxapplication.h>
#endif