Build final include file path with the same path passed to dir_reader when enumerating include_dirs list.


git-svn-id: http://svn.code.sf.net/p/nsis/code/NSIS@6539 212acab6-be3b-0410-9dea-997c60f758d6
zip2exe: The fix for bug #1085 causes a MSVC redefinition warning when <tchar.h> is included.


git-svn-id: http://svn.code.sf.net/p/nsis/code/NSIS@6540 212acab6-be3b-0410-9dea-997c60f758d6