From 1ecde309e4d8c5285037f9ba55beb44e5677b580 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Tue, 9 Dec 2014 13:15:40 +0100
Subject: src/win32: move resources to win32/

---
 Makefile.am                  |  10 +++++-----
 configure.ac                 |   2 +-
 src/win32/mpd.ico            | Bin 353118 -> 0 bytes
 src/win32/mpd_win32_rc.rc.in |  34 ----------------------------------
 win32/res/mpd.ico            | Bin 0 -> 353118 bytes
 win32/res/mpd.rc.in          |  34 ++++++++++++++++++++++++++++++++++
 6 files changed, 40 insertions(+), 40 deletions(-)
 delete mode 100644 src/win32/mpd.ico
 delete mode 100644 src/win32/mpd_win32_rc.rc.in
 create mode 100644 win32/res/mpd.ico
 create mode 100644 win32/res/mpd.rc.in

diff --git a/Makefile.am b/Makefile.am
index 28fa4c520..3cded98ca 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -331,14 +331,14 @@ endif
 # Windows resource file
 #
 
-src/win32/mpd_win32_rc.$(OBJEXT): src/win32/mpd_win32_rc.rc
+win32/res/mpd.$(OBJEXT): %.$(OBJEXT): %.rc
 	$(WINDRES) -i $< -o $@
 
 if HAVE_WINDOWS
-noinst_DATA = src/win32/mpd_win32_rc.rc
+noinst_DATA = win32/res/mpd.rc
 
-EXTRA_src_mpd_DEPENDENCIES = src/win32/mpd_win32_rc.$(OBJEXT)
-src_mpd_LDFLAGS = -Wl,src/win32/mpd_win32_rc.$(OBJEXT)
+EXTRA_src_mpd_DEPENDENCIES = win32/res/mpd.$(OBJEXT)
+src_mpd_LDFLAGS = -Wl,win32/res/mpd.$(OBJEXT)
 endif
 
 if ENABLE_DATABASE
@@ -2231,4 +2231,4 @@ EXTRA_DIST = $(doc_DATA) autogen.sh \
 	android/src/Bridge.java \
 	android/src/Loader.java \
 	android/src/Main.java \
-	src/win32/mpd_win32_rc.rc.in src/win32/mpd.ico
+	win32/res/mpd.rc.in win32/res/mpd.ico
diff --git a/configure.ac b/configure.ac
index addb278ab..59e9829c6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -97,7 +97,7 @@ linux*)
 
 mingw32* | windows*)
 	AC_CONFIG_FILES([
-		src/win32/mpd_win32_rc.rc
+		win32/res/mpd.rc
 	])
 	AC_CHECK_TOOL(WINDRES, windres)
 	AM_CPPFLAGS="$AM_CPPFLAGS -DWIN32_LEAN_AND_MEAN"
diff --git a/src/win32/mpd.ico b/src/win32/mpd.ico
deleted file mode 100644
index 86fd9fe43..000000000
Binary files a/src/win32/mpd.ico and /dev/null differ
diff --git a/src/win32/mpd_win32_rc.rc.in b/src/win32/mpd_win32_rc.rc.in
deleted file mode 100644
index e5312dc78..000000000
--- a/src/win32/mpd_win32_rc.rc.in
+++ /dev/null
@@ -1,34 +0,0 @@
-#include <windows.h>
-
-#define VERSION_NUMBER @VERSION_MAJOR@,@VERSION_MINOR@,@VERSION_REVISION@,@VERSION_EXTRA@
-#define VERSION_NUMBER_STR "@VERSION_MAJOR@,@VERSION_MINOR@,@VERSION_REVISION@,@VERSION_EXTRA@"
-
-MPD_ICON ICON "@top_srcdir@/src/win32/mpd.ico"
-
-1 VERSIONINFO
-FILETYPE VFT_APP
-FILEOS VOS__WINDOWS32
-PRODUCTVERSION VERSION_NUMBER
-
-FILEVERSION VERSION_NUMBER
-BEGIN
-	BLOCK "StringFileInfo"
-	BEGIN
-		BLOCK "040904B0"
-		BEGIN
-			VALUE "CompanyName", "Music Player Daemon Project"
-			VALUE "ProductName", "Music Player Daemon"
-			VALUE "ProductVersion", VERSION_NUMBER_STR
-			VALUE "InternalName", "mpd"
-			VALUE "OriginalFilename", "mpd.exe"
-			VALUE "FileVersion", "@VERSION@"
-			VALUE "FileDescription", "Music Player Daemon @VERSION@"
-			VALUE "LegalCopyright", "Copyright \251 The Music Player Daemon Project"
-		END
-	END
-
-	BLOCK "VarFileInfo"
-	BEGIN
-		VALUE "Translation", 0x409, 1200
-	END
-END
diff --git a/win32/res/mpd.ico b/win32/res/mpd.ico
new file mode 100644
index 000000000..86fd9fe43
Binary files /dev/null and b/win32/res/mpd.ico differ
diff --git a/win32/res/mpd.rc.in b/win32/res/mpd.rc.in
new file mode 100644
index 000000000..3a33e9981
--- /dev/null
+++ b/win32/res/mpd.rc.in
@@ -0,0 +1,34 @@
+#include <windows.h>
+
+#define VERSION_NUMBER @VERSION_MAJOR@,@VERSION_MINOR@,@VERSION_REVISION@,@VERSION_EXTRA@
+#define VERSION_NUMBER_STR "@VERSION_MAJOR@,@VERSION_MINOR@,@VERSION_REVISION@,@VERSION_EXTRA@"
+
+MPD_ICON ICON "@top_srcdir@/win32/res/mpd.ico"
+
+1 VERSIONINFO
+FILETYPE VFT_APP
+FILEOS VOS__WINDOWS32
+PRODUCTVERSION VERSION_NUMBER
+
+FILEVERSION VERSION_NUMBER
+BEGIN
+	BLOCK "StringFileInfo"
+	BEGIN
+		BLOCK "040904B0"
+		BEGIN
+			VALUE "CompanyName", "Music Player Daemon Project"
+			VALUE "ProductName", "Music Player Daemon"
+			VALUE "ProductVersion", VERSION_NUMBER_STR
+			VALUE "InternalName", "mpd"
+			VALUE "OriginalFilename", "mpd.exe"
+			VALUE "FileVersion", "@VERSION@"
+			VALUE "FileDescription", "Music Player Daemon @VERSION@"
+			VALUE "LegalCopyright", "Copyright \251 The Music Player Daemon Project"
+		END
+	END
+
+	BLOCK "VarFileInfo"
+	BEGIN
+		VALUE "Translation", 0x409, 1200
+	END
+END
-- 
cgit v1.2.3