Re:Build Doom3 on MacOSX with XCode4
by timdorr on Friday November 25, 2011 @09:48AM
(#3277158)
They can easily merge those changes. You just have to use the git command line. It's possible to merge in a separate repo. Like so:
[ Parent
| on HN ]
Re:Build Doom3 on MacOSX with XCode4
by albertzeyer on Friday November 25, 2011 @10:01AM
(#3277181)
No, you cannot do that easily the way you described:
$ git fetch d3mac
warning: no common commits
$ git merge d3mac/master
[ many many conflicts ... ]
CONFLICT (add/add): Merge conflict in neo/ui/Winvar.h
Automatic merge failed; fix conflicts and then commit the result.Here's the original repo with Fabien Sanglard's patch applied on top of it.
https://github.com/uxp/doom3.gpl
Just like his concern, I haven't tested building this on windows (VC 2010), so this repo needs to be cleaned up before it should be merged back into the main repo.