src/unix/osd_cpu.h defines a number of typedefs that conflict with ones in X11/Xmd.h, namely INT8, INT16, and INT32. This results in the compile blowing up, complaining about them being defined previously in any file that includes Xmd.h -- which is everything that uses glmame.h or gltool.h
The xmame header has a #define it looks for to not define those, but there are a couple of problems with it: 1: it's only defined in src/unix/video-drivers/xgl.c, and there are several other files that need it. 2: if you define it, there are other headers that need those typedefs that are included before Xmd.h, so all the files that blew up before work, but now all the files that didn't blow up before do now... I've attached a particularly ugly hack diff that will fix the problem, but it'll probably cause problems if Xmd.h isn't availiable. Someone a bit more familiar can probably clean this up a bit. Two solutions come to mind, either clean what I've attached up a bit (I think I missed an #if xgl / #endif on one of the blocks...) or change the typedefs in osd_cpu.h to not conflict with what's in Xmd.h. I'm not subscribed to the list, so I won't see any followups... John Allensworth --- [EMAIL PROTECTED] -- Reaperman/ReaperSMS Author of XtraWeapons (except the homing missile, eject, and throwing axe) Stanknes forever Real Programmers think better when playing Adventure or Rogue.
glmame-hack.diff.gz
Description: Binary data
