diff options
| -rw-r--r-- | clutter/clutter-stage.c | 4 | ||||
| -rw-r--r-- | clutter/meson.build | 6 | ||||
| -rw-r--r-- | clutter/win32/clutter-event-win32.c | 2 | ||||
| -rw-r--r-- | examples/meson.build | 7 | ||||
| -rw-r--r-- | meson.build | 8 | ||||
| -rw-r--r-- | tests/conform/meson.build | 5 |
6 files changed, 27 insertions, 5 deletions
diff --git a/clutter/clutter-stage.c b/clutter/clutter-stage.c index 2c67ca3ad..d28167274 100644 --- a/clutter/clutter-stage.c +++ b/clutter/clutter-stage.c @@ -3795,8 +3795,8 @@ _clutter_stage_schedule_update (ClutterStage *stage) if (stage_window == NULL) return; - return _clutter_stage_window_schedule_update (stage_window, - stage->priv->sync_delay); + _clutter_stage_window_schedule_update (stage_window, + stage->priv->sync_delay); } /* Returns the earliest time the stage is ready to update */ diff --git a/clutter/meson.build b/clutter/meson.build index 68cd5f1a6..0c34638a9 100644 --- a/clutter/meson.build +++ b/clutter/meson.build @@ -365,6 +365,12 @@ if enabled_backends.contains('mir') '#define CLUTTER_INPUT_MIR "mir"', ] 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_h = configuration_data() diff --git a/clutter/win32/clutter-event-win32.c b/clutter/win32/clutter-event-win32.c index 391cadc58..6cd42662f 100644 --- a/clutter/win32/clutter-event-win32.c +++ b/clutter/win32/clutter-event-win32.c @@ -493,7 +493,7 @@ clutter_win32_handle_event (const MSG *msg) break; 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; case WM_RBUTTONDBLCLK: diff --git a/examples/meson.build b/examples/meson.build index 532e9bb21..256168945 100644 --- a/examples/meson.build +++ b/examples/meson.build @@ -32,10 +32,17 @@ if enable_pixbuf_tests ] endif +examples_cargs = [] + +if cc.get_argument_syntax() == 'msvc' + examples_cargs += '-D_USE_MATH_DEFINES' +endif + foreach e: examples executable( e, e + '.c', dependencies: examples_deps, + c_args: examples_cargs, ) endforeach diff --git a/meson.build b/meson.build index e4051877a..4cb771aaa 100644 --- a/meson.build +++ b/meson.build @@ -28,7 +28,13 @@ clutter_libversion = '@0@.@1@.@2@'.format(clutter_so_age, clutter_binary_age, cl cc = meson.get_compiler('c') 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 clutter_prefix = get_option('prefix') diff --git a/tests/conform/meson.build b/tests/conform/meson.build index a8da1b398..25c03c794 100644 --- a/tests/conform/meson.build +++ b/tests/conform/meson.build @@ -6,11 +6,14 @@ test_cflags = [ test_env = [ 'G_ENABLE_DIAGNOSTIC=0', 'CLUTTER_ENABLE_DIAGNOSTIC=0', - 'CLUTTER_BACKEND=x11', 'G_TEST_SRCDIR=@0@'.format(meson.current_source_dir()), 'G_TEST_BUILDDIR=@0@'.format(meson.current_build_dir()), ] +if enabled_backends.contains('x11') + test_env += 'CLUTTER_BACKEND=x11' +endif + actor_tests = [ 'actor-anchors', 'actor-destroy', |