added LIB_EXPORT defintions for unix like systems.
Merged concflics for Prop Room 3D.