Revert "Revert "Fixed paths for MSVC compiler""

This reverts commit 5e47dcddb75b37be1b365824a33abaf8165214ea.