LADI
/
clutter
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'windows-fixes' into 'master' 

Fix some Windows items

See merge request GNOME/clutter!16
This commit is contained in:
Emmanuele Bassi 2022-08-25 15:45:46 +00:00
parent 5b477d43a8 1f87d51414
commit 2779b9324d
6 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
clutter/clutter-stage.c
View File

@ -3795,8 +3795,8 @@ _clutter_stage_schedule_update (ClutterStage *stage)
if (stage_window == NULL) if (stage_window == NULL)
return; return;
return _clutter_stage_window_schedule_update (stage_window, _clutter_stage_window_schedule_update (stage_window,
stage->priv->sync_delay); stage->priv->sync_delay);
} }
/* Returns the earliest time the stage is ready to update */ /* Returns the earliest time the stage is ready to update */

6
clutter/meson.build
View File

@ -365,6 +365,12 @@ if enabled_backends.contains('mir')
'#define CLUTTER_INPUT_MIR "mir"', '#define CLUTTER_INPUT_MIR "mir"',
] ]
endif endif
if enabled_backends.contains('win32')
clutter_config += [
'#define CLUTTER_WINDOWING_WIN32 "win32"',
'#define CLUTTER_INPUT_WIN32 "win32"',
]
endif
clutter_config += '#define CLUTTER_INPUT_NULL "null"' clutter_config += '#define CLUTTER_INPUT_NULL "null"'
clutter_config_h = configuration_data() clutter_config_h = configuration_data()

2
clutter/win32/clutter-event-win32.c
View File

@ -493,7 +493,7 @@ clutter_win32_handle_event (const MSG *msg)
break; break;
case WM_MBUTTONDBLCLK: case WM_MBUTTONDBLCLK:
make_button_event (msg, stage, CLUTER_BUTTON_MIDDLE, 2, FALSE, core_pointer); make_button_event (msg, stage, CLUTTER_BUTTON_MIDDLE , 2, FALSE, core_pointer);
break; break;
case WM_RBUTTONDBLCLK: case WM_RBUTTONDBLCLK:

7
examples/meson.build
View File

@ -32,10 +32,17 @@ if enable_pixbuf_tests
] ]
endif endif
examples_cargs = []
if cc.get_argument_syntax() == 'msvc'
examples_cargs += '-D_USE_MATH_DEFINES'
endif
foreach e: examples foreach e: examples
executable( executable(
e, e,
e + '.c', e + '.c',
dependencies: examples_deps, dependencies: examples_deps,
c_args: examples_cargs,
) )
endforeach endforeach

8
meson.build
View File

@ -28,7 +28,13 @@ clutter_libversion = '@0@.@1@.@2@'.format(clutter_so_age, clutter_binary_age, cl
cc = meson.get_compiler('c') cc = meson.get_compiler('c')
config_h = configuration_data() config_h = configuration_data()
add_project_arguments([ '-D_GNU_SOURCE', '-DHAVE_CONFIG_H' ], language: 'c') add_project_arguments(['-DHAVE_CONFIG_H' ], language: 'c')
if cc.get_id() == 'msvc'
add_project_arguments([ '-FImsvc_recommended_pragmas.h' ], language: 'c')
else
add_project_arguments([ '-D_GNU_SOURCE' ], language: 'c')
endif
# Paths # Paths
clutter_prefix = get_option('prefix') clutter_prefix = get_option('prefix')

5
tests/conform/meson.build
View File

@ -6,11 +6,14 @@ test_cflags = [
test_env = [ test_env = [
'G_ENABLE_DIAGNOSTIC=0', 'G_ENABLE_DIAGNOSTIC=0',
'CLUTTER_ENABLE_DIAGNOSTIC=0', 'CLUTTER_ENABLE_DIAGNOSTIC=0',
'CLUTTER_BACKEND=x11',
'G_TEST_SRCDIR=@0@'.format(meson.current_source_dir()), 'G_TEST_SRCDIR=@0@'.format(meson.current_source_dir()),
'G_TEST_BUILDDIR=@0@'.format(meson.current_build_dir()), 'G_TEST_BUILDDIR=@0@'.format(meson.current_build_dir()),
] ]
if enabled_backends.contains('x11')
test_env += 'CLUTTER_BACKEND=x11'
endif
actor_tests = [ actor_tests = [
'actor-anchors', 'actor-anchors',
'actor-destroy', 'actor-destroy',