Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
mpd
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Иван Мажукин
mpd
Commits
1ecde309
Commit
1ecde309
authored
Dec 09, 2014
by
Max Kellermann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
src/win32: move resources to win32/
parent
d62a7384
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
7 deletions
+7
-7
Makefile.am
Makefile.am
+5
-5
configure.ac
configure.ac
+1
-1
mpd.ico
win32/res/mpd.ico
+0
-0
mpd.rc.in
win32/res/mpd.rc.in
+1
-1
No files found.
Makefile.am
View file @
1ecde309
...
...
@@ -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
configure.ac
View file @
1ecde309
...
...
@@ -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"
...
...
src/win32
/mpd.ico
→
win32/res
/mpd.ico
View file @
1ecde309
File moved
src/win32/mpd_win32_rc
.rc.in
→
win32/res/mpd
.rc.in
View file @
1ecde309
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment