Commit 82dca2ec authored by Michael Schumacher's avatar Michael Schumacher

Bug 574018 - Add a manifest to executables

Eventually all executables will have the manifest and version resources
linked. In this initial step, the current resources are moved from the
app/ directory to a global build/windows directory.
parent b7b93d3d
......@@ -29,7 +29,8 @@ SUBDIRS = \
$(GIMP_PLUGINS) \
etc \
devel-docs \
docs
docs \
build
bin_SCRIPTS = @GIMPINSTALL@
......
......@@ -85,11 +85,7 @@ gimp_2_7_SOURCES = $(libapp_sources) main.c
EXTRA_DIST = \
fileicon.ico \
gimp.manifest \
gimp.rc.in \
makefile.msc \
wilber.ico
makefile.msc
if OS_WIN32
win32_ldflags = -mwindows $(WIN32_LARGE_ADDRESS_AWARE)
......@@ -265,16 +261,6 @@ dist-dump-gimprc: gimp-console-$(GIMP_APP_VERSION)$(EXEEXT)
dist-hook: dist-check-gimp-console dist-dump-gimprc
gimp.rc.o: gimp.rc
$(WINDRES) --define ORIGINALFILENAME_STR="gimp-2.7$(EXEEXT)" \
--define INTERNALNAME_STR="gimp-2.7" \
gimp.rc gimp.rc.o
gimp-console.rc.o: gimp.rc
$(WINDRES) --define ORIGINALFILENAME_STR="gimp-console-2.7$(EXEEXT)" \
--define INTERNALNAME_STR="gimp-console-2.7" \
gimp.rc gimp-console.rc.o
# If git is available, always check if git-version.h should be
# updated. If git is not available, don't do anything if git-version.h
# already exists because then we are probably working with a tarball
......@@ -292,4 +278,11 @@ git-version.h: update-git-version-header
echo " git HEAD changed: $@ regenerated"; \
fi
# Version resources for Microsoft Windows
%.rc.o: $(top_srcdir)/build/windows/gimp.rc
$(WINDRES) --define ORIGINALFILENAME_STR="$*$(EXEEXT)" \
--define INTERNALNAME_STR="$*" \
--define TOP_SRCDIR="$(top_srcdir)" \
$< $@
.PHONY: update-git-version-header
/Makefile
/Makefile.in
\ No newline at end of file
SUBDIRS = \
windows
\ No newline at end of file
/Makefile
/Makefile.in
/gimp.rc
\ No newline at end of file
EXTRA_DIST = \
gimp.rc \
gimp.manifest \
fileicon.ico \
wilber.ico
......@@ -62,6 +62,6 @@ BEGIN
END
#include "winuser.h"
1 ICON "wilber.ico"
2 ICON "fileicon.ico"
CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "gimp.manifest"
1 ICON QUOTE(TOP_SRCDIR) "/build/windows/wilber.ico"
2 ICON QUOTE(TOP_SRCDIR) "/build/windows/fileicon.ico"
CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST QUOTE(TOP_SRCDIR) "/build/windows/gimp.manifest"
......@@ -2017,7 +2017,6 @@ libgimpmath/Makefile
libgimpmodule/Makefile
libgimpthumb/Makefile
libgimpwidgets/Makefile
app/gimp.rc
app/Makefile
app/actions/Makefile
app/base/Makefile
......@@ -2049,6 +2048,9 @@ app/tests/gimpdir/Makefile
app/tests/gimpdir/brushes/Makefile
app/tests/gimpdir/gradients/Makefile
app/tests/gimpdir/patterns/Makefile
build/Makefile
build/windows/Makefile
build/windows/gimp.rc
plug-ins/Makefile
plug-ins/color-rotate/Makefile
plug-ins/color-rotate/images/Makefile
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment