make the generator work on Windows
updated definitions