oysteikt
/
mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

Win32Main: move to win32/

This commit is contained in:
Max Kellermann 2014-01-24 16:14:05 +01:00
parent abe4c57663
commit 14c538c9c7
6 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -40,7 +40,7 @@ tags
.#* .#*
.stgit* .stgit*
src/dsd2pcm/dsd2pcm src/dsd2pcm/dsd2pcm
src/win/mpd_win32_rc.rc src/win32/mpd_win32_rc.rc
doc/doxygen.conf doc/doxygen.conf
doc/protocol.html doc/protocol.html
doc/protocol doc/protocol

12
Makefile.am
View File

@ -151,7 +151,7 @@ src_mpd_SOURCES = \
src/IOThread.cxx src/IOThread.hxx \ src/IOThread.cxx src/IOThread.hxx \
src/Main.cxx src/Main.hxx \ src/Main.cxx src/Main.hxx \
src/Instance.cxx src/Instance.hxx \ src/Instance.cxx src/Instance.hxx \
src/Win32Main.cxx \ src/win32/Win32Main.cxx \
src/GlobalEvents.cxx src/GlobalEvents.hxx \ src/GlobalEvents.cxx src/GlobalEvents.hxx \
src/Daemon.cxx src/Daemon.hxx \ src/Daemon.cxx src/Daemon.hxx \
src/AudioCompress/compress.c \ src/AudioCompress/compress.c \
@ -211,14 +211,14 @@ src_mpd_SOURCES = \
# Windows resource file # 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 $@ $(WINDRES) -i $< -o $@
if HAVE_WINDOWS 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_DEPENDENCIES = src/win32/mpd_win32_rc.$(OBJEXT)
src_mpd_LDFLAGS = -Wl,src/win/mpd_win32_rc.$(OBJEXT) src_mpd_LDFLAGS = -Wl,src/win32/mpd_win32_rc.$(OBJEXT)
endif endif
if ENABLE_DESPOTIFY if ENABLE_DESPOTIFY
@ -1633,4 +1633,4 @@ EXTRA_DIST = $(doc_DATA) autogen.sh \
test/test_archive_zzip.sh \ test/test_archive_zzip.sh \
$(wildcard scripts/*.sh) \ $(wildcard scripts/*.sh) \
$(man_MANS) $(DOCBOOK_FILES) doc/mpdconf.example doc/doxygen.conf \ $(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

2
configure.ac
View File

@ -70,7 +70,7 @@ host_is_darwin=no
case "$host_os" in case "$host_os" in
mingw32* | windows*) mingw32* | windows*)
AC_CONFIG_FILES([ AC_CONFIG_FILES([
src/win/mpd_win32_rc.rc src/win32/mpd_win32_rc.rc
]) ])
AC_CHECK_TOOL(WINDRES, windres) AC_CHECK_TOOL(WINDRES, windres)
AM_CPPFLAGS="$AM_CPPFLAGS -DWIN32_LEAN_AND_MEAN" AM_CPPFLAGS="$AM_CPPFLAGS -DWIN32_LEAN_AND_MEAN"

0
src/Win32Main.cxx → src/win32/Win32Main.cxx
View File

0
src/win/mpd.ico → src/win32/mpd.ico
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 345 KiB

After

Width:  |  Height:  |  Size: 345 KiB

2
src/win/mpd_win32_rc.rc.in → src/win32/mpd_win32_rc.rc.in
View File

@ -3,7 +3,7 @@
#define VERSION_NUMBER @VERSION_MAJOR@,@VERSION_MINOR@,@VERSION_REVISION@,@VERSION_EXTRA@ #define VERSION_NUMBER @VERSION_MAJOR@,@VERSION_MINOR@,@VERSION_REVISION@,@VERSION_EXTRA@
#define VERSION_NUMBER_STR "@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 1 VERSIONINFO
FILETYPE VFT_APP FILETYPE VFT_APP