Re: [msysGit] [PATCH] Embed an application manifest on MinGW

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hi,

On Sat, 28 May 2011, Cesar Eduardo Barros wrote:

> [...]
> @@ -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

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]