Merge branch 'master' into tvandijck-patch-1

2017-12-06 13:07:48 -05:00 · 2017-12-06 13:07:48 -05:00 · d6c7a49dc6
commit d6c7a49dc6
parent c0257009e9 e2b30b20da
2 changed files with 2 additions and 2 deletions
--- a/modules/vstudio/vs2010_vcxproj.lua
+++ b/modules/vstudio/vs2010_vcxproj.lua
@ -190,6 +190,7 @@
 				m.outDir,
 				m.intDir,
 				m.extensionsToDeleteOnClean,
+				m.executablePath,
 			}
 		else
 			return {
--- a/src/base/fileconfig.lua
+++ b/src/base/fileconfig.lua
@ -133,8 +133,7 @@

 		context.basedir(fsub, prj.location)

-		setmetatable(fsub, fileconfig.fsub_mt)
-
+		return setmetatable(fsub, fileconfig.fsub_mt)
 	end