fix compile / add files to cmake
Merge remote-tracking branch 'madrman/mapgen' into mapgen
fix compile
fix compile error & warning
Merge pull request #1 from spring/mapgen

Mapgen