Helena Mitasova wrote: > I have commented out the sites-related input/output from simwe in trunk. > It compiles and runs with grass7 updated today - I tested it with the > examples from grassbook and some variations of the parameters. > > Are these changes enough to get it back into grass7? > (there is still the issue of 3 separate waterglobs.h - I need to talk > to Jaro to see what would be the best way to fix it).
I suggest committing the changes, but leaving it disabled in raster/Makefile until the sites and waterglobs.h issues have been fully dealt with. If you keep a private copy around for too long, it may become problematic to merge it if the SVN copy gets modified in the meantime (if I'm making changes related to a particular header file or a particular function, I'll normally change everything which uses it, even modules which are disabled). Regarding waterglobs.h, does it work if you remove r.sim.*/waterglobs.h and add -I../simlib to EXTRA_CFLAGS in r.sim.*/Makefile? Or are there other issues? > Also, should I submit these changes to GRASS64 so that it runs in > winGRASS? (I am not sure what was the problem there) I'd suggest leaving it for now. The version in 6.4 isn't as likely to be modified as in 7.0. -- Glynn Clements <[EMAIL PROTECTED]> _______________________________________________ grass-dev mailing list [email protected] http://lists.osgeo.org/mailman/listinfo/grass-dev
