diff --git a/meson.build b/meson.build index 543d9b8..b3b5805 100644 --- a/meson.build +++ b/meson.build @@ -1,7 +1,7 @@ project( 'wcp', 'c', - version: '0.75b', + version: '0.76b', license: 'MIT', default_options: ['c_std=gnu99', 'warning_level=3'] @@ -9,17 +9,16 @@ project( cc = meson.get_compiler('c') -gl = cc.find_library('GL') -egl = cc.find_library('EGL') -png = cc.find_library('png') -wegl = cc.find_library('wayland-egl') +egl = dependency('egl') +png = dependency('libpng') +glew = dependency('glew') math = cc.find_library('m') -glew = cc.find_library('GLEW') -pthread = cc.find_library('pthread') -freetype = cc.find_library('freetype') - +wegl = dependency('wayland-egl') +glesv2 = dependency('glesv2') +freetype = dependency('freetype2') xkbcommon = dependency('xkbcommon') + wayland_client = dependency('wayland-client') wayland_cursor = dependency('wayland-cursor') wayland_protos = dependency('wayland-protocols') @@ -62,11 +61,10 @@ wcp_dependencies = [wayland_client, png, freetype, math, - gl, + glesv2, glew, egl, wegl, - pthread, xkbcommon] wcp_version = '"@0@"'.format(meson.project_version()) @@ -92,23 +90,8 @@ wcp_inc = include_directories( 'src/mt_core_ext') if build_machine.system() == 'freebsd' - wcp_inc = [ - wcp_inc, - include_directories( - '/usr/local/include', - '/usr/local/include/GLES2', - '/usr/local/include/EGL', - '/usr/local/include/freetype2')] epoll = cc.find_library('epoll-shim') - wcp_dependencies += epoll -else - wcp_inc = [ - wcp_inc, - include_directories( - '/usr/include', - '/usr/include/GLES2', - '/usr/include/EGL', - '/usr/include/freetype2')] + sov_dependencies += epoll endif com_sources = ['src/wcp/ui.c', diff --git a/res/html/main.css b/res/html/main.css index 5c3dfdc..fc4ed26 100644 --- a/res/html/main.css +++ b/res/html/main.css @@ -49,7 +49,7 @@ line-height: 25px; color: #DEDEDEFF; font-size: 16px; - font-family: "Ubuntu"; + font-family: "Terminus (TTF):style=Bold"; } .button0 { diff --git a/src/wcp/wcp.c b/src/wcp/wcp.c index c35d32a..b900490 100644 --- a/src/wcp/wcp.c +++ b/src/wcp/wcp.c @@ -98,7 +98,7 @@ void update(ku_event_t ev) /* mt_log_debug("drt %i %i %i %i", (int) dirty.x, (int) dirty.y, (int) dirty.w, (int) dirty.h); */ /* mt_log_debug("drt prev %i %i %i %i", (int) wcp.dirtyrect.x, (int) wcp.dirtyrect.y, (int) wcp.dirtyrect.w, (int) wcp.dirtyrect.h); */ - mt_log_debug("sum aftr %i %i %i %i", (int) sum.x, (int) sum.y, (int) sum.w, (int) sum.h); + /* mt_log_debug("sum aftr %i %i %i %i", (int) sum.x, (int) sum.y, (int) sum.w, (int) sum.h); */ ku_renderer_software_render(wcp.kuwindow->views, &wcp.wlwindow->bitmap, sum);