Add libs for linux and windows platform
Minor changes