Update win32.mak as well
Merge pull request #731 from andralex/reorg1

Update win32.mak as well