59 files changed, 21 insertions, 12 deletions

diff --git a/Adwaita/cursors/X_cursor.cur b/Adwaita/cursors/X_cursor.cur
new file mode 100644
index 000000000..30a4fa161
--- /dev/null
+++ b/Adwaita/cursors/X_cursor.cur
diff --git a/Adwaita/cursors/all-scroll.cur b/Adwaita/cursors/all-scroll.cur
new file mode 100644
index 000000000..187970f81
--- /dev/null
+++ b/Adwaita/cursors/all-scroll.cur
diff --git a/Adwaita/cursors/bd_double_arrow.cur b/Adwaita/cursors/bd_double_arrow.cur
new file mode 100644
index 000000000..d0ca074da
--- /dev/null
+++ b/Adwaita/cursors/bd_double_arrow.cur
diff --git a/Adwaita/cursors/bottom_left_corner.cur b/Adwaita/cursors/bottom_left_corner.cur
new file mode 100644
index 000000000..4e8d94fad
--- /dev/null
+++ b/Adwaita/cursors/bottom_left_corner.cur
diff --git a/Adwaita/cursors/bottom_right_corner.cur b/Adwaita/cursors/bottom_right_corner.cur
new file mode 100644
index 000000000..1a8d2c906
--- /dev/null
+++ b/Adwaita/cursors/bottom_right_corner.cur
diff --git a/Adwaita/cursors/bottom_side.cur b/Adwaita/cursors/bottom_side.cur
new file mode 100644
index 000000000..e98dd6314
--- /dev/null
+++ b/Adwaita/cursors/bottom_side.cur
diff --git a/Adwaita/cursors/bottom_tee.cur b/Adwaita/cursors/bottom_tee.cur
new file mode 100644
index 000000000..8ae58dd69
--- /dev/null
+++ b/Adwaita/cursors/bottom_tee.cur
diff --git a/Adwaita/cursors/cell.cur b/Adwaita/cursors/cell.cur
new file mode 100644
index 000000000..279d2d9d1
--- /dev/null
+++ b/Adwaita/cursors/cell.cur
diff --git a/Adwaita/cursors/circle.cur b/Adwaita/cursors/circle.cur
new file mode 100644
index 000000000..24dbdf94f
--- /dev/null
+++ b/Adwaita/cursors/circle.cur
diff --git a/Adwaita/cursors/context-menu.cur b/Adwaita/cursors/context-menu.cur
new file mode 100644
index 000000000..9c39a1e64
--- /dev/null
+++ b/Adwaita/cursors/context-menu.cur
diff --git a/Adwaita/cursors/copy.cur b/Adwaita/cursors/copy.cur
new file mode 100644
index 000000000..a986334df
--- /dev/null
+++ b/Adwaita/cursors/copy.cur
diff --git a/Adwaita/cursors/cross.cur b/Adwaita/cursors/cross.cur
new file mode 100644
index 000000000..74559af87
--- /dev/null
+++ b/Adwaita/cursors/cross.cur
diff --git a/Adwaita/cursors/crossed_circle.cur b/Adwaita/cursors/crossed_circle.cur
new file mode 100644
index 000000000..fe556cae4
--- /dev/null
+++ b/Adwaita/cursors/crossed_circle.cur
diff --git a/Adwaita/cursors/dnd-ask.cur b/Adwaita/cursors/dnd-ask.cur
new file mode 100644
index 000000000..95085c6b2
--- /dev/null
+++ b/Adwaita/cursors/dnd-ask.cur
diff --git a/Adwaita/cursors/dnd-copy.cur b/Adwaita/cursors/dnd-copy.cur
new file mode 100644
index 000000000..76dd49ac3
--- /dev/null
+++ b/Adwaita/cursors/dnd-copy.cur
diff --git a/Adwaita/cursors/dnd-link.cur b/Adwaita/cursors/dnd-link.cur
new file mode 100644
index 000000000..eb28be9e5
--- /dev/null
+++ b/Adwaita/cursors/dnd-link.cur
diff --git a/Adwaita/cursors/dnd-move.cur b/Adwaita/cursors/dnd-move.cur
new file mode 100644
index 000000000..1ef2429fe
--- /dev/null
+++ b/Adwaita/cursors/dnd-move.cur
diff --git a/Adwaita/cursors/dnd-no-drop.cur b/Adwaita/cursors/dnd-no-drop.cur
new file mode 100644
index 000000000..482e175c3
--- /dev/null
+++ b/Adwaita/cursors/dnd-no-drop.cur
diff --git a/Adwaita/cursors/dnd-none.cur b/Adwaita/cursors/dnd-none.cur
new file mode 100644
index 000000000..0e3f29127
--- /dev/null
+++ b/Adwaita/cursors/dnd-none.cur
diff --git a/Adwaita/cursors/dotbox.cur b/Adwaita/cursors/dotbox.cur
new file mode 100644
index 000000000..f43c73a9d
--- /dev/null
+++ b/Adwaita/cursors/dotbox.cur
diff --git a/Adwaita/cursors/fd_double_arrow.cur b/Adwaita/cursors/fd_double_arrow.cur
new file mode 100644
index 000000000..401760a73
--- /dev/null
+++ b/Adwaita/cursors/fd_double_arrow.cur
diff --git a/Adwaita/cursors/grabbing.cur b/Adwaita/cursors/grabbing.cur
new file mode 100644
index 000000000..c25f52d04
--- /dev/null
+++ b/Adwaita/cursors/grabbing.cur
diff --git a/Adwaita/cursors/hand1.cur b/Adwaita/cursors/hand1.cur
new file mode 100644
index 000000000..75d8e8997
--- /dev/null
+++ b/Adwaita/cursors/hand1.cur
diff --git a/Adwaita/cursors/hand2.cur b/Adwaita/cursors/hand2.cur
new file mode 100644
index 000000000..8bb8df8cc
--- /dev/null
+++ b/Adwaita/cursors/hand2.cur
diff --git a/Adwaita/cursors/left_ptr.cur b/Adwaita/cursors/left_ptr.cur
new file mode 100644
index 000000000..88155cefc
--- /dev/null
+++ b/Adwaita/cursors/left_ptr.cur
diff --git a/Adwaita/cursors/left_ptr_watch.ani b/Adwaita/cursors/left_ptr_watch.ani
new file mode 100644
index 000000000..181b8f640
--- /dev/null
+++ b/Adwaita/cursors/left_ptr_watch.ani
diff --git a/Adwaita/cursors/left_side.cur b/Adwaita/cursors/left_side.cur
new file mode 100644
index 000000000..66ac3a5b2
--- /dev/null
+++ b/Adwaita/cursors/left_side.cur
diff --git a/Adwaita/cursors/left_tee.cur b/Adwaita/cursors/left_tee.cur
new file mode 100644
index 000000000..6cb9faed7
--- /dev/null
+++ b/Adwaita/cursors/left_tee.cur
diff --git a/Adwaita/cursors/link.cur b/Adwaita/cursors/link.cur
new file mode 100644
index 000000000..ce0a2918f
--- /dev/null
+++ b/Adwaita/cursors/link.cur
diff --git a/Adwaita/cursors/ll_angle.cur b/Adwaita/cursors/ll_angle.cur
new file mode 100644
index 000000000..b6c5e6cb8
--- /dev/null
+++ b/Adwaita/cursors/ll_angle.cur
diff --git a/Adwaita/cursors/lr_angle.cur b/Adwaita/cursors/lr_angle.cur
new file mode 100644
index 000000000..0192bfaa9
--- /dev/null
+++ b/Adwaita/cursors/lr_angle.cur
diff --git a/Adwaita/cursors/move.cur b/Adwaita/cursors/move.cur
new file mode 100644
index 000000000..d734dbc8f
--- /dev/null
+++ b/Adwaita/cursors/move.cur
diff --git a/Adwaita/cursors/pencil.cur b/Adwaita/cursors/pencil.cur
new file mode 100644
index 000000000..4cc68f9a3
--- /dev/null
+++ b/Adwaita/cursors/pencil.cur
diff --git a/Adwaita/cursors/plus.cur b/Adwaita/cursors/plus.cur
new file mode 100644
index 000000000..3f943b035
--- /dev/null
+++ b/Adwaita/cursors/plus.cur
diff --git a/Adwaita/cursors/pointer-move.cur b/Adwaita/cursors/pointer-move.cur
new file mode 100644
index 000000000..0e61864ac
--- /dev/null
+++ b/Adwaita/cursors/pointer-move.cur
diff --git a/Adwaita/cursors/question_arrow.cur b/Adwaita/cursors/question_arrow.cur
new file mode 100644
index 000000000..b2ba91adc
--- /dev/null
+++ b/Adwaita/cursors/question_arrow.cur
diff --git a/Adwaita/cursors/right_ptr.cur b/Adwaita/cursors/right_ptr.cur
new file mode 100644
index 000000000..64ade269d
--- /dev/null
+++ b/Adwaita/cursors/right_ptr.cur
diff --git a/Adwaita/cursors/right_side.cur b/Adwaita/cursors/right_side.cur
new file mode 100644
index 000000000..3578cee06
--- /dev/null
+++ b/Adwaita/cursors/right_side.cur
diff --git a/Adwaita/cursors/right_tee.cur b/Adwaita/cursors/right_tee.cur
new file mode 100644
index 000000000..a8ad34e56
--- /dev/null
+++ b/Adwaita/cursors/right_tee.cur
diff --git a/Adwaita/cursors/sb_down_arrow.cur b/Adwaita/cursors/sb_down_arrow.cur
new file mode 100644
index 000000000..f9237635c
--- /dev/null
+++ b/Adwaita/cursors/sb_down_arrow.cur
diff --git a/Adwaita/cursors/sb_h_double_arrow.cur b/Adwaita/cursors/sb_h_double_arrow.cur
new file mode 100644
index 000000000..e4de220c0
--- /dev/null
+++ b/Adwaita/cursors/sb_h_double_arrow.cur
diff --git a/Adwaita/cursors/sb_left_arrow.cur b/Adwaita/cursors/sb_left_arrow.cur
new file mode 100644
index 000000000..19ef830d2
--- /dev/null
+++ b/Adwaita/cursors/sb_left_arrow.cur
diff --git a/Adwaita/cursors/sb_right_arrow.cur b/Adwaita/cursors/sb_right_arrow.cur
new file mode 100644
index 000000000..68f1135b0
--- /dev/null
+++ b/Adwaita/cursors/sb_right_arrow.cur
diff --git a/Adwaita/cursors/sb_up_arrow.cur b/Adwaita/cursors/sb_up_arrow.cur
new file mode 100644
index 000000000..7de01d0eb
--- /dev/null
+++ b/Adwaita/cursors/sb_up_arrow.cur
diff --git a/Adwaita/cursors/sb_v_double_arrow.cur b/Adwaita/cursors/sb_v_double_arrow.cur
new file mode 100644
index 000000000..0966756b7
--- /dev/null
+++ b/Adwaita/cursors/sb_v_double_arrow.cur
diff --git a/Adwaita/cursors/tcross.cur b/Adwaita/cursors/tcross.cur
new file mode 100644
index 000000000..e3adc65cd
--- /dev/null
+++ b/Adwaita/cursors/tcross.cur
diff --git a/Adwaita/cursors/top_left_corner.cur b/Adwaita/cursors/top_left_corner.cur
new file mode 100644
index 000000000..2c6ede746
--- /dev/null
+++ b/Adwaita/cursors/top_left_corner.cur
diff --git a/Adwaita/cursors/top_right_corner.cur b/Adwaita/cursors/top_right_corner.cur
new file mode 100644
index 000000000..759f2a2df
--- /dev/null
+++ b/Adwaita/cursors/top_right_corner.cur
diff --git a/Adwaita/cursors/top_side.cur b/Adwaita/cursors/top_side.cur
new file mode 100644
index 000000000..f6388fee8
--- /dev/null
+++ b/Adwaita/cursors/top_side.cur
diff --git a/Adwaita/cursors/top_tee.cur b/Adwaita/cursors/top_tee.cur
new file mode 100644
index 000000000..fa50dad35
--- /dev/null
+++ b/Adwaita/cursors/top_tee.cur
diff --git a/Adwaita/cursors/ul_angle.cur b/Adwaita/cursors/ul_angle.cur
new file mode 100644
index 000000000..afafe0138
--- /dev/null
+++ b/Adwaita/cursors/ul_angle.cur
diff --git a/Adwaita/cursors/ur_angle.cur b/Adwaita/cursors/ur_angle.cur
new file mode 100644
index 000000000..c6f70dca4
--- /dev/null
+++ b/Adwaita/cursors/ur_angle.cur
diff --git a/Adwaita/cursors/vertical-text.cur b/Adwaita/cursors/vertical-text.cur
new file mode 100644
index 000000000..10e123bf5
--- /dev/null
+++ b/Adwaita/cursors/vertical-text.cur
diff --git a/Adwaita/cursors/watch.ani b/Adwaita/cursors/watch.ani
new file mode 100644
index 000000000..00b22ebaa
--- /dev/null
+++ b/Adwaita/cursors/watch.ani
diff --git a/Adwaita/cursors/xterm.cur b/Adwaita/cursors/xterm.cur
new file mode 100644
index 000000000..631e6aebf
--- /dev/null
+++ b/Adwaita/cursors/xterm.cur
diff --git a/Adwaita/cursors/zoom-in.cur b/Adwaita/cursors/zoom-in.cur
new file mode 100644
index 000000000..82b725473
--- /dev/null
+++ b/Adwaita/cursors/zoom-in.cur
diff --git a/Adwaita/cursors/zoom-out.cur b/Adwaita/cursors/zoom-out.cur
new file mode 100644
index 000000000..389e2c5c1
--- /dev/null
+++ b/Adwaita/cursors/zoom-out.cur
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; \
diff --git a/configure.ac b/configure.ac
index 78a7f337b..d5fcfa6e1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,6 +3,7 @@ AC_PREREQ(2.53)
 
 AC_INIT([adwaita-icon-theme], [3.21.91],
         [http://bugzilla.gnome.org/enter_bug.cgi?product=adwaita-icon-theme])
+AC_CANONICAL_HOST
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_SRCDIR([index.theme.in])
 
@@ -54,16 +55,16 @@ if test "x$GTK_ENCODE_SYMBOLIC_SVG" = "xfalse"; then
 fi
 AC_SUBST(symbolic_encode_sizes)
 
-AC_ARG_ENABLE([w32-cursors],
-  [AS_HELP_STRING([--enable-w32-cursors],
-    [Make and install Windows cursors (.cur and .ani) instead of X cursors])],
-  [case "${enableval}" in
-    yes) enable_w32_cursors=yes ;;
-    no)  enable_w32_cursors=no ;;
-    *) AC_MSG_ERROR([bad value ${enableval} for --enable-w32-cursors]) ;;
-   esac],
-  [enable_w32_cursors=no])
-AC_SUBST(enable_w32_cursors)
+case "$host" in
+  *-*-mingw*|*-*-cygwin*)
+    platform_win32=yes
+    ;;
+  *)
+    platform_win32=no
+    ;;
+esac
+AC_SUBST(platform_win32)
+AM_CONDITIONAL([PLATFORM_WIN32], [test x$platform_win32 = xyes])
 
 AC_ARG_ENABLE([l-xl-variants],
   [AS_HELP_STRING([--enable-l-xl-variants],