Skip to content

Commit

Permalink
v0.76b
Browse files Browse the repository at this point in the history
  • Loading branch information
milgra committed Mar 8, 2023
1 parent d94cdd3 commit 2c7a8a1
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 29 deletions.
37 changes: 10 additions & 27 deletions meson.build
Original file line number Diff line number Diff line change
@@ -1,25 +1,24 @@
project(
'wcp',
'c',
version: '0.75b',
version: '0.76b',
license: 'MIT',
default_options: ['c_std=gnu99',
'warning_level=3']
)

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')
Expand Down Expand Up @@ -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())
Expand All @@ -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',
Expand Down
2 changes: 1 addition & 1 deletion res/html/main.css
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
line-height: 25px;
color: #DEDEDEFF;
font-size: 16px;
font-family: "Ubuntu";
font-family: "Terminus (TTF):style=Bold";
}

.button0 {
Expand Down
2 changes: 1 addition & 1 deletion src/wcp/wcp.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down

0 comments on commit 2c7a8a1

Please sign in to comment.