Jonathan Schleifer schreef: > Maarten Lankhorst <[EMAIL PROTECTED]> wrote: > >> Wine could build fine without c++, not sure why everything has to >> link against the c++ library as it will probably only be needed in >> winegcc. Also these compiling flags seem kind of agressive. >> > > As I said, just quoted from my .profile, nothing special for wine. I > just have -lstdc++ added there as some apps need it to compile with icc. > Ok, Please when responding add wine-devel to CC so others can follow discussion. >> They are defined in include/winbase.h >> > > That's the point. They are defined INCLUDING the asm code. That's why > the asm code is already defined and not needed in the file itself. > It's working well for gcc, so I would try to find out how gcc works around it and then work around the same way.. not adding ifdefs everywhere. >> just make sure icc is recognised there. >> > > You mean: Make sure that icc doesn't get recognized as gcc. Well, > I tried that. It doesn't work. This will still end in stuff like: > /tmp/iccCwib4Das_.s:1499: Error: symbol `wine_get_fs' is already defined > /tmp/iccCwib4Das_.s:1523: Error: symbol `wine_set_fs' is already defined > Some part of headers do checks specifically on GCC, you might want to do the same for icc. >> you can't just comment out those Interlocked functions, some >> applications might need them. >> > > I only commented them out because they are defined TWICE. They are still > there and thus the programs run. I tested running a few apps with this > patch. > It's still not how it's done for gcc, see above. >> Plus the way you do it makes the code unreadable. I cannot test this >> as I don't have icc. > I'm sure someone on the list has icc > Probably, but if you want to get code past julliard it is recommended to follow certain guidelines, one of them is not making an unnecesary #ifdef hell.
Maarten
