Re: [msysGit] [PATCH] Embed an application manifest on MinGW
- From
Johannes Schindelin <johannes.schindelin@gmx.de>
- Date
- May 28, 2011, 20:44 UTC
- Message-ID
- <alpine.DEB.1.00.1105282241510.11411@bonsai2>
- In-Reply-To
- <1306612707-29748-1-git-send-email-cesarb@cesarb.net>
Hi,
On Sat, 28 May 2011, Cesar Eduardo Barros wrote:
Show 41 quoted lines
> [...] > @@ -1551,6 +1554,11 @@ ifdef USE_NED_ALLOCATOR > COMPAT_OBJS += compat/nedmalloc/nedmalloc.o > endif > > +ifdef APPLICATION_MANIFEST > + # Cannot be in LIB_OBJS because it must always be linked in > + RESOURCE_OBJS += compat/win32/resource.o > +endif > + > ifdef GIT_TEST_CMP_USE_COPIED_CONTEXT > export GIT_TEST_CMP_USE_COPIED_CONTEXT > endif > [...] > > -git$X: git.o $(BUILTIN_OBJS) $(GITLIBS) > +git$X: git.o $(BUILTIN_OBJS) $(RESOURCE_OBJS) $(GITLIBS) > [...] > > -git-%$X: %.o $(GITLIBS) > +git-%$X: %.o $(RESOURCE_OBJS) $(GITLIBS) > [...] > > -git-imap-send$X: imap-send.o $(GITLIBS) > +git-imap-send$X: imap-send.o $(RESOURCE_OBJS) $(GITLIBS) > [...] > > -git-http-fetch$X: revision.o http.o http-walker.o http-fetch.o $(GITLIBS) > +git-http-fetch$X: revision.o http.o http-walker.o http-fetch.o $(RESOURCE_OBJS) $(GITLIBS) > [...] > -git-http-push$X: revision.o http.o http-push.o $(GITLIBS) > +git-http-push$X: revision.o http.o http-push.o $(RESOURCE_OBJS) $(GITLIBS) > [...] > > -$(REMOTE_CURL_PRIMARY): remote-curl.o http.o http-walker.o $(GITLIBS) > +$(REMOTE_CURL_PRIMARY): remote-curl.o http.o http-walker.o $(RESOURCE_OBJS) $(GITLIBS) > [...] > > -test-%$X: test-%.o $(GITLIBS) > +test-%$X: test-%.o $(RESOURCE_OBJS) $(GITLIBS) > [...]
Is it possible that adding the resource object to GITLIBS would reduce the patch and be "more correct", too?
Thanks, Johannes