Windows: force-recompile git.res for differing architectures #67
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
When git.rc is compiled into git.res, the result is actually dependent on the architecture. That is, you cannot simply link a 32-bit git.res into a 64-bit git.exe. Therefore, to allow 32-bit and 64-bit builds in the same directory, we let git.res depend on GIT-PREFIX so that it gets recompiled when compiling for a different architecture (this works because the exec path changes based on the architecture: /mingw32/libexec/git-core for 32-bit and /mingw64/libexec/git-core for 64-bit). Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
|
/submit |
35 tasks
|
Submitted as pull.67.git.gitgitgadget@gmail.com |
|
This branch is now known as |
|
This patch series was integrated into pu via git@3984764. |
|
This patch series was integrated into next via git@3984764. |
|
This patch series was integrated into master via git@3984764. |
|
Closed via 3984764. |
|
This branch is now known as |
|
This patch series was integrated into pu via git@3984764. |
|
This patch series was integrated into next via git@3984764. |
|
This patch series was integrated into master via git@3984764. |
|
Closed via 3984764. |
This comment has been minimized.
This comment has been minimized.
|
This patch series was integrated into maint via git@3984764. |
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is a patch designed to help maintaining Git for Windows better: when the same source code is "cross-compiled" for i686 as well as x86_64, we want to rebuild the whole thing, including the resource file
git.res.Note: regular C files are re-compiled appropriately, as the default prefix in Git for Windows is
/mingw32or/mingw64depending on the architecture, and this difference is manifested in theCFLAGS(which, upon change, trigger a complete rebuild).As non-Windows platforms do not even compile these
.resfiles, this patch should have exactly no effect on non-Windows builds.