- added back in previously reverted commits, but added conditional compilation flags for windows
- added macro #define os flags in configure.h.in