|
From: Mudrony <mu...@in...> - 2002-08-20 18:18:44
|
Here is a patch with my changes. The patch was made a clean CVS tree processed and patched by Serge van Boom's script/patch. This means that the files are moved, and the upcase filenames are fixed. Note that I jsut posted an another patch that tries to move files itself. The message was large enough to be held for approval. That message can be disregarded, this patch is much better. This patch contains all the small, quick, dirty but efficient changes i made to let the source compile. I post this patch so people can review my changes and can come up with better soultions. I just commented out the dos.h and io.h #includes, and I had to comment all the calls for functions defined there. Fortunately this means only a few calls, and they seem to be simple file attribute checks that should be straightforward to port. Chris: try to use only stdio.. I added some conditionals to solve some those declaration conflicts, and sometime even altered declarations or calls. The original is usually left there commented. When using CVS there is no reason to comment everythng and keep lengthy history inside the sources since CVS does that much better. There is no need to write names at all (so "Added by Chris" style comments are not good). Except maybe some comments made above the code, wich may have a name prepended. (Like: "Chris: Don't try this at home" :) Someone might ask why I moved files, and why I added the those dummy.c files: - The race specific code found in sc2.code seems to belong to the ships, I gues they (ie the habit of putting them into sc2code) are leftovers from SC1. If planets/ and comm/ can have their subdirs then ships should have too. This inproves consistency a lot. - paul from planets has to be removed for similar reasons. Source should be structured on clear conceptual reasons, so when a large enough group of sources has a clear distinctive group. Seeing your name in the path is not such a reason, even if admire paul's name a lot :) This is code not a family photo album :) - For the same reason there should not be an sc2code subdir, and SDL_wrapper should be under the graphics subsystem, not at the top.. Also the one file subdirs could be removed, and the dirs could be more respect to future modularization. And getting rod of the DOS 8.3 names in favor of more readable/descriptive names would be nice too. These would require altering the whole thing, its not difficult, but it would be a patchning nightmare, and CVS would be even worse. - My automake files build subdirs as static libs (as .a archive files) Automake does not seem to like libs that only contain code from other libs, it inssist on having at least one real source file, so I added the dummy.c files. If we want, we can be turn these into something more useful later. Only thing new compared to my pack release that it builds test.c as a separate sndtest executable. This patch contains the most recent version of the Makefile.am files, but does not contain the other automake/autoconf files. |