src/win32: move resources to win32/

This commit is contained in:
Max Kellermann 2014-12-09 13:15:40 +01:00
parent d62a738460
commit 1ecde309e4
4 changed files with 7 additions and 7 deletions

View File

@ -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

View File

@ -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"

View File

Before

Width:  |  Height:  |  Size: 345 KiB

After

Width:  |  Height:  |  Size: 345 KiB

View File

@ -3,7 +3,7 @@
#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"
MPD_ICON ICON "@top_srcdir@/win32/res/mpd.ico"
1 VERSIONINFO
FILETYPE VFT_APP