AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master-msvc-fixes' into 'master'

Browse Source 
Fix GIT master build on Visual Studio 2015

See merge request GNOME/gtk!4010
This commit is contained in:
Matthias Clasen 2021-09-30 12:30:08 +00:00
commit b4d91d5e31
4 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gdk/win32/gdkinput-winpointer.c
View File

@ -24,9 +24,11 @@
#include "gdkdevice-virtual.h" #include "gdkdevice-virtual.h"
#include "gdkdevice-winpointer.h" #include "gdkdevice-winpointer.h"
#include "gdkdeviceprivate.h" #include "gdkdeviceprivate.h"
#include "gdkdisplayprivate.h"
#include "gdkseatdefaultprivate.h"
#include "gdkdevicetoolprivate.h" #include "gdkdevicetoolprivate.h"
#include "gdkdisplayprivate.h"
#include "gdkeventsprivate.h"
#include "gdkseatdefaultprivate.h"
#include "gdkinput-winpointer.h" #include "gdkinput-winpointer.h"
#include <windows.h> #include <windows.h>

9
gdk/win32/gdksurface-win32.c
View File

@ -29,18 +29,19 @@
#include <stdlib.h> #include <stdlib.h>
#include "gdk.h" #include "gdk.h"
#include "gdksurfaceprivate.h"
#include "gdktoplevelprivate.h"
#include "gdkpopupprivate.h"
#include "gdkdragsurfaceprivate.h"
#include "gdkprivate-win32.h" #include "gdkprivate-win32.h"
#include "gdkdeviceprivate.h" #include "gdkdeviceprivate.h"
#include "gdkdevicemanager-win32.h" #include "gdkdevicemanager-win32.h"
#include "gdkenumtypes.h" #include "gdkenumtypes.h"
#include "gdkwin32.h" #include "gdkwin32.h"
#include "gdkdisplayprivate.h" #include "gdkdisplayprivate.h"
#include "gdkdragsurfaceprivate.h"
#include "gdkframeclockidleprivate.h" #include "gdkframeclockidleprivate.h"
#include "gdkmonitorprivate.h" #include "gdkmonitorprivate.h"
#include "gdkpopupprivate.h"
#include "gdkseatprivate.h"
#include "gdksurfaceprivate.h"
#include "gdktoplevelprivate.h"
#include "gdkwin32surface.h" #include "gdkwin32surface.h"
#include "gdkwin32cursor.h" #include "gdkwin32cursor.h"
#include "gdkinput-winpointer.h" #include "gdkinput-winpointer.h"

2
gsk/ngl/fp16.c
View File

@ -146,7 +146,7 @@ float_to_half (const float *f, guint16 *h, int n)
if (have_f16c_msvc ()) if (have_f16c_msvc ())
float_to_half_f16c (f, h, n); float_to_half_f16c (f, h, n);
else else
float_to_half4_c (f, h, n); float_to_half_c (f, h, n);
} }
void void

2
meson.build
View File

@ -400,7 +400,7 @@ pangocairo_dep = dependency('pangocairo', version: pango_req,
pixbuf_dep = dependency('gdk-pixbuf-2.0', version: gdk_pixbuf_req, pixbuf_dep = dependency('gdk-pixbuf-2.0', version: gdk_pixbuf_req,
fallback : ['gdk-pixbuf', 'gdkpixbuf_dep'], fallback : ['gdk-pixbuf', 'gdkpixbuf_dep'],
default_options: ['png=enabled', 'jpeg=enabled', 'builtin_loaders=png,jpeg', 'man=false']) default_options: ['png=enabled', 'jpeg=enabled', 'builtin_loaders=png,jpeg', 'man=false'])
png_dep = dependency('libpng', png_dep = dependency(cc.get_argument_syntax() == 'msvc' ? 'png' : 'libpng',
fallback: ['libpng', 'libpng_dep'], fallback: ['libpng', 'libpng_dep'],
required: true) required: true)
tiff_dep = dependency('libtiff-4', tiff_dep = dependency('libtiff-4',