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

merged



i just finished merging everything i've done on my branch back
onto mainline.  i will run a complete clean test build overnight
and check that it's ok before i leave in the morning.  i don't
expect any problems.  however, if you do discover while i'm gone
that i've left you with a broken build, backing out should be
easy.  there are pre- and post-merge tags on mainline (see commit
msg below for their names), and look at cederqvist if it's not
obvious what to do with them.  (i have a copy cached in
graphics:/home/luka/cvs-stuff/cederqvist-1.11.3.pdf)

also, i noticed that for some reason cvs screwed up the commit
message on some of the directories and/or emails.  not sure
what's up with that.  grr.  but the actual code seems fine, so
i'll worry about that another time.

and here's the message:

merge changes back from temp-dev-luka-03-0511-branch onto mainline.

  source start tag: temp-dev-luka-03-0511 (on ml)
  source end tag:   luka-03-0511-mergeto-ml-tag (on branch)
  dest start tag:   luka-03-0511_to_ml_premerge-tag (on ml)
  dest end tag:     luka-03-0511_to_ml_postmerge-tag (on ml)

summary of changes:

  - patch build system to make walkthru/firewalk build and run
    both under irix and linux.  (previously only irix worked.)

  - remove all iris gl code.  except: several regions that seem
    potentially buggy or incomplete, where iris code is left
    (def'd out) for reference, marked with "XXX iris"

  - remove all win32 code from modules that are currently being
    built and thus testable.  minus exceptions: places that
    really were good imported cross-platform code are kept, plus
    there may be spots i missed by accident and will get later.

  - remove and/or modify some amount of win32-related code in
    modules not currently active.  but be more gentle there.
    (since some of them look like they may have been coded with
    win32 as the primary platform.  not sure yet.)

  - lots more code review, reformatting, obvious fixes as noticed.
    some unchecked buffers, and similar severity bugs-in-waiting
    fixed.  more dangling/incorrect decls fixed.  various examples
    of just really bad code fixed up, when not too difficult.