diff options
| author | Max Kellermann <max@duempel.org> | 2014-01-24 16:14:05 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2014-01-24 16:37:32 +0100 |
| commit | eef7ba48ddb060c14caa5be27faeabe6f82b3e08 (patch) | |
| tree | 22554f12d1467631761cf71c9052e3510bf81e60 | |
| parent | 299ff2b23ffbd3c4511768f7bfbf427315b0650d (diff) | |
Win32Main: move to win32/
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | Makefile.am | 12 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/win32/Win32Main.cxx (renamed from src/Win32Main.cxx) | 0 | ||||
| -rw-r--r-- | src/win32/mpd.ico (renamed from src/win/mpd.ico) | bin | 353118 -> 353118 bytes | |||
| -rw-r--r-- | src/win32/mpd_win32_rc.rc.in (renamed from src/win/mpd_win32_rc.rc.in) | 2 |
6 files changed, 9 insertions, 9 deletions
diff --git a/.gitignore b/.gitignore index 3c8552099..9b052a29f 100644 --- a/.gitignore +++ b/.gitignore @@ -40,7 +40,7 @@ tags .#* .stgit* src/dsd2pcm/dsd2pcm -src/win/mpd_win32_rc.rc +src/win32/mpd_win32_rc.rc doc/doxygen.conf doc/protocol.html doc/protocol diff --git a/Makefile.am b/Makefile.am index debdbab40..87ca79a70 100644 --- a/Makefile.am +++ b/Makefile.am @@ -155,7 +155,7 @@ src_mpd_SOURCES = \ src/IOThread.cxx src/IOThread.hxx \ src/Main.cxx src/Main.hxx \ src/Instance.cxx src/Instance.hxx \ - src/Win32Main.cxx \ + src/win32/Win32Main.cxx \ src/GlobalEvents.cxx src/GlobalEvents.hxx \ src/unix/SignalHandlers.cxx src/unix/SignalHandlers.hxx \ src/unix/Daemon.cxx src/unix/Daemon.hxx \ @@ -218,14 +218,14 @@ src_mpd_SOURCES = \ # Windows resource file # -src/win/mpd_win32_rc.$(OBJEXT): src/win/mpd_win32_rc.rc +src/win32/mpd_win32_rc.$(OBJEXT): src/win32/mpd_win32_rc.rc $(WINDRES) -i $< -o $@ if HAVE_WINDOWS -noinst_DATA = src/win/mpd_win32_rc.rc +noinst_DATA = src/win32/mpd_win32_rc.rc -src_mpd_DEPENDENCIES = src/win/mpd_win32_rc.$(OBJEXT) -src_mpd_LDFLAGS = -Wl,src/win/mpd_win32_rc.$(OBJEXT) +src_mpd_DEPENDENCIES = src/win32/mpd_win32_rc.$(OBJEXT) +src_mpd_LDFLAGS = -Wl,src/win32/mpd_win32_rc.$(OBJEXT) endif if ENABLE_DESPOTIFY @@ -1755,4 +1755,4 @@ EXTRA_DIST = $(doc_DATA) autogen.sh \ test/test_archive_zzip.sh \ $(wildcard scripts/*.sh) \ $(man_MANS) $(DOCBOOK_FILES) doc/mpdconf.example doc/doxygen.conf \ - src/win/mpd_win32_rc.rc.in src/win/mpd.ico + src/win32/mpd_win32_rc.rc.in src/win32/mpd.ico diff --git a/configure.ac b/configure.ac index 13ff64ba7..1bed0727d 100644 --- a/configure.ac +++ b/configure.ac @@ -85,7 +85,7 @@ linux*) mingw32* | windows*) AC_CONFIG_FILES([ - src/win/mpd_win32_rc.rc + src/win32/mpd_win32_rc.rc ]) AC_CHECK_TOOL(WINDRES, windres) AM_CPPFLAGS="$AM_CPPFLAGS -DWIN32_LEAN_AND_MEAN" diff --git a/src/Win32Main.cxx b/src/win32/Win32Main.cxx index 75a1e9a23..75a1e9a23 100644 --- a/src/Win32Main.cxx +++ b/src/win32/Win32Main.cxx diff --git a/src/win/mpd.ico b/src/win32/mpd.ico Binary files differindex 86fd9fe43..86fd9fe43 100644 --- a/src/win/mpd.ico +++ b/src/win32/mpd.ico diff --git a/src/win/mpd_win32_rc.rc.in b/src/win32/mpd_win32_rc.rc.in index a31118a0c..e5312dc78 100644 --- a/src/win/mpd_win32_rc.rc.in +++ b/src/win32/mpd_win32_rc.rc.in @@ -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/win/mpd.ico" +MPD_ICON ICON "@top_srcdir@/src/win32/mpd.ico" 1 VERSIONINFO FILETYPE VFT_APP |