From fa1a4b9181111c3e4d0111ee87f8b4288a1f1ecb Mon Sep 17 00:00:00 2001
From: Christoph Reiter <reiter.christoph@gmail.com>
Date: Thu, 17 Nov 2016 17:36:02 +0100
Subject: windows: Add Windows cursors and install them instead of X cursors on
 Windows

The new cursors where created using
    ./renderpngs.py -r -s -t -o -m 32 -a -c -i -n 4 adwaita.svg
    ./pngs/make-w32.sh

Remove the --enable-w32-cursors switch and instead only install
Windows cursors on Windows and X cursors everywhere else.

This makes cursors work in the gtk3-demo "Cursors" demo and
when dragging things.
---
 Makefile.am | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'Makefile.am')

diff --git a/Makefile.am b/Makefile.am
index 857853e65..9f39d7cb2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,7 +5,15 @@ SUBDIRS = src build
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 
 cursordir = $(datadir)/icons/Adwaita/cursors
-cursor_DATA = $(wildcard $(srcdir)/Adwaita/cursors/*)
+
+# Install .cur/.ani on Windows and X cursors everywhere else
+win_cursors = $(wildcard $(srcdir)/Adwaita/cursors/*.cur) $(wildcard $(srcdir)/Adwaita/cursors/*.ani)
+if PLATFORM_WIN32
+cursor_DATA = $(win_cursors)
+else
+cursor_DATA = $(filter-out $(win_cursors), $(wildcard $(srcdir)/Adwaita/cursors/*))
+endif
+
 if ENABLE_L_XL_VARIANTS
 cursorldir = $(datadir)/icons/Adwaita-Large/cursors
 cursorl_DATA = $(wildcard $(srcdir)/Adwaita-Large/cursors/*)
@@ -108,7 +116,7 @@ install-data-local:
 
 install-data-hook:
 	cd $(DESTDIR)$(cursordir) && \
-	if test "x$(enable_w32_cursors)" = "xyes"; \
+	if test "x$(platform_win32)" = "xyes"; \
 	then \
 		cur=.cur && \
 		ani=.ani; \
-- 
cgit v1.2.1